fix modifier calculation for synthetic members

(cherry picked from commit dcdecd7)
google · Mar 5, 2024 · e74274e · e74274e
1 parent e8e4967
commit e74274e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 2 deletions.
diff --git a/api/src/main/kotlin/com/google/devtools/ksp/utils.kt b/api/src/main/kotlin/com/google/devtools/ksp/utils.kt
@@ -213,7 +213,7 @@ fun KSPropertyDeclaration.isAbstract(): Boolean {
         (setter?.modifiers?.contains(Modifier.ABSTRACT) ?: true)
 }
 
-fun KSDeclaration.isOpen() = !this.isLocal() &&
+fun KSDeclaration.isOpen() = !this.isLocal() && !this.modifiers.contains(Modifier.FINAL) &&
     (
         (this as? KSClassDeclaration)?.classKind == ClassKind.INTERFACE ||
             this.modifiers.contains(Modifier.OVERRIDE) ||

diff --git a/...i/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/AbstractKSDeclarationImpl.kt b/...i/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/AbstractKSDeclarationImpl.kt
@@ -56,7 +56,7 @@ abstract class AbstractKSDeclarationImpl(val ktDeclarationSymbol: KtDeclarationS
     }
 
     override val modifiers: Set<Modifier> by lazy {
-        if (origin == Origin.JAVA_LIB || origin == Origin.KOTLIN_LIB) {
+        if (origin == Origin.JAVA_LIB || origin == Origin.KOTLIN_LIB || origin == Origin.SYNTHETIC) {
             when (ktDeclarationSymbol) {
                 is KtPropertySymbol -> ktDeclarationSymbol.toModifiers()
                 is KtClassOrObjectSymbol -> ktDeclarationSymbol.toModifiers()

diff --git a/kotlin-analysis-api/testData/visibilities.kt b/kotlin-analysis-api/testData/visibilities.kt
@@ -41,6 +41,7 @@
 // KtEnumWithVal: <init>: PRIVATE
 // KtEnumWithVal: values: PUBLIC
 // KtEnumWithVal: valueOf: PUBLIC
+// JavaAnnotation: value: PUBLIC
 // END
 
 // MODULE: lib
@@ -112,6 +113,11 @@ class C {
     }
 }
 
+// FILE: JavaAnnotation.java
+public @interface JavaAnnotation {
+    String value();
+}
+
 // FILE: Enum.java
 public enum Enum {
     Y,U,V;

diff --git a/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/VisibilityProcessor.kt b/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/VisibilityProcessor.kt
@@ -51,6 +51,7 @@ class VisibilityProcessor : AbstractTestProcessor() {
         val javaEnum = resolver.getClassDeclarationByName("Enum")!!
         val kotlinEnum = resolver.getClassDeclarationByName("KtEnum")!!
         val kotlinEnumWithVal = resolver.getClassDeclarationByName("KtEnumWithVal")!!
+        val javaAnnotation = resolver.getClassDeclarationByName("JavaAnnotation")!!
         javaClass.declarations.filterIsInstance<KSPropertyDeclaration>().map {
             "${it.simpleName.asString()}: ${it.getVisibility()},visible in A, B, D: " +
                 "${it.isVisibleFrom(symbolA)}, ${it.isVisibleFrom(symbolB)}, ${it.isVisibleFrom(symbolD)}"
@@ -78,6 +79,9 @@ class VisibilityProcessor : AbstractTestProcessor() {
         kotlinEnumWithVal.declarations.filterIsInstance<KSFunctionDeclaration>().map {
             "${kotlinEnumWithVal.simpleName.asString()}: ${it.simpleName.asString()}: ${it.getVisibility() }"
         }.forEach { results.add(it) }
+        javaAnnotation.declarations.filterIsInstance<KSPropertyDeclaration>().map {
+            "${javaAnnotation.simpleName.asString()}: ${it.simpleName.asString()}: ${it.getVisibility() }"
+        }.forEach { results.add(it) }
         return emptyList()
     }
 }
diff --git a/test-utils/testData/api/visibilities.kt b/test-utils/testData/api/visibilities.kt
@@ -108,6 +108,11 @@ class C {
     }
 }
 
+
+// FILE: JavaAnnotation.java
+public @interface JavaAnnotation {
+    String value();
+}
 // FILE: Enum.java
 public enum Enum {
     Y,U,V;