Skip to content

java2swift: add non-optional-returning as function to JavaClassMacro #74

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
merged 6 commits into from
Oct 18, 2024
Merged

java2swift: add non-optional-returning as function to JavaClassMacro #74

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cf5f272
add non-optional-returning `as` function to `JavaClassMacro`
AbdAlRahmanGad Oct 12, 2024
66b960e
add docs for more clarity
AbdAlRahmanGad Oct 13, 2024
07a8ff1
java2swift: add non-optional `as` function for superclassess
AbdAlRahmanGad Oct 17, 2024
fd9a859
replace `\(raw: superclass)` parameter with `\(raw:superclass).type`
AbdAlRahmanGad Oct 18, 2024
f236487
Uppercase Type to make the syntax valid Swift
ktoso Oct 18, 2024
e76893d
Change 'named(as)' to 'named(`as`)'
AbdAlRahmanGad Oct 18, 2024
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
6 changes: 4 additions & 2 deletions Sources/JavaKit/Macros.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
named(javaThis),
named(javaEnvironment),
named(init(javaHolder:)),
named(JavaSuperclass)
named(JavaSuperclass),
named(as)
)
@attached(extension, conformances: AnyJavaObject)
@attached(peer)
Expand Down Expand Up @@ -73,7 +74,8 @@ public macro JavaClass(
named(javaThis),
named(javaEnvironment),
named(init(javaHolder:)),
named(JavaSuperclass)
named(JavaSuperclass),
named(as)
)
@attached(extension, conformances: AnyJavaObject)
public macro JavaInterface(_ fullClassName: String, extends: (any AnyJavaObject.Type)?...) =
Expand Down
7 changes: 7 additions & 0 deletions Sources/JavaKitMacros/JavaClassMacro.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,20 @@ extension JavaClassMacro: MemberMacro {
}
"""

let nonOptionalAs: DeclSyntax = """
public func `as`<OtherClass: AnyJavaObject>(_: OtherClass.Type) -> OtherClass {
return OtherClass(javaHolder: javaHolder)
}
"""

return [
fullJavaClassNameMember,
superclassTypealias,
javaHolderMember,
javaThisMember,
javaEnvironmentMember,
initMember,
nonOptionalAs,
]
}
}
Expand Down
4 changes: 4 additions & 0 deletions Tests/JavaKitMacroTests/JavaClassMacroTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ class JavaKitMacroTests: XCTestCase {
public init(javaHolder: JavaObjectHolder) {
self.javaHolder = javaHolder
}

public func `as`<OtherClass: AnyJavaObject>(_: OtherClass.Type) -> OtherClass {
return OtherClass(javaHolder: javaHolder)
}
}
""",
macros: Self.javaKitMacros
Expand Down
Loading