Rename Visibility to DescriptorVisibility

idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/DebuggerFieldSyntheticScopeProvider.kt

@@ -190,14 +190,14 @@ class DebuggerFieldSyntheticScope(val javaSyntheticPropertiesScope: JavaSyntheti
 
         val getter = PropertyGetterDescriptorImpl(
             propertyDescriptor, Annotations.EMPTY, Modality.FINAL,
-            Visibilities.PUBLIC, false, false, false,
+            DescriptorVisibilities.PUBLIC, false, false, false,
             CallableMemberDescriptor.Kind.SYNTHESIZED,
             null, sourceElement
         ).apply { initialize(type) }
 
         val setter = if (isVar) PropertySetterDescriptorImpl(
             propertyDescriptor, Annotations.EMPTY, Modality.FINAL,
-            Visibilities.PUBLIC, false, false, false,
+            DescriptorVisibilities.PUBLIC, false, false, false,
             CallableMemberDescriptor.Kind.SYNTHESIZED,
             null, sourceElement
         ).apply {
@@ -226,7 +226,7 @@ internal class DebuggerFieldPropertyDescriptor(
     null,
     Annotations.EMPTY,
     Modality.FINAL,
-    Visibilities.PUBLIC,
+    DescriptorVisibilities.PUBLIC,
     /*isVar = */isVar,
     Name.identifier(fieldName + "_field"),
     CallableMemberDescriptor.Kind.SYNTHESIZED,
@@ -237,4 +237,4 @@ internal class DebuggerFieldPropertyDescriptor(
     /*isActual = */false,
     /*isExternal = */false,
     /*isDelegated = */false
-)
+)

idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/CodeFragmentCompiler.kt

@@ -209,7 +209,7 @@ class CodeFragmentCompiler(private val executionContext: ExecutionContext, priva
 
         methodDescriptor.initialize(
             null, classDescriptor.thisAsReceiverParameter, emptyList(),
-            parameters, returnType, Modality.FINAL, Visibilities.PUBLIC
+            parameters, returnType, Modality.FINAL, DescriptorVisibilities.PUBLIC
         )
 
         val memberScope = EvaluatorMemberScopeForMethod(methodDescriptor)
@@ -301,4 +301,4 @@ private class EvaluatorModuleDescriptor(
 }
 
 private val OutputFile.internalClassName: String
-    get() = relativePath.removeSuffix(".class").replace('/', '.')
+    get() = relativePath.removeSuffix(".class").replace('/', '.')

idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/CodeFragmentParameterAnalyzer.kt

@@ -290,7 +290,7 @@ class CodeFragmentParameterAnalyzer(
             )
         }
 
-        val isLocalTarget = (target as? DeclarationDescriptorWithVisibility)?.visibility == Visibilities.LOCAL
+        val isLocalTarget = (target as? DeclarationDescriptorWithVisibility)?.visibility == DescriptorVisibilities.LOCAL
 
         val isPrimaryConstructorParameter = !isLocalTarget
                 && target is PropertyDescriptor
@@ -422,4 +422,4 @@ private class OnceUsedChecker(private val clazz: Class<*>) {
 
         used = true
     }
-}
+}

idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/DebugLabelPropertyDescriptorProvider.kt

@@ -88,7 +88,7 @@ class DebugLabelPropertyDescriptorProvider(val codeFragment: KtCodeFragment, val
             propertyDescriptor,
             Annotations.EMPTY,
             Modality.FINAL,
-            Visibilities.PUBLIC,
+            DescriptorVisibilities.PUBLIC,
             /* isDefault = */ false,
             /* isExternal = */ false,
             /* isInline = */ false,
@@ -205,7 +205,7 @@ internal class DebugLabelPropertyDescriptor(
     null,
     Annotations.EMPTY,
     Modality.FINAL,
-    Visibilities.PUBLIC,
+    DescriptorVisibilities.PUBLIC,
     /*isVar = */false,
     Name.identifier(labelName + "_DebugLabel"),
     CallableMemberDescriptor.Kind.SYNTHESIZED,

idea/jvm-debugger/jvm-debugger-util/src/org/jetbrains/kotlin/idea/debugger/FileRankingCalculator.kt

@@ -177,9 +177,9 @@ abstract class FileRankingCalculator(private val checkClassFqName: Boolean = tru
 
     private fun rankingForVisibility(descriptor: DeclarationDescriptorWithVisibility, accessible: Accessible): Ranking {
         return collect(
-            accessible.isPublic && descriptor.visibility == Visibilities.PUBLIC,
-            accessible.isProtected && descriptor.visibility == Visibilities.PROTECTED,
-            accessible.isPrivate && descriptor.visibility == Visibilities.PRIVATE
+            accessible.isPublic && descriptor.visibility == DescriptorVisibilities.PUBLIC,
+            accessible.isProtected && descriptor.visibility == DescriptorVisibilities.PROTECTED,
+            accessible.isPrivate && descriptor.visibility == DescriptorVisibilities.PRIVATE
         )
     }