Merge branch 'release'

Author: vtrifonov

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

@@ -312,12 +312,12 @@ describe("Tests exception handling ", function () {
 	        require("./syntaxErrors.js");
 	    } catch (e) {
 	        exceptionCaught = true;
-	        errMsg = e.fullMessage
+	        errMsg = e.fullMessage;
 	    }
 	    expect(exceptionCaught).toBe(true);
 	    expect(errMsg).toContain("Cannot compile /data/data/com.tns.testapplication/files/app/tests/syntaxErrors.js");
 	    expect(errMsg).toContain("SyntaxError: Unexpected token class");
-	    expect(errMsg).toContain("File: \"file:///data/data/com.tns.testapplication/files/app/tests/syntaxErrors.js, line: 3, column: 4");
+	    expect(errMsg).toContain("File: (file:///data/data/com.tns.testapplication/files/app/tests/syntaxErrors.js:3:4)");
 	});
 
     // run this test only for API level bigger than 25 as we have handling there

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

@@ -236,11 +236,11 @@ string NativeScriptException::GetFullMessage(const TryCatch& tc, const string& j
     string stackTraceMessage = GetErrorStackTrace(message->GetStackTrace());
 
     if (!scriptResName.IsEmpty() && scriptResName->IsString()) {
-        ss << endl <<"File: \"" << ArgConverter::ConvertToString(scriptResName.As<String>());
+        ss << endl <<"File: (" << ArgConverter::ConvertToString(scriptResName.As<String>());
     } else {
-        ss << endl <<"File: \"<unknown>";
+        ss << endl <<"File: (<unknown>";
     }
-    ss << ", line: " << message->GetLineNumber(context).ToChecked() << ", column: " << message->GetStartColumn() << endl << endl;
+    ss << ":" << message->GetLineNumber(context).ToChecked() << ":" << message->GetStartColumn() << ")" << endl << endl;
     ss << "StackTrace: " << endl << stackTraceMessage << endl;
 
     string loggedMessage = ss.str();