Merge pull request #674 from NativeScript/slavchev/add-origin-fileshema

add file:// schema to script origin

Author: Mihail Slavchev

runtime/src/main/jni/CallbackHandlers.cpp

@@ -900,12 +900,13 @@ void CallbackHandlers::NewThreadCallback(const v8::FunctionCallbackInfo<v8::Valu
         auto isolate = thiz->GetIsolate();
 
         auto currentExecutingScriptName = StackTrace::CurrentStackTrace(isolate, 1, StackTrace::kScriptName)->GetFrame(0)->GetScriptName();
-
         auto currentExecutingScriptNameStr = ArgConverter::ConvertToString(currentExecutingScriptName);
-
         auto lastForwardSlash = currentExecutingScriptNameStr.find_last_of("/");
-
         auto currentDir = currentExecutingScriptNameStr.substr(0, lastForwardSlash + 1);
+        string fileSchema("file://");
+        if (currentDir.compare(0, fileSchema.length(), fileSchema) == 0) {
+            currentDir = currentDir.substr(fileSchema.length());
+        }
 
         auto workerPath = ArgConverter::ConvertToString(args[0]->ToString(isolate));
 

runtime/src/main/jni/ModuleInternal.cpp

@@ -400,7 +400,8 @@ Local<Script> ModuleInternal::LoadScript(Isolate *isolate, const string& path, c
 	//
 	auto cacheData = TryLoadScriptCache(path);
 
-	ScriptOrigin origin(fullRequiredModulePath);
+	auto fullRequiredModulePathWithSchema = ArgConverter::ConvertToV8String(isolate, "file://" + path);
+	ScriptOrigin origin(fullRequiredModulePathWithSchema);
 	ScriptCompiler::Source source(scriptText, origin, cacheData);
 	ScriptCompiler::CompileOptions option = ScriptCompiler::kNoCompileOptions;
 

test-app/app/src/main/assets/app/tests/exceptionHandlingTests.js

@@ -336,7 +336,7 @@ describe("Tests exception handling ", function () {
 	    expect(exceptionCaught).toBe(true);
 	    expect(errMsg).toContain("Cannot compile /data/data/com.tns.android_runtime_testapp/files/app/tests/syntaxErrors.js");
 	    expect(errMsg).toContain("SyntaxError: Unexpected token =");
-	    expect(errMsg).toContain("File: \"/data/data/com.tns.android_runtime_testapp/files/app/tests/syntaxErrors.js, line: 3, column: 10");
+	    expect(errMsg).toContain("File: \"file:///data/data/com.tns.android_runtime_testapp/files/app/tests/syntaxErrors.js, line: 3, column: 10");