Skip to content

Commit bf5ca01

Browse files
authored
fix optional name (#480)
1 parent 8d517bf commit bf5ca01

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

Plugins/JExtractSwiftPlugin/JExtractSwiftPlugin.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ struct JExtractSwiftBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
342342

343343
case .product(let product):
344344
guard let swiftJava = product.sourceModules.first(where: { $0.name == "SwiftJava" }) else {
345-
return nil
345+
continue
346346
}
347347

348348
// We are inside Sources/SwiftJava
@@ -372,4 +372,4 @@ func findExecutable(name: String) -> URL? {
372372
}
373373

374374
return nil
375-
}
375+
}

Sources/SwiftJavaToolLib/JavaClassTranslator.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,8 @@ extension JavaClassTranslator {
682682
// --- Handle other effects
683683
let throwsStr = javaMethod.throwsCheckedException ? "throws" : ""
684684
let swiftMethodName = javaMethod.getName().escapedSwiftName
685-
685+
let swiftOptionalMethodName = "\(javaMethod.getName())Optional".escapedSwiftName
686+
686687
// Compute the parameters for '@...JavaMethod(...)'
687688
let methodAttribute: AttributeSyntax
688689
if implementedInSwift {
@@ -743,7 +744,7 @@ extension JavaClassTranslator {
743744
"""
744745
\(methodAttribute)\(raw: accessModifier)\(raw: overrideOpt)func \(raw: swiftMethodName)\(raw: genericParameterClauseStr)(\(raw: parametersStr))\(raw: throwsStr)\(raw: resultTypeStr)\(raw: whereClause)
745746
746-
\(raw: accessModifier)\(raw: overrideOpt)func \(raw: swiftMethodName)Optional\(raw: genericParameterClauseStr)(\(raw: parameters.map(\.clause.description).joined(separator: ", ")))\(raw: throwsStr) -> \(raw: resultOptional)\(raw: whereClause) {
747+
\(raw: accessModifier)\(raw: overrideOpt)func \(raw: swiftOptionalMethodName)\(raw: genericParameterClauseStr)(\(raw: parameters.map(\.clause.description).joined(separator: ", ")))\(raw: throwsStr) -> \(raw: resultOptional)\(raw: whereClause) {
747748
\(body)
748749
}
749750
"""

0 commit comments

Comments
 (0)