From c586056278b93d4344f10ec4dcc474128527275f Mon Sep 17 00:00:00 2001
From: Doug Gregor <dgregor@apple.com>
Date: Fri, 1 Nov 2024 14:41:36 -0700
Subject: [PATCH] Fixes for importing Java classes as Swift classes

---
 .../Sources/JavaKitExample/JavaKitExample.swift                | 2 +-
 Sources/JavaKitMacros/JavaFieldMacro.swift                     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Samples/JavaKitSampleApp/Sources/JavaKitExample/JavaKitExample.swift b/Samples/JavaKitSampleApp/Sources/JavaKitExample/JavaKitExample.swift
index 140c0604..42a5b789 100644
--- 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
index 40bf7113..7f60f26d 100644
--- 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 "