Merge pull request #976 from NativeScript/pete/fix-1st-line-extend

fix #975 - wrong 1st line extend

Author: petekanev

test-app/runtime/src/main/cpp/MetadataNode.cpp

@@ -1481,6 +1481,12 @@ bool MetadataNode::GetExtendLocation(string& extendLocation, bool isTypeScriptEx
                 return false;
             }
 
+            // Account for the column length offset added by the addition of the Common JS function wrapper
+            // See issue https://github.com/NativeScript/android-runtime/issues/975
+            if (lineNumber == 1) {
+                column = column - ModuleInternal::MODULE_PROLOGUE_LENGTH;
+            }
+
             extendLocationStream << fullPathToFile.c_str() << "_" << lineNumber << "_" << column << "_";
         }
     }

test-app/runtime/src/main/cpp/ModuleInternal.cpp

@@ -490,3 +490,4 @@ jmethodID ModuleInternal::RESOLVE_PATH_METHOD_ID = nullptr;
 
 const char* ModuleInternal::MODULE_PROLOGUE = "(function(module, exports, require, __filename, __dirname){ ";
 const char* ModuleInternal::MODULE_EPILOGUE = "\n})";
+int ModuleInternal::MODULE_PROLOGUE_LENGTH = std::string(ModuleInternal::MODULE_PROLOGUE).length();

test-app/runtime/src/main/cpp/ModuleInternal.h

@@ -34,6 +34,8 @@ class ModuleInternal {
          * Used before initializing workers, to ensure a thread will not be created, when the file doesn't exist
          */
         static void CheckFileExists(v8::Isolate* isolate, const std::string& path, const std::string& baseDir);
+
+        static int MODULE_PROLOGUE_LENGTH;
     private:
         enum class ModulePathKind;