Skip to content

Fix wrong order, or redundant try/await in generated code which caused warnings #503

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
Jan 7, 2026
Merged

Fix wrong order, or redundant try/await in generated code which caused warnings #503

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
d79dbc5
Fixs warning of try await
amanthatdoescares Dec 20, 2025
19a81fb
correct implementation, verify tests pass
ktoso Jan 7, 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
16 changes: 15 additions & 1 deletion Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+NativeTranslation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1033,7 +1033,21 @@ extension JNISwift2JavaGenerator {
)

func printDo(printer: inout CodePrinter) {
printer.print("let swiftResult$ = await \(placeholder)")
// Make sure try/await are printed when necessary and avoid duplicate, or wrong-order, keywords (which would cause warnings)
let placeholderWithoutTry =
if placeholder.hasPrefix("try ") {
String(placeholder.dropFirst("try ".count))
} else {
placeholder
}

let tryAwaitString: String =
if isThrowing {
"try await"
} else {
"await"
}
printer.print("let swiftResult$ = \(tryAwaitString) \(placeholderWithoutTry)")
printer.print("environment = try! JavaVirtualMachine.shared().environment()")
let inner = nativeFunctionSignature.result.conversion.render(&printer, "swiftResult$")
if swiftFunctionResultType.isVoid {
Expand Down
4 changes: 2 additions & 2 deletions Tests/JExtractSwiftTests/JNI/JNIAsyncTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ struct JNIAsyncTests {
deferEnvironment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)
}
do {
let swiftResult$ = await try SwiftModule.async()
let swiftResult$ = try await SwiftModule.async()
environment = try! JavaVirtualMachine.shared().environment()
_ = environment.interface.CallBooleanMethodA(environment, globalFuture, _JNIMethodIDCache.CompletableFuture.complete, [jvalue(l: nil)])
}
Expand All @@ -164,7 +164,7 @@ struct JNIAsyncTests {
deferEnvironment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)
}
do {
let swiftResult$ = await try SwiftModule.async()
let swiftResult$ = try await SwiftModule.async()
environment = try! JavaVirtualMachine.shared().environment()
_ = environment.interface.CallBooleanMethodA(environment, globalFuture, _JNIMethodIDCache.CompletableFuture.complete, [jvalue(l: nil)])
}
Expand Down
Loading