revert generated class name creation to include the base class name

Author: petekanev

test-app/build-tools/static-binding-generator/src/main/java/org/nativescript/staticbindinggenerator/Generator.java

@@ -97,6 +97,7 @@ public Binding generateBinding(DataRow dataRow, HashSet interfaceNames) throws C
             if (isInterface) {
                 name = getSimpleClassname(clazz.getClassName());
             } else {
+                name = getSimpleClassname(clazz.getClassName().replace("$", "_")) + "_";
                 // name of the class: last portion of the full file name + line + column + variable name
                 String[] lastFilePathPart = dataRow.getFile().split("_");
                 name += lastFilePathPart[lastFilePathPart.length - 1] + "_" + dataRow.getLine() + "_" + dataRow.getColumn() + "_" + dataRow.getNewClassName();

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

@@ -1258,19 +1258,11 @@ MetadataNode::ExtendedClassCacheData MetadataNode::GetCachedExtendedClassData(Is
 string MetadataNode::CreateFullClassName(const std::string& className, const std::string& extendNameAndLocation = "") {
     string fullClassName = className;
 
-    // create a class name consisting only of the last file name part + line + column + variable identifier
+    // create a class name consisting only of the base class name + last file name part + line + column + variable identifier
     if (!extendNameAndLocation.empty()) {
-        vector<string> classNameParts;
-
-        Util::SplitString(className, "/", classNameParts);
-
-        // remove the class name and leave just the package identifier of the original class
-        while (std::isupper(classNameParts.back().at(0))) {
-            classNameParts.pop_back();
-        }
-
-        Util::JoinString(classNameParts, "/", fullClassName);
-        fullClassName += "/" + extendNameAndLocation;
+        string tempClassName = className;
+        fullClassName = Util::ReplaceAll(tempClassName, "$", "_");
+        fullClassName += "_" + extendNameAndLocation;
     }
 
     return fullClassName;