fix visibility check for public override

(cherry picked from commit dac1adc)
google · Sep 1, 2021 · b612477 · b612477
1 parent df04f42
commit b612477
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 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
@@ -137,6 +137,7 @@ fun KSTypeAlias.findActualType(): KSClassDeclaration {
  */
 fun KSDeclaration.getVisibility(): Visibility {
     return when {
+        this.modifiers.contains(Modifier.PUBLIC) -> Visibility.PUBLIC
         this.modifiers.contains(Modifier.OVERRIDE) -> {
             when (this) {
                 is KSFunctionDeclaration -> this.findOverridee()?.getVisibility()
@@ -149,7 +150,6 @@ fun KSDeclaration.getVisibility(): Visibility {
         this.modifiers.contains(Modifier.PROTECTED) ||
             this.modifiers.contains(Modifier.OVERRIDE) -> Visibility.PROTECTED
         this.modifiers.contains(Modifier.INTERNAL) -> Visibility.INTERNAL
-        this.modifiers.contains(Modifier.PUBLIC) -> Visibility.PUBLIC
         else -> if (this.origin != Origin.JAVA && this.origin != Origin.JAVA_LIB)
             Visibility.PUBLIC else Visibility.JAVA_PACKAGE
     }

diff --git a/compiler-plugin/src/test/kotlin/com/google/devtools/ksp/processor/VisibilityProcessor.kt b/compiler-plugin/src/test/kotlin/com/google/devtools/ksp/processor/VisibilityProcessor.kt
@@ -45,6 +45,7 @@ class VisibilityProcessor : AbstractTestProcessor() {
         }.forEach { results.add(it) }
         val javaClass = resolver.getClassDeclarationByName("JavaClass")!!
         val kotlinClass = resolver.getClassDeclarationByName("KotlinClass")!!
+        val kotlinSubClass = resolver.getClassDeclarationByName("KotlinSubClass")!!
         javaClass.declarations.filterIsInstance<KSPropertyDeclaration>().map {
             "${it.simpleName.asString()}: ${it.getVisibility()},visible in A, B, D: " +
                 "${it.isVisibleFrom(symbolA)}, ${it.isVisibleFrom(symbolB)}, ${it.isVisibleFrom(symbolD)}"
@@ -53,6 +54,10 @@ class VisibilityProcessor : AbstractTestProcessor() {
             "${it.simpleName.asString()}: ${it.getVisibility()},visible in A, B, D: " +
                 "${it.isVisibleFrom(symbolA)}, ${it.isVisibleFrom(symbolB)}, ${it.isVisibleFrom(symbolD)}"
         }.forEach { results.add(it) }
+        kotlinSubClass.declarations.filterIsInstance<KSPropertyDeclaration>().map {
+            "${it.simpleName.asString()}: ${it.getVisibility()},visible in A, B, D: " +
+                "${it.isVisibleFrom(symbolA)}, ${it.isVisibleFrom(symbolB)}, ${it.isVisibleFrom(symbolD)}"
+        }.forEach { results.add(it) }
         return emptyList()
     }
 }
diff --git a/compiler-plugin/testData/api/visibilities.kt b/compiler-plugin/testData/api/visibilities.kt
@@ -24,6 +24,8 @@
 // <init>: PUBLIC,visible in A, B, D: true, true, true
 // javaPackageField: JAVA_PACKAGE,visible in A, B, D: true, false, true
 // x: INTERNAL,visible in A, B, D: false, false, false
+// y: PROTECTED,visible in A, B, D: true, false, true
+// y: PUBLIC,visible in A, B, D: true, true, true
 // END
 
 // MODULE: lib
@@ -33,8 +35,9 @@ public class JavaClass {
 }
 
 // FILE: lib.kt
-class KotlinClass {
-    internal val x: Int = 0
+open class KotlinClass {
+    open internal val x: Int = 0
+    open protected val y: Int = 0
 }
 
 // MODULE: main(lib)
@@ -50,6 +53,9 @@ class A : C() {
 @TestD
 class D {}
 
+class KotlinSubClass : KotlinClass() {
+    public override val y = 1
+}
 
 // FILE: C.java
 class C {