Merge pull request #146 from DougGregor/example-fixes

DougGregor · web-flow · commit 719ae11a3ede · 2024-11-01T14:51:59.000-07:00
Fixes for importing Java classes as Swift classes
diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitExample/JavaKitExample.swift b/Samples/JavaKitSampleApp/Sources/JavaKitExample/JavaKitExample.swift
@@ -57,7 +57,7 @@ extension HelloSwift: HelloSwiftNativeMethods {
       print("Hello from the subclass!")
       helloSub.greetMe()
 
-      assert(helloSub.super.value == 2.71828)
+      assert(helloSub.value == 2.71828)
     } else {
       fatalError("Expected subclass here")
     }
diff --git a/Sources/JavaKitMacros/JavaFieldMacro.swift b/Sources/JavaKitMacros/JavaFieldMacro.swift
@@ -65,7 +65,8 @@ extension JavaFieldMacro: AccessorMacro {
     ]
 
     let nonmutatingModifier =
-      (context.lexicalContext.first?.is(ClassDeclSyntax.self) ?? false)
+      (context.lexicalContext.first?.is(ClassDeclSyntax.self) ?? false ||
+       context.lexicalContext.first?.is(ExtensionDeclSyntax.self) ?? false)
         ? ""
         : "nonmutating "
 

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ extension HelloSwift: HelloSwiftNativeMethods {`
`57`	`57`	`print("Hello from the subclass!")`
`58`	`58`	`helloSub.greetMe()`
`59`	`59`
`60`		`- assert(helloSub.super.value == 2.71828)`
	`60`	`+ assert(helloSub.value == 2.71828)`
`61`	`61`	`} else {`
`62`	`62`	`fatalError("Expected subclass here")`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,8 @@ extension JavaFieldMacro: AccessorMacro {`
`65`	`65`	`]`
`66`	`66`
`67`	`67`	`let nonmutatingModifier =`
`68`		`- (context.lexicalContext.first?.is(ClassDeclSyntax.self) ?? false)`
	`68`	`+ (context.lexicalContext.first?.is(ClassDeclSyntax.self) ?? false \|\|`
	`69`	`+ context.lexicalContext.first?.is(ExtensionDeclSyntax.self) ?? false)`
`69`	`70`	`? ""`
`70`	`71`	`: "nonmutating "`
`71`	`72`