Merge pull request #638 from NativeScript/slavchev/issue-637

allow extending Java classes when source location is unknown

Author: Mihail Slavchev

runtime/src/main/java/com/tns/ClassResolver.java

@@ -23,6 +23,13 @@ public Class<?> resolveClass(String fullClassName, DexFactory dexFactory, String
 			className = cannonicalClassName.substring(0, classExtendSeparatorIndex);
 			name = cannonicalClassName.substring(classExtendSeparatorIndex + 1);
 		}
+		else {
+			classExtendSeparatorIndex = cannonicalClassName.indexOf("_unknown_location");
+			if (classExtendSeparatorIndex != -1) {
+				className = cannonicalClassName.substring(0, classExtendSeparatorIndex);
+				name = cannonicalClassName.substring(classExtendSeparatorIndex + 1);
+			}
+		}
 
 		Class<?> clazz = null;
 		boolean isBindingClass = cannonicalClassName.startsWith("com.tns.gen") && !cannonicalClassName.startsWith("com.tns.tests.");

runtime/src/main/jni/MetadataNode.cpp

@@ -1614,9 +1614,9 @@ bool MetadataNode::GetExtendLocation(string& extendLocation)
 			auto scriptName = frame->GetScriptName();
 			if (scriptName.IsEmpty())
 			{
-				extendLocationStream << "unkown location";
+				extendLocationStream << "unknown_location";
 				extendLocation = extendLocationStream.str();
-				return false;
+				return true;
 			}
 
 			string srcFileName = ArgConverter::ConvertToString(scriptName);

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

@@ -1695,4 +1695,17 @@ describe("Tests ", function () {
 
         expect(called).toBe(true);
     });
+
+    it("should extend Java class in eval", function () {
+        var source='global.MyObj = java.lang.Object.extend(\
+                {\
+                        hashCode: function () {\
+                                return 1234;\
+                        }\
+                }\
+        )';
+        eval('('+source+')')
+        var o = new MyObj();
+        expect(o.hashCode()).toBe(1234);
+    });
 });