upstream changes in visibility

Author: neetopia

compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSClassDeclarationDescriptorImpl.kt

@@ -53,13 +53,13 @@ class KSClassDeclarationDescriptorImpl private constructor(val descriptor: Class
 
     override fun getAllFunctions(): List<KSFunctionDeclaration> {
         return descriptor.unsubstitutedMemberScope.getDescriptorsFiltered(DescriptorKindFilter.FUNCTIONS).toList()
-            .filter { (it as FunctionDescriptor).visibility != Visibilities.INVISIBLE_FAKE }
+            .filter { (it as FunctionDescriptor).visibility.delegate != Visibilities.InvisibleFake}
             .map { KSFunctionDeclarationDescriptorImpl.getCached(it as FunctionDescriptor) }
     }
 
     override fun getAllProperties(): List<KSPropertyDeclaration> {
         return descriptor.unsubstitutedMemberScope.getDescriptorsFiltered(DescriptorKindFilter.VARIABLES).toList()
-                .filter { (it as PropertyDescriptor).visibility != Visibilities.INVISIBLE_FAKE }
+                .filter { (it as PropertyDescriptor).visibility.delegate != Visibilities.InvisibleFake}
                 .map { KSPropertyDeclarationDescriptorImpl.getCached(it as PropertyDescriptor) }
     }
 
@@ -83,8 +83,8 @@ class KSClassDeclarationDescriptorImpl private constructor(val descriptor: Class
         listOf(descriptor.unsubstitutedMemberScope.getDescriptorsFiltered(), descriptor.staticScope.getDescriptorsFiltered()).flatten()
             .filter {
                 it is MemberDescriptor
-                        && it.visibility != Visibilities.INHERITED
-                        && it.visibility != Visibilities.INVISIBLE_FAKE
+                        && it.visibility.delegate != Visibilities.Inherited
+                        && it.visibility.delegate != Visibilities.InvisibleFake
             }
             .map {
                 when (it) {

compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSClassDeclarationJavaImpl.kt

@@ -77,7 +77,7 @@ class KSClassDeclarationJavaImpl private constructor(val psi: PsiClass) : KSClas
         return descriptor?.let {
             it.unsubstitutedMemberScope.getDescriptorsFiltered(DescriptorKindFilter.FUNCTIONS)
                 .toList()
-                .filter { (it as FunctionDescriptor).visibility != Visibilities.INVISIBLE_FAKE }
+                .filter { (it as FunctionDescriptor).visibility.delegate != Visibilities.InvisibleFake }
                 .plus(it.constructors)
                 .map { (it as FunctionDescriptor).toKSFunctionDeclaration() }
         } ?: emptyList()
@@ -87,7 +87,7 @@ class KSClassDeclarationJavaImpl private constructor(val psi: PsiClass) : KSClas
         return descriptor?.let {
             it.unsubstitutedMemberScope.getDescriptorsFiltered(DescriptorKindFilter.VARIABLES)
                     .toList()
-                    .filter { (it as PropertyDescriptor).visibility != Visibilities.INVISIBLE_FAKE }
+                    .filter { (it as PropertyDescriptor).visibility.delegate != Visibilities.InvisibleFake }
                     .map{ (it as PropertyDescriptor).toKSPropertyDeclaration() }
         } ?: emptyList()
     }

compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSClassDeclarationImpl.kt

@@ -50,13 +50,13 @@ class KSClassDeclarationImpl private constructor(val ktClassOrObject: KtClassOrO
 
     override fun getAllFunctions(): List<KSFunctionDeclaration> {
         return descriptor.unsubstitutedMemberScope.getDescriptorsFiltered(DescriptorKindFilter.FUNCTIONS).toList()
-            .filter { (it as FunctionDescriptor).visibility != Visibilities.INVISIBLE_FAKE }
+            .filter { (it as FunctionDescriptor).visibility.delegate != Visibilities.InvisibleFake }
             .map { (it as FunctionDescriptor).toKSFunctionDeclaration() }
     }
 
     override fun getAllProperties(): List<KSPropertyDeclaration> {
         return descriptor.unsubstitutedMemberScope.getDescriptorsFiltered(DescriptorKindFilter.VARIABLES).toList()
-                .filter { (it as PropertyDescriptor).visibility != Visibilities.INVISIBLE_FAKE }
+                .filter { (it as PropertyDescriptor).visibility.delegate != Visibilities.InvisibleFake }
                 .map { (it as PropertyDescriptor).toKSPropertyDeclaration() }
     }
 

compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/utils.kt

@@ -33,11 +33,10 @@ import com.google.devtools.ksp.symbol.impl.java.KSPropertyDeclarationJavaImpl
 import com.google.devtools.ksp.symbol.impl.java.KSTypeArgumentJavaImpl
 import com.google.devtools.ksp.symbol.impl.kotlin.*
 import com.intellij.psi.impl.source.PsiClassImpl
+import org.jetbrains.kotlin.descriptors.java.JavaVisibilities
 import org.jetbrains.kotlin.lexer.KtTokens
-import org.jetbrains.kotlin.load.java.JavaVisibilities
 import org.jetbrains.kotlin.load.java.descriptors.JavaClassConstructorDescriptor
 import org.jetbrains.kotlin.psi.*
-import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
 import org.jetbrains.kotlin.resolve.source.getPsi
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.StarProjectionImpl
@@ -129,13 +128,13 @@ fun MemberDescriptor.toKSModifiers(): Set<Modifier> {
         Modality.OPEN -> modifiers.add(Modifier.OPEN)
         Modality.ABSTRACT -> modifiers.add(Modifier.ABSTRACT)
     }
-    when (this.visibility) {
-        Visibilities.PUBLIC -> modifiers.add(Modifier.PUBLIC)
-        Visibilities.PROTECTED, JavaVisibilities.PROTECTED_AND_PACKAGE -> modifiers.add(Modifier.PROTECTED)
-        Visibilities.PRIVATE -> modifiers.add(Modifier.PRIVATE)
-        Visibilities.INTERNAL -> modifiers.add(Modifier.INTERNAL)
+    when (this.visibility.delegate) {
+        Visibilities.Public -> modifiers.add(Modifier.PUBLIC)
+        Visibilities.Protected, JavaVisibilities.ProtectedAndPackage -> modifiers.add(Modifier.PROTECTED)
+        Visibilities.Private -> modifiers.add(Modifier.PRIVATE)
+        Visibilities.Internal -> modifiers.add(Modifier.INTERNAL)
         // Since there is no modifier for package-private, use No modifier to tell if a symbol from binary is package private.
-        JavaVisibilities.PACKAGE_VISIBILITY, JavaVisibilities.PROTECTED_STATIC_VISIBILITY -> Unit
+        JavaVisibilities.PackageVisibility, JavaVisibilities.ProtectedStaticVisibility -> Unit
         else -> throw IllegalStateException("unhandled visibility: ${this.visibility}")
     }
     return modifiers