Correctly support $

Author: jrosen081

Sources/Java2Swift/JavaToSwift.swift

@@ -229,25 +229,17 @@ struct JavaToSwift: ParsableCommand {
       // Note that we will be translating this Java class, so it is a known class.
       translator.translatedClasses[javaClassName] = (translatedSwiftName, nil, true)
 
-      var classes: [(classToImport: JavaClass<JavaObject>?, prefix: String)] = javaClass.getClasses().map { ($0, translatedSwiftName) }
+      var classes: [JavaClass<JavaObject>?] = javaClass.getClasses()
 
       // Go through all subclasses to find all of the classes to translate
-      while let (internalClass, prefix) = classes.popLast() {
+      while let internalClass = classes.popLast() {
         if let internalClass {
-          let (javaName, swiftName) = names(from: internalClass.getCanonicalName())
+          let (javaName, swiftName) = names(from: internalClass.getName())
           // If we have already been through this class, don't go through it again
           guard translator.translatedClasses[javaName] == nil else { continue }
-          let currentClassName: String
-          // If the prefix is the part of the canonical name, continue (else use the same)
-          // This is needed since `java.lang.Enum.EnumDesc` is one of the declared classes of all of the enums
-          if (internalClass.getCanonicalName().contains(prefix)) {
-            currentClassName = "\(prefix).\(swiftName)"
-          } else {
-            continue // If we have a class that is not a nested one, ignore it
-          }
-
+          let currentClassName = swiftName
           let currentSanitizedClassName = currentClassName.replacing("$", with: ".")
-          classes.append(contentsOf: internalClass.getClasses().map { ($0, currentSanitizedClassName) })
+          classes.append(contentsOf: internalClass.getClasses())
           translator.translatedClasses[javaName] = (currentSanitizedClassName, nil, true)
         }
       }
@@ -270,7 +262,7 @@ struct JavaToSwift: ParsableCommand {
       try writeContents(
         swiftFileText,
         to: swiftFileName,
-        description: "Java class '\(javaClass.getCanonicalName())' translation"
+        description: "Java class '\(javaClass.getName())' translation"
       )
     }
   }

Sources/Java2SwiftLib/JavaTranslator.swift

@@ -191,7 +191,7 @@ extension JavaTranslator {
   /// can produce multiple declarations, such as a separate extension of
   /// JavaClass to house static methods.
   package func translateClass(_ javaClass: JavaClass<JavaObject>) throws -> [DeclSyntax] {
-    let fullName = javaClass.getCanonicalName()
+    let fullName = javaClass.getName()
     let swiftTypeName = try getSwiftTypeNameFromJavaClassName(fullName)
     let (swiftParentType, swiftInnermostTypeName) = swiftTypeName.splitSwiftTypeName()
 
@@ -207,7 +207,7 @@ extension JavaTranslator {
     let extends: String
     if !javaClass.isInterface(),
       let superclass = javaClass.getSuperclass(),
-      superclass.getCanonicalName() != "java.lang.Object"
+       superclass.getName() != "java.lang.Object"
     {
       do {
         extends = ", extends: \(try getSwiftTypeName(superclass).swiftName).self"
@@ -287,7 +287,7 @@ extension JavaTranslator {
           do {
             let implementedInSwift = constructor.isNative &&
               constructor.getDeclaringClass()!.equals(javaClass.as(JavaObject.self)!) &&
-              swiftNativeImplementations.contains(javaClass.getCanonicalName())
+              swiftNativeImplementations.contains(javaClass.getName())
 
             let translated = try translateConstructor(
               constructor,
@@ -321,7 +321,7 @@ extension JavaTranslator {
 
           let implementedInSwift = method.isNative &&
             method.getDeclaringClass()!.equals(javaClass.as(JavaObject.self)!) &&
-            swiftNativeImplementations.contains(javaClass.getCanonicalName())
+            swiftNativeImplementations.contains(javaClass.getName())
 
           // Translate the method if we can.
           do {
@@ -460,7 +460,7 @@ extension JavaTranslator {
     // Members that are native and will instead go into a NativeMethods
     // protocol.
     var nativeMembers: [DeclSyntax] = []
-    if swiftNativeImplementations.contains(javaClass.getCanonicalName()) {
+    if swiftNativeImplementations.contains(javaClass.getName()) {
       nativeMembers.append(
         contentsOf: javaClass.getDeclaredMethods().compactMap {
           $0.flatMap { method in