Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,11 @@ public func makeIntGenericEnum() -> GenericEnum<Int> {
if Bool.random() { return .foo } else { return .bar }
}

public enum GenericEnumWithValue<T> {
case some(T)
case none
}

extension MyID where T: BinaryInteger {
// Conditional extension functions are not exported
public func computeSomeValue() -> Int {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -511,17 +511,21 @@ extension JNISwift2JavaGenerator {
printer.printBraceBlock("public Case getCase(\(requiresSwiftArena ? "SwiftArena swiftArena" : ""))") { printer in
printer.printBraceBlock("return switch (this.getDiscriminator())", .semicolonNewLine) { printer in
for enumCase in decl.cases {
guard let translatedCase = self.translatedEnumCase(for: enumCase) else {
continue
}
if enumCase.parameters.isEmpty {
printer.print(
"case \(enumCase.name.uppercased()) -> new Case.\(translatedCase.name)();"
)
if let translatedCase = self.translatedEnumCase(for: enumCase) {
if enumCase.parameters.isEmpty {
printer.print(
"case \(enumCase.name.uppercased()) -> new Case.\(translatedCase.name)();"
)
} else {
let arenaArgument = translatedCase.requiresSwiftArena ? "swiftArena" : ""
printer.print(
"case \(enumCase.name.uppercased()) -> this.getAs\(translatedCase.name)(\(arenaArgument)).orElseThrow();"
)
}
} else {
let arenaArgument = translatedCase.requiresSwiftArena ? "swiftArena" : ""
logger.warning("\(decl.effectiveJavaName).\(enumCase.name) contains unsupported values so its getCase() method call throws an error.")
printer.print(
"case \(enumCase.name.uppercased()) -> this.getAs\(translatedCase.name)(\(arenaArgument)).orElseThrow();"
"case \(enumCase.name.uppercased()) -> throw new UnsupportedOperationException(\"\(decl.effectiveJavaName).\(enumCase.name) contains unsupported values.\");"
)
}
}
Expand Down
39 changes: 39 additions & 0 deletions Tests/JExtractSwiftTests/JNI/JNIGenericTypeTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,45 @@ struct JNIGenericTypeTests {
)
}

@Test
func genericEnumWithAssociatedValue() throws {
let input =
#"""
public enum MyOptional<Wrapped> {
case some(Wrapped)
case none
}
"""#

try assertOutput(
input: input,
.jni,
.java,
detectChunkByInitialLines: 2,
expectedChunks: [
"""
public enum Discriminator {
SOME,
NONE
}
""",
"""
public sealed interface Case {
record None() implements Case {}
}
""",
"""
public Case getCase() {
return switch (this.getDiscriminator()) {
case SOME -> throw new UnsupportedOperationException("MyOptional.some contains unsupported values.");
case NONE -> new Case.None();
};
}
""",
]
)
}

@Test
func nestedGenericType() throws {
let input =
Expand Down
Loading