Rename Visibility to DescriptorVisibility

compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt

@@ -278,15 +278,15 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager, private val l
     }
 
     private class MyPropertyDescriptor(
-        containingDeclaration: DeclarationDescriptor,
-        original: PropertyDescriptor?,
-        annotations: Annotations,
-        modality: Modality,
-        visibility: Visibility,
-        isVar: Boolean,
-        name: Name,
-        kind: CallableMemberDescriptor.Kind,
-        source: SourceElement
+            containingDeclaration: DeclarationDescriptor,
+            original: PropertyDescriptor?,
+            annotations: Annotations,
+            modality: Modality,
+            visibility: DescriptorVisibility,
+            isVar: Boolean,
+            name: Name,
+            kind: CallableMemberDescriptor.Kind,
+            source: SourceElement
     ) : SyntheticJavaPropertyDescriptor, PropertyDescriptorImpl(
         containingDeclaration, original, annotations, modality, visibility, isVar, name, kind, source,
         /* lateInit = */ false, /* isConst = */ false, /* isExpect = */ false, /* isActual = */ false, /* isExternal = */ false,
@@ -372,13 +372,13 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager, private val l
         }
 
         override fun createSubstitutedCopy(
-            newOwner: DeclarationDescriptor,
-            newModality: Modality,
-            newVisibility: Visibility,
-            original: PropertyDescriptor?,
-            kind: CallableMemberDescriptor.Kind,
-            newName: Name,
-            source: SourceElement
+                newOwner: DeclarationDescriptor,
+                newModality: Modality,
+                newVisibility: DescriptorVisibility,
+                original: PropertyDescriptor?,
+                kind: CallableMemberDescriptor.Kind,
+                newName: Name,
+                source: SourceElement
         ): PropertyDescriptorImpl {
             return MyPropertyDescriptor(newOwner, this, annotations, newModality, newVisibility, isVar, newName, kind, this.source).apply {
                 getMethod = this@MyPropertyDescriptor.getMethod

compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/syntheticExtensionsUtils.kt

@@ -32,20 +32,20 @@ fun FunctionDescriptor.hasJavaOriginInHierarchy(): Boolean {
         original.overriddenDescriptors.any { it.hasJavaOriginInHierarchy() }
 }
 
-fun Visibility.isVisibleOutside() = this != Visibilities.PRIVATE && this != Visibilities.PRIVATE_TO_THIS && this != Visibilities.INVISIBLE_FAKE
+fun DescriptorVisibility.isVisibleOutside() = this != DescriptorVisibilities.PRIVATE && this != DescriptorVisibilities.PRIVATE_TO_THIS && this != DescriptorVisibilities.INVISIBLE_FAKE
 
-fun syntheticVisibility(originalDescriptor: DeclarationDescriptorWithVisibility, isUsedForExtension: Boolean): Visibility {
+fun syntheticVisibility(originalDescriptor: DeclarationDescriptorWithVisibility, isUsedForExtension: Boolean): DescriptorVisibility {
     val originalVisibility = originalDescriptor.visibility
     return when (originalVisibility) {
-        Visibilities.PUBLIC -> Visibilities.PUBLIC
+        DescriptorVisibilities.PUBLIC -> DescriptorVisibilities.PUBLIC
 
-        else -> object : Visibility(originalVisibility.name, originalVisibility.isPublicAPI) {
+        else -> object : DescriptorVisibility(originalVisibility.name, originalVisibility.isPublicAPI) {
             override fun isVisible(
                     receiver: ReceiverValue?,
                     what: DeclarationDescriptorWithVisibility,
                     from: DeclarationDescriptor
             ) = originalVisibility.isVisible(
-                    if (isUsedForExtension) Visibilities.ALWAYS_SUITABLE_RECEIVER else receiver, originalDescriptor, from)
+                    if (isUsedForExtension) DescriptorVisibilities.ALWAYS_SUITABLE_RECEIVER else receiver, originalDescriptor, from)
 
             override fun mustCheckInImports()
                     = throw UnsupportedOperationException("Should never be called for this visibility")
@@ -69,4 +69,4 @@ fun <D : CallableDescriptor> ResolvedCall<D>.isResolvedWithSamConversions(): Boo
     return this.resultingDescriptor is SamAdapterDescriptor<*> ||
             this.resultingDescriptor is SamConstructorDescriptor ||
             this.resultingDescriptor is SamAdapterExtensionFunctionDescriptor
-}
+}