Update Text

Author: jrosen081

Sources/JavaKitMacros/JavaFieldMacro.swift

@@ -33,9 +33,9 @@ extension JavaFieldMacro: AccessorMacro {
       return []
     }
 
-    let isStatic = node.attributeName.trimmedDescription == "JavaStaticMethod"
+    let isStatic = node.attributeName.trimmedDescription == "JavaStaticField"
     guard !isStatic || isInStaticContext(context: context) else {
-      throw MacroExpansionErrorMessage("Cannot use @JavaStaticMethod outside of a JavaClass instance")
+      throw MacroExpansionErrorMessage("Cannot use @JavaStaticField outside of a JavaClass instance")
     }
 
     // Dig out the Java field name, if provided. Otherwise, use the name as written.
@@ -87,8 +87,8 @@ extension JavaFieldMacro: AccessorMacro {
 
   private static func isInStaticContext(context: some MacroExpansionContext) -> Bool {
     for lexicalContext in context.lexicalContext {
-      if let classSyntax = lexicalContext.as(StructDeclSyntax.self) {
-        if classSyntax.name.trimmedDescription.starts(with: "JavaClass") {
+      if let classSyntax = lexicalContext.as(ClassDeclSyntax.self) {
+        if classSyntax.name.trimmedDescription.starts(with: "JavaClass<") {
           return true
         } else {
           return false

Tests/JavaKitMacroTests/JavaClassMacroTests.swift

@@ -23,24 +23,35 @@ class JavaKitMacroTests: XCTestCase {
   static let javaKitMacros: [String: any Macro.Type] = [
     "JavaClass": JavaClassMacro.self,
     "JavaMethod": JavaMethodMacro.self,
-    "JavaField": JavaFieldMacro.self
+    "JavaField": JavaFieldMacro.self,
+    "JavaStaticField": JavaFieldMacro.self
   ]
 
   func testJavaStaticMethodFailure() throws {
     assertMacroExpansion(
       """
         @JavaClass("org.swift.example.HelloWorld")
-        public struct HelloWorld {
-          @JavaStaticMethod
-          public init(environment: JNIEnvironment? = nil)
+        public class HelloWorld {
+          @JavaStaticField
+          public var test: String
         }
       """,
       expandedSource: """
-
-        public struct HelloWorld {
+      
+        public class HelloWorld {
+          public var test: String
+      
+            /// The full Java class name for this Swift type.
+            open override class var fullJavaClassName: String {
+                "org.swift.example.HelloWorld"
+            }
+      
+            public required init(javaHolder: JavaObjectHolder) {
+                super.init(javaHolder: javaHolder)
+            }
         }
       """,
-      diagnostics: [DiagnosticSpec(message: "", line: 0, column: 0)],
+      diagnostics: [DiagnosticSpec(message: "Cannot use @JavaStaticField outside of a JavaClass instance", line: 3, column: 5)],
       macros: Self.javaKitMacros
     )
   }