Skip to content

jextract: Support fully qualified type names #576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktoso merged 2 commits into from
Feb 27, 2026
Merged

jextract: Support fully qualified type names #576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
882a9cd
Allow loading fully qualified type names
sidepelican Feb 27, 2026
8627938
Add case of module duplicated type name
sidepelican Feb 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+JavaTranslation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ extension FFMSwift2JavaGenerator {
throw JavaTranslationError.unhandledType(swiftType)
}

let javaType: JavaType = .class(package: nil, name: swiftNominalType.nominalTypeDecl.name)
let javaType: JavaType = .class(package: nil, name: swiftNominalType.nominalTypeDecl.qualifiedName)
Copy link
Contributor Author

@sidepelican sidepelican Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a secondary bug found incidentally🤣

return TranslatedResult(
javaResultType: javaType,
annotations: resultAnnotations,
Expand Down
2 changes: 1 addition & 1 deletion Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaTranslation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,7 @@ extension JNISwift2JavaGenerator {
}

// We assume this is a JExtract class.
let javaType = JavaType.class(package: nil, name: nominalType.nominalTypeDecl.name)
let javaType = JavaType.class(package: nil, name: nominalType.nominalTypeDecl.qualifiedName)
return TranslatedResult(
javaType: javaType,
annotations: resultAnnotations,
Expand Down
7 changes: 7 additions & 0 deletions Sources/JExtractSwiftLib/SwiftTypes/SwiftSymbolTable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,13 @@ package class SwiftSymbolTable {
self.parsedModule = parsedModule
self.importedModules = importedModules
}

func isModuleName(_ name: String) -> Bool {
if name == moduleName {
return true
}
return importedModules.keys.contains(name)
}
}

extension SwiftSymbolTable {
Expand Down
4 changes: 3 additions & 1 deletion Sources/JExtractSwiftLib/SwiftTypes/SwiftType.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,9 @@ extension SwiftType {
// FIXME: Need a more reasonable notion of which names are module names
// for this to work. What can we query for this information?
let parentType: SwiftType?
if memberType.baseType.trimmedDescription == "Swift" {
if let base = memberType.baseType.as(IdentifierTypeSyntax.self),
lookupContext.symbolTable.isModuleName(base.name.trimmedDescription)
{
parentType = nil
} else {
parentType = try SwiftType(memberType.baseType, lookupContext: lookupContext)
Expand Down
42 changes: 42 additions & 0 deletions Tests/JExtractSwiftTests/SwiftSymbolTableTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
//===----------------------------------------------------------------------===//

@_spi(Testing) import JExtractSwiftLib
import SwiftJavaConfigurationShared
import SwiftParser
import SwiftSyntax
import Testing
Expand Down Expand Up @@ -49,4 +50,45 @@ struct SwiftSymbolTableSuite {
#expect(symbolTable.lookupType("Y", parent: nil) == nil)
#expect(symbolTable.lookupType("Z", parent: nil) == nil)
}

@Test(arguments: [JExtractGenerationMode.jni, .ffm])
func resolveSelfModuleName(mode: JExtractGenerationMode) throws {
try assertOutput(
input: """
import Foundation
public struct MyValue {}

public func fullyQualifiedType() -> MyModule.MyValue
public func fullyQualifiedType2() -> Foundation.Data
""",
mode,
.java,
swiftModuleName: "MyModule",
detectChunkByInitialLines: 1,
expectedChunks: [
"public static MyValue fullyQualifiedType(",
"public static Data fullyQualifiedType2(",
]
)
}

@Test(arguments: [JExtractGenerationMode.jni, .ffm])
func resolveSelfModuleName_moduleDuplicatedName(mode: JExtractGenerationMode) throws {
try assertOutput(
input: """
public struct MyModule {
public struct MyValue {}
}

public func fullyQualifiedType() -> MyModule.MyModule.MyValue
""",
mode,
.java,
swiftModuleName: "MyModule",
detectChunkByInitialLines: 1,
expectedChunks: [
"public static MyModule.MyValue fullyQualifiedType("
]
)
}
}
Loading