Replace DescriptorVisibility with Visibility in Java model classes

compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/resolve/KotlinClassifiersCache.kt

@@ -20,19 +20,20 @@ import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiField
 import com.intellij.psi.PsiLiteralExpression
 import com.intellij.psi.search.SearchScope
-import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
-import org.jetbrains.kotlin.descriptors.DescriptorVisibility
+import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.descriptors.Visibility
+import org.jetbrains.kotlin.descriptors.java.JavaVisibilities
 import org.jetbrains.kotlin.fileClasses.javaFileFacadeFqName
 import org.jetbrains.kotlin.javac.JavaClassWithClassId
 import org.jetbrains.kotlin.javac.JavacWrapper
 import org.jetbrains.kotlin.lexer.KtTokens
-import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities
 import org.jetbrains.kotlin.load.java.structure.*
+import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.psi.KtClassOrObject
+import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
-import org.jetbrains.kotlin.name.ClassId
-import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.visibilityModifierType
 
 class KotlinClassifiersCache(sourceFiles: Collection<KtFile>,
@@ -98,15 +99,15 @@ class MockKotlinClassifier(override val classId: ClassId,
     override val fqName: FqName
         get() = classId.asSingleFqName()
 
-    override val visibility: DescriptorVisibility
+    override val visibility: Visibility
         get() = if (classOrObject == null) {
-            DescriptorVisibilities.PUBLIC
+            Visibilities.Public
         }
         else when (classOrObject.visibilityModifierType()) {
-            null, KtTokens.PUBLIC_KEYWORD -> DescriptorVisibilities.PUBLIC
-            KtTokens.PRIVATE_KEYWORD -> DescriptorVisibilities.PRIVATE
-            KtTokens.PROTECTED_KEYWORD -> DescriptorVisibilities.PROTECTED
-            else -> JavaDescriptorVisibilities.PACKAGE_VISIBILITY
+            null, KtTokens.PUBLIC_KEYWORD -> Visibilities.Public
+            KtTokens.PRIVATE_KEYWORD -> Visibilities.Private
+            KtTokens.PROTECTED_KEYWORD -> Visibilities.Protected
+            else -> JavaVisibilities.PackageVisibility
         }
 
     override val supertypes: Collection<JavaClassifierType>
@@ -186,7 +187,7 @@ class MockKotlinField(private val psiField: PsiField) : JavaField {
     override val isAbstract get() = shouldNotBeCalled()
     override val isStatic get() = shouldNotBeCalled()
     override val isFinal get() = shouldNotBeCalled()
-    override val visibility get() = shouldNotBeCalled()
+    override val visibility: Visibility get() = shouldNotBeCalled()
     override val containingClass get() = shouldNotBeCalled()
     override val isEnumEntry get() = shouldNotBeCalled()
     override val type get() = shouldNotBeCalled()

compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/symbols/FakeSymbolBasedClass.kt

@@ -7,8 +7,8 @@ package org.jetbrains.kotlin.javac.wrappers.symbols
 
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.search.SearchScope
-import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
-import org.jetbrains.kotlin.descriptors.DescriptorVisibility
+import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.javac.JavaClassWithClassId
 import org.jetbrains.kotlin.javac.JavacWrapper
 import org.jetbrains.kotlin.load.java.structure.*
@@ -37,7 +37,7 @@ class FakeSymbolBasedClass(
 
     override val isFinal: Boolean get() = false
 
-    override val visibility: DescriptorVisibility get() = DescriptorVisibilities.PUBLIC
+    override val visibility: Visibility get() = Visibilities.Public
 
     override val typeParameters: List<JavaTypeParameter> get() = emptyList()
 

compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/symbols/SymbolBasedClass.kt

@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.javac.wrappers.symbols
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.CommonClassNames
 import com.intellij.psi.search.SearchScope
-import org.jetbrains.kotlin.descriptors.DescriptorVisibility
+import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.javac.JavaClassWithClassId
 import org.jetbrains.kotlin.javac.JavacWrapper
 import org.jetbrains.kotlin.load.java.structure.*
@@ -54,7 +54,7 @@ class SymbolBasedClass(
     override val isFinal: Boolean
         get() = element.isFinal
 
-    override val visibility: DescriptorVisibility
+    override val visibility: Visibility
         get() = element.getVisibility()
 
     override val typeParameters: List<JavaTypeParameter>

compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/symbols/SymbolBasedMember.kt

@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.javac.wrappers.symbols
 
-import org.jetbrains.kotlin.descriptors.DescriptorVisibility
+import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.javac.JavacWrapper
 import org.jetbrains.kotlin.load.java.structure.JavaAnnotation
 import org.jetbrains.kotlin.load.java.structure.JavaClass
@@ -36,7 +36,7 @@ abstract class SymbolBasedMember<out T : Element>(
 
     override fun findAnnotation(fqName: FqName) = element.findAnnotation(fqName, javac)
 
-    override val visibility: DescriptorVisibility
+    override val visibility: Visibility
         get() = element.getVisibility()
 
     override val name: Name

compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/symbols/utils.kt

@@ -16,10 +16,10 @@
 
 package org.jetbrains.kotlin.javac.wrappers.symbols
 
-import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
-import org.jetbrains.kotlin.descriptors.DescriptorVisibility
+import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.descriptors.Visibility
+import org.jetbrains.kotlin.descriptors.java.JavaVisibilities
 import org.jetbrains.kotlin.javac.JavacWrapper
-import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities
 import org.jetbrains.kotlin.load.java.structure.JavaValueParameter
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
@@ -36,20 +36,20 @@ internal val Element.isStatic: Boolean
 internal val Element.isFinal: Boolean
     get() = modifiers.contains(Modifier.FINAL)
 
-internal fun Element.getVisibility(): DescriptorVisibility = modifiers.getVisibility()
+internal fun Element.getVisibility(): Visibility = modifiers.getVisibility()
 
-internal fun Set<Modifier>.getVisibility(): DescriptorVisibility =
+internal fun Set<Modifier>.getVisibility(): Visibility =
     when {
-        Modifier.PUBLIC in this -> DescriptorVisibilities.PUBLIC
-        Modifier.PRIVATE in this -> DescriptorVisibilities.PRIVATE
+        Modifier.PUBLIC in this -> Visibilities.Public
+        Modifier.PRIVATE in this -> Visibilities.Private
         Modifier.PROTECTED in this -> {
             if (Modifier.STATIC in this) {
-                JavaDescriptorVisibilities.PROTECTED_STATIC_VISIBILITY
+                JavaVisibilities.ProtectedStaticVisibility
             } else {
-                JavaDescriptorVisibilities.PROTECTED_AND_PACKAGE
+                JavaVisibilities.ProtectedAndPackage
             }
         }
-        else -> JavaDescriptorVisibilities.PACKAGE_VISIBILITY
+        else -> JavaVisibilities.PackageVisibility
     }
 
 

compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/trees/TreeBasedClass.kt

@@ -23,8 +23,8 @@ import com.sun.source.tree.Tree
 import com.sun.tools.javac.code.Flags
 import com.sun.tools.javac.tree.JCTree
 import com.sun.tools.javac.tree.TreeInfo
-import org.jetbrains.kotlin.descriptors.DescriptorVisibilities.PUBLIC
-import org.jetbrains.kotlin.descriptors.DescriptorVisibility
+import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.javac.JavaClassWithClassId
 import org.jetbrains.kotlin.javac.JavacWrapper
 import org.jetbrains.kotlin.load.java.structure.*
@@ -62,8 +62,8 @@ class TreeBasedClass(
     override val isFinal: Boolean
         get() = isEnum || tree.modifiers.isFinal
 
-    override val visibility: DescriptorVisibility
-        get() = if (outerClass?.isInterface == true) PUBLIC else tree.modifiers.visibility
+    override val visibility: Visibility
+        get() = if (outerClass?.isInterface == true) Visibilities.Public else tree.modifiers.visibility
 
     override val typeParameters: List<JavaTypeParameter>
         get() = tree.typeParameters.map { parameter ->

compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/trees/TreeBasedConstructor.kt

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.javac.wrappers.trees
 
 import com.sun.source.tree.CompilationUnitTree
 import com.sun.tools.javac.tree.JCTree
-import org.jetbrains.kotlin.descriptors.DescriptorVisibility
+import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.javac.JavacWrapper
 import org.jetbrains.kotlin.load.java.structure.JavaClass
 import org.jetbrains.kotlin.load.java.structure.JavaConstructor
@@ -45,7 +45,7 @@ class TreeBasedConstructor(
     override val isFinal: Boolean
         get() = true
 
-    override val visibility: DescriptorVisibility
+    override val visibility: Visibility
         get() = tree.modifiers.visibility
 
     override val typeParameters: List<JavaTypeParameter>

compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/trees/TreeBasedField.kt

@@ -19,8 +19,8 @@ package org.jetbrains.kotlin.javac.wrappers.trees
 import com.sun.source.tree.CompilationUnitTree
 import com.sun.tools.javac.code.Flags
 import com.sun.tools.javac.tree.JCTree
-import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
-import org.jetbrains.kotlin.descriptors.DescriptorVisibility
+import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.javac.JavacWrapper
 import org.jetbrains.kotlin.javac.resolve.ConstantEvaluator
 import org.jetbrains.kotlin.load.java.structure.JavaClass
@@ -47,8 +47,8 @@ class TreeBasedField(
     override val isFinal: Boolean
         get() = containingClass.isInterface || tree.modifiers.isFinal
 
-    override val visibility: DescriptorVisibility
-        get() = if (containingClass.isInterface) DescriptorVisibilities.PUBLIC else tree.modifiers.visibility
+    override val visibility: Visibility
+        get() = if (containingClass.isInterface) Visibilities.Public else tree.modifiers.visibility
 
     override val isEnumEntry: Boolean
         get() = tree.modifiers.flags and Flags.ENUM.toLong() != 0L

compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/trees/TreeBasedMethod.kt

@@ -18,8 +18,8 @@ package org.jetbrains.kotlin.javac.wrappers.trees
 
 import com.sun.source.tree.CompilationUnitTree
 import com.sun.tools.javac.tree.JCTree
-import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
-import org.jetbrains.kotlin.descriptors.DescriptorVisibility
+import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.javac.JavacWrapper
 import org.jetbrains.kotlin.load.java.structure.*
 import org.jetbrains.kotlin.name.Name
@@ -43,8 +43,8 @@ class TreeBasedMethod(
     override val isFinal: Boolean
         get() = tree.modifiers.isFinal
 
-    override val visibility: DescriptorVisibility
-        get() = if (containingClass.isInterface) DescriptorVisibilities.PUBLIC else tree.modifiers.visibility
+    override val visibility: Visibility
+        get() = if (containingClass.isInterface) Visibilities.Public else tree.modifiers.visibility
 
     override val typeParameters: List<JavaTypeParameter>
         get() = tree.typeParameters.map { TreeBasedTypeParameter(it, compilationUnit, javac, this) }

compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/trees/utils.kt

@@ -17,7 +17,7 @@
 package org.jetbrains.kotlin.javac.wrappers.trees
 
 import com.sun.tools.javac.tree.JCTree
-import org.jetbrains.kotlin.descriptors.DescriptorVisibility
+import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.javac.wrappers.symbols.SymbolBasedArrayAnnotationArgument
 import org.jetbrains.kotlin.javac.wrappers.symbols.SymbolBasedReferenceAnnotationArgument
 import org.jetbrains.kotlin.javac.wrappers.symbols.getVisibility
@@ -39,7 +39,7 @@ internal val JCTree.JCModifiers.isStatic: Boolean
 internal val JCTree.JCModifiers.hasDefaultModifier: Boolean
     get() = Modifier.DEFAULT in getFlags()
 
-internal val JCTree.JCModifiers.visibility: DescriptorVisibility
+internal val JCTree.JCModifiers.visibility: Visibility
     get() = getFlags().getVisibility()
 
 internal fun JCTree.annotations(): Collection<JCTree.JCAnnotation> = when (this) {