Skip to content

fix: optional method name in wrap-java #480

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 1 commit into from
Dec 4, 2025
Merged

fix: optional method name in wrap-java #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Plugins/JExtractSwiftPlugin/JExtractSwiftPlugin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ struct JExtractSwiftBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {

case .product(let product):
guard let swiftJava = product.sourceModules.first(where: { $0.name == "SwiftJava" }) else {
return nil
continue
}

// We are inside Sources/SwiftJava
Expand Down Expand Up @@ -373,4 +373,4 @@ func findExecutable(name: String) -> URL? {
}

return nil
}
}
5 changes: 3 additions & 2 deletions Sources/SwiftJavaToolLib/JavaClassTranslator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,8 @@ extension JavaClassTranslator {
// --- Handle other effects
let throwsStr = javaMethod.throwsCheckedException ? "throws" : ""
let swiftMethodName = javaMethod.getName().escapedSwiftName

let swiftOptionalMethodName = "\(javaMethod.getName())Optional".escapedSwiftName

// Compute the parameters for '@...JavaMethod(...)'
let methodAttribute: AttributeSyntax
if implementedInSwift {
Expand Down Expand Up @@ -743,7 +744,7 @@ extension JavaClassTranslator {
"""
\(methodAttribute)\(raw: accessModifier)\(raw: overrideOpt)func \(raw: swiftMethodName)\(raw: genericParameterClauseStr)(\(raw: parametersStr))\(raw: throwsStr)\(raw: resultTypeStr)\(raw: whereClause)

\(raw: accessModifier)\(raw: overrideOpt)func \(raw: swiftMethodName)Optional\(raw: genericParameterClauseStr)(\(raw: parameters.map(\.clause.description).joined(separator: ", ")))\(raw: throwsStr) -> \(raw: resultOptional)\(raw: whereClause) {
\(raw: accessModifier)\(raw: overrideOpt)func \(raw: swiftOptionalMethodName)\(raw: genericParameterClauseStr)(\(raw: parameters.map(\.clause.description).joined(separator: ", ")))\(raw: throwsStr) -> \(raw: resultOptional)\(raw: whereClause) {
\(body)
}
"""
Expand Down
Loading