fix paret lookup and add more tests

Author: madsodgaard

Samples/SwiftJavaExtractJNISampleApp/Sources/MySwiftLibrary/NestedTypes.swift

@@ -0,0 +1,47 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2025 Apple Inc. and the Swift.org project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift.org project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+
+import SwiftJava
+
+public class A {
+  public init() {}
+  
+  public class B {
+    public init() {}
+
+    public struct C {
+      public init() {}
+
+      public func g(a: A, b: B, bbc: BB.C) {}
+    }
+  }
+
+  public class BB {
+    public init() {}
+
+    public struct C {
+      public init() {}
+    }
+  }
+
+  public func f(a: A, b: A.B, c: A.B.C, bb: BB, bbc: BB.C) {}
+}
+
+public enum NestedEnum {
+  case one(OneStruct)
+
+  public struct OneStruct {
+    public init() {}
+  }
+}

Samples/SwiftJavaExtractJNISampleApp/src/test/java/com/example/swift/NestedTypesTest.java

@@ -0,0 +1,45 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2024 Apple Inc. and the Swift.org project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift.org project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+
+package com.example.swift;
+
+import org.junit.jupiter.api.Test;
+import org.swift.swiftkit.core.SwiftArena;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class NestedTypesTest {
+    @Test
+    void testClassesAndStructs() {
+        try (var arena = SwiftArena.ofConfined()) {
+            var a = A.init(arena);
+            var b = A.B.init(arena);
+            var c = A.B.C.init(arena);
+            var bb = A.BB.init(arena);
+            var abbc = A.BB.C.init(arena);
+
+            a.f(a, b, c, bb, abbc);
+            c.g(a, b, abbc);
+        }
+    }
+
+    @Test
+    void testStructInEnum() {
+        try (var arena = SwiftArena.ofConfined()) {
+            var obj = NestedEnum.one(NestedEnum.OneStruct.init(arena), arena);
+            var one = obj.getAsOne(arena);
+            assertTrue(one.isPresent());
+        }
+    }
+}

Sources/JExtractSwiftLib/JNI/JNICaching.swift

@@ -14,15 +14,15 @@
 
 enum JNICaching {
   static func cacheName(for type: ImportedNominalType) -> String {
-    cacheName(for: type.swiftNominal.name)
+    cacheName(for: type.swiftNominal.qualifiedName)
   }
 
   static func cacheName(for type: SwiftNominalType) -> String {
-    cacheName(for: type.nominalTypeDecl.name)
+    cacheName(for: type.nominalTypeDecl.qualifiedName)
   }
 
-  private static func cacheName(for name: String) -> String {
-    "_JNI_\(name)"
+  private static func cacheName(for qualifiedName: String) -> String {
+    "_JNI_\(qualifiedName.replacingOccurrences(of: ".", with: "_"))"
   }
 
   static func cacheMemberName(for enumCase: ImportedEnumCase) -> String {

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+SwiftThunkPrinting.swift

@@ -430,7 +430,7 @@ extension JNISwift2JavaGenerator {
     let cName =
       "Java_"
       + self.javaPackage.replacingOccurrences(of: ".", with: "_")
-      + "_\(parentName.escapedJNIIdentifier)_"
+      + "_\(parentName.replacingOccurrences(of: ".", with: "$").escapedJNIIdentifier)_"
       + javaMethodName.escapedJNIIdentifier
       + "__"
       + jniSignature.escapedJNIIdentifier
@@ -474,7 +474,7 @@ extension JNISwift2JavaGenerator {
     printCDecl(
       &printer,
       javaMethodName: "$typeMetadataAddressDowncall",
-      parentName: type.swiftNominal.name,
+      parentName: type.swiftNominal.qualifiedName,
       parameters: [],
       resultType: .long
     ) { printer in
@@ -493,7 +493,7 @@ extension JNISwift2JavaGenerator {
     printCDecl(
       &printer,
       javaMethodName: "$destroy",
-      parentName: type.swiftNominal.name,
+      parentName: type.swiftNominal.qualifiedName,
       parameters: [
         selfPointerParam
       ],

Sources/JExtractSwiftLib/SwiftTypes/SwiftTypeLookupContext.swift

@@ -120,14 +120,9 @@ class SwiftTypeLookupContext {
   /// Create a nominal type declaration instance for the specified syntax node.
   private func nominalTypeDeclaration(for node: NominalTypeDeclSyntaxNode, sourceFilePath: String) throws -> SwiftNominalTypeDeclaration {
 
-    if let symbolTableDeclaration = try self.symbolTable.lookupType(
-      node.name.identifier!.name,
-      parent: node.parent.flatMap {
-        if let asNominalType = $0 as? NominalTypeDeclSyntaxNode {
-          return try self.nominalTypeDeclaration(for: asNominalType, sourceFilePath: "FIXME.swift")
-        }
-        return nil
-      }
+    if let symbolTableDeclaration = self.symbolTable.lookupType(
+      node.name.text,
+      parent: try parentTypeDecl(for: node)
     ) {
       return symbolTableDeclaration
     }

Tests/JExtractSwiftTests/JNI/JNINestedTypesTests.swift

@@ -17,22 +17,24 @@ import Testing
 
 @Suite
 struct JNINestedTypesTests {
-  @Test("Import: class and struct A.B.C")
+  let source1 = """
+  public class A {
+    public class B {
+      public func g(c: C) {}
+
+      public struct C {
+        public func h(b: B) {}
+      }
+    }
+  }
+
+  public func f(a: A, b: A.B, c: A.B.C) {}
+  """
+
+  @Test("Import: class and struct A.B.C (Java)")
   func nestedClassesAndStructs_java() throws {
     try assertOutput(
-      input: """
-      public class A {
-        public class B {
-          public func g(c: B) {}
-      
-          public struct C {
-      
-          }
-        }
-      }
-      
-      public func f(a: A, b: A.B, c: A.B.C) {}
-      """,
+      input: source1,
       .jni, .java,
       detectChunkByInitialLines: 1,
       expectedChunks: [
@@ -42,19 +44,57 @@ struct JNINestedTypesTests {
           public static final class B implements JNISwiftInstance {
             ...
             public static final class C implements JNISwiftInstance {
-            ...
+              ...
+              public void h(A.B b) {
+              ...
             }
             ...
-            public static void g(A.B.C c) {
+            public void g(A.B.C c) {
             ...
           }
-        ...
+          ...
         }
         """,
         """
         public static void f(A a, A.B b, A.B.C c) {
           ...
         }
+        ...
+        """
+      ]
+    )
+  }
+
+  @Test("Import: class and struct A.B.C (Swift)")
+  func nestedClassesAndStructs_swift() throws {
+    try assertOutput(
+      input: source1,
+      .jni, .swift,
+      detectChunkByInitialLines: 1,
+      expectedChunks: [
+        """
+        @_cdecl("Java_com_example_swift_A__00024destroy__J")
+        func Java_com_example_swift_A__00024destroy__J(environment: UnsafeMutablePointer<JNIEnv?>!, thisClass: jclass, selfPointer: jlong) {
+          ...
+        }
+        """,
+        """
+        @_cdecl("Java_com_example_swift_A_00024B__00024destroy__J")
+        func Java_com_example_swift_A_00024B__00024destroy__J(environment: UnsafeMutablePointer<JNIEnv?>!, thisClass: jclass, selfPointer: jlong) {
+          ...
+        }
+        """,
+        """
+        @_cdecl("Java_com_example_swift_A_00024B__00024destroy__J")
+        func Java_com_example_swift_A_00024B__00024destroy__J(environment: UnsafeMutablePointer<JNIEnv?>!, thisClass: jclass, selfPointer: jlong) {
+          ...
+        }
+        """,
+        """
+        @_cdecl("Java_com_example_swift_A_00024B_00024C__00024h__JJ")
+        func Java_com_example_swift_A_00024B_00024C__00024h__JJ(environment: UnsafeMutablePointer<JNIEnv?>!, thisClass: jclass, b: jlong, self: jlong) {
+          ...
+        }
         """
       ]
     )