Java2Swift: Use the parent's Swift type name to form nested type names

Author: DougGregor

Sources/Java2Swift/JavaToSwift.swift

@@ -224,9 +224,14 @@ struct JavaToSwift: ParsableCommand {
         currentClassIndex += 1
       }
 
+      // The current class we're in.
+      let currentClass = allClassesToVisit[currentClassIndex]
+      guard let currentSwiftName = translator.translatedClasses[currentClass.getName()]?.swiftType else {
+        continue
+      }
+
       // Find all of the nested classes that weren't explicitly translated
       // already.
-      let currentClass = allClassesToVisit[currentClassIndex]
       let nestedClasses: [JavaClass<JavaObject>] = currentClass.getClasses().compactMap { nestedClass in
         guard let nestedClass else { return nil }
 
@@ -242,7 +247,9 @@ struct JavaToSwift: ParsableCommand {
         }
 
         // Record this as a translated class.
-        let swiftName = javaClassName.defaultSwiftNameForJavaClass
+        let swiftUnqualifiedName = javaClassName.javaClassNameToCanonicalName
+          .defaultSwiftNameForJavaClass
+        let swiftName = "\(currentSwiftName).\(swiftUnqualifiedName)"
         translator.translatedClasses[javaClassName] = (swiftName, nil, true)
         return nestedClass
       }

Tests/Java2SwiftTests/Java2SwiftTests.swift

@@ -169,9 +169,52 @@ class Java2SwiftTests: XCTestCase {
           public struct Redirect {
         """,
         """
+        public func redirectError() -> ProcessBuilder.Redirect?
+        """,
+        """
         extension ProcessBuilder.Redirect {
           @JavaClass("java.lang.ProcessBuilder$Redirect$Type")
           public struct Type {
+        """,
+      ]
+    )
+  }
+
+  func testNestedRenamedSubclasses() throws {
+    try assertTranslatedClass(
+      ProcessBuilder.self,
+      swiftTypeName: "ProcessBuilder",
+      translatedClasses: [
+        "java.lang.ProcessBuilder": ("ProcessBuilder", nil, true),
+        "java.lang.ProcessBuilder$Redirect": ("ProcessBuilder.PBRedirect", nil, true),
+        "java.lang.ProcessBuilder$Redirect$Type": ("ProcessBuilder.PBRedirect.JavaType", nil, true),
+      ],
+      nestedClasses: [
+        "java.lang.ProcessBuilder": [JavaClass<ProcessBuilder.Redirect>().as(JavaClass<JavaObject>.self)!],
+        "java.lang.ProcessBuilder$Redirect": [JavaClass<ProcessBuilder.Redirect.JavaType>().as(JavaClass<JavaObject>.self)!],
+      ],
+      expectedChunks: [
+        "import JavaKit",
+        """
+          @JavaMethod
+          public func redirectInput() -> ProcessBuilder.PBRedirect?
+        """,
+        """
+        extension ProcessBuilder {
+          @JavaClass("java.lang.ProcessBuilder$Redirect")
+          public struct PBRedirect {
+        """,
+        """
+        public func redirectError() -> ProcessBuilder.PBRedirect?
+        """,
+        """
+        extension ProcessBuilder.PBRedirect {
+          @JavaClass("java.lang.ProcessBuilder$Redirect$Type")
+          public struct JavaType {
+        """,
+        """
+          @JavaMethod
+          public func type() -> ProcessBuilder.PBRedirect.JavaType?
         """
       ]
     )