FE 1.0: introduce PrivateInFile effective visibility #KT-20094 Fixed

core/compiler.common/src/org/jetbrains/kotlin/descriptors/EffectiveVisibility.kt

@@ -24,6 +24,8 @@ sealed class EffectiveVisibility(val name: String, val publicApi: Boolean = fals
     //                    \                /       /InternalProtected(Derived)
     //                     \InternalProtectedBound/
     //                              |
+    //                        PrivateInFile
+    //                              |
     //                           Private = Local
 
 
@@ -42,6 +44,17 @@ sealed class EffectiveVisibility(val name: String, val publicApi: Boolean = fals
         override fun toVisibility(): Visibility = Visibilities.Local
     }
 
+    object PrivateInFile : EffectiveVisibility("private-in-file", privateApi = true) {
+        override fun relation(other: EffectiveVisibility, typeCheckerContextProvider: TypeCheckerProviderContext): Permissiveness =
+            when (other) {
+                this -> Permissiveness.SAME
+                Private, Local -> Permissiveness.MORE
+                else -> Permissiveness.LESS
+            }
+
+        override fun toVisibility(): Visibility = Visibilities.Private
+    }
+
     object Public : EffectiveVisibility("public", publicApi = true) {
         override fun relation(other: EffectiveVisibility, typeCheckerContextProvider: TypeCheckerProviderContext): Permissiveness =
             if (this == other) Permissiveness.SAME else Permissiveness.MORE
@@ -55,7 +68,7 @@ sealed class EffectiveVisibility(val name: String, val publicApi: Boolean = fals
         override fun relation(other: EffectiveVisibility, typeCheckerContextProvider: TypeCheckerProviderContext): Permissiveness =
             when (other) {
                 Public -> Permissiveness.LESS
-                Private, Local, InternalProtectedBound, is InternalProtected -> Permissiveness.MORE
+                Private, PrivateInFile, Local, InternalProtectedBound, is InternalProtected -> Permissiveness.MORE
                 is InternalOrPackage -> Permissiveness.SAME
                 ProtectedBound, is Protected -> Permissiveness.UNKNOWN
             }
@@ -63,7 +76,7 @@ sealed class EffectiveVisibility(val name: String, val publicApi: Boolean = fals
         override fun lowerBound(other: EffectiveVisibility, typeCheckerContextProvider: TypeCheckerProviderContext): EffectiveVisibility =
             when (other) {
                 Public -> this
-                Private, Local, InternalProtectedBound, is InternalOrPackage, is InternalProtected -> other
+                Private, PrivateInFile, Local, InternalProtectedBound, is InternalOrPackage, is InternalProtected -> other
                 is Protected -> InternalProtected(other.containerTypeConstructor)
                 ProtectedBound -> InternalProtectedBound
             }
@@ -88,7 +101,7 @@ sealed class EffectiveVisibility(val name: String, val publicApi: Boolean = fals
         override fun relation(other: EffectiveVisibility, typeCheckerContextProvider: TypeCheckerProviderContext): Permissiveness =
             when (other) {
                 Public -> Permissiveness.LESS
-                Private, Local, ProtectedBound, InternalProtectedBound -> Permissiveness.MORE
+                Private, PrivateInFile, Local, ProtectedBound, InternalProtectedBound -> Permissiveness.MORE
                 is Protected -> containerRelation(containerTypeConstructor, other.containerTypeConstructor, typeCheckerContextProvider)
                 is InternalProtected -> when (containerRelation(
                     containerTypeConstructor,
@@ -105,7 +118,7 @@ sealed class EffectiveVisibility(val name: String, val publicApi: Boolean = fals
         override fun lowerBound(other: EffectiveVisibility, typeCheckerContextProvider: TypeCheckerProviderContext): EffectiveVisibility =
             when (other) {
                 Public -> this
-                Private, Local, ProtectedBound, InternalProtectedBound -> other
+                Private, PrivateInFile, Local, ProtectedBound, InternalProtectedBound -> other
                 is Protected -> when (relation(other, typeCheckerContextProvider)) {
                     Permissiveness.SAME, Permissiveness.MORE -> this
                     Permissiveness.LESS -> other
@@ -126,7 +139,7 @@ sealed class EffectiveVisibility(val name: String, val publicApi: Boolean = fals
         override fun relation(other: EffectiveVisibility, typeCheckerContextProvider: TypeCheckerProviderContext): Permissiveness =
             when (other) {
                 Public, is Protected -> Permissiveness.LESS
-                Private, Local, InternalProtectedBound -> Permissiveness.MORE
+                Private, PrivateInFile, Local, InternalProtectedBound -> Permissiveness.MORE
                 ProtectedBound -> Permissiveness.SAME
                 is InternalOrPackage, is InternalProtected -> Permissiveness.UNKNOWN
             }
@@ -134,7 +147,7 @@ sealed class EffectiveVisibility(val name: String, val publicApi: Boolean = fals
         override fun lowerBound(other: EffectiveVisibility, typeCheckerContextProvider: TypeCheckerProviderContext): EffectiveVisibility =
             when (other) {
                 Public, is Protected -> this
-                Private, Local, ProtectedBound, InternalProtectedBound -> other
+                Private, PrivateInFile, Local, ProtectedBound, InternalProtectedBound -> other
                 is InternalOrPackage, is InternalProtected -> InternalProtectedBound
             }
 
@@ -155,7 +168,7 @@ sealed class EffectiveVisibility(val name: String, val publicApi: Boolean = fals
         override fun relation(other: EffectiveVisibility, typeCheckerContextProvider: TypeCheckerProviderContext): Permissiveness =
             when (other) {
                 Public, is InternalOrPackage -> Permissiveness.LESS
-                Private, Local, InternalProtectedBound -> Permissiveness.MORE
+                Private, PrivateInFile, Local, InternalProtectedBound -> Permissiveness.MORE
                 is InternalProtected -> containerRelation(
                     containerTypeConstructor,
                     other.containerTypeConstructor,
@@ -176,7 +189,7 @@ sealed class EffectiveVisibility(val name: String, val publicApi: Boolean = fals
         override fun lowerBound(other: EffectiveVisibility, typeCheckerContextProvider: TypeCheckerProviderContext): EffectiveVisibility =
             when (other) {
                 Public, is InternalOrPackage -> this
-                Private, Local, InternalProtectedBound -> other
+                Private, PrivateInFile, Local, InternalProtectedBound -> other
                 is Protected, is InternalProtected -> when (relation(other, typeCheckerContextProvider)) {
                     Permissiveness.SAME, Permissiveness.MORE -> this
                     Permissiveness.LESS -> other
@@ -193,7 +206,7 @@ sealed class EffectiveVisibility(val name: String, val publicApi: Boolean = fals
         override fun relation(other: EffectiveVisibility, typeCheckerContextProvider: TypeCheckerProviderContext): Permissiveness =
             when (other) {
                 Public, is Protected, is InternalProtected, ProtectedBound, is InternalOrPackage -> Permissiveness.LESS
-                Private, Local -> Permissiveness.MORE
+                Private, PrivateInFile, Local -> Permissiveness.MORE
                 InternalProtectedBound -> Permissiveness.SAME
             }
 

core/descriptors/src/org/jetbrains/kotlin/descriptors/EffectiveVisibilityUtils.kt

@@ -20,7 +20,10 @@ fun DescriptorVisibility.effectiveVisibility(
 
 private fun DescriptorVisibility.forVisibility(descriptor: DeclarationDescriptor, checkPublishedApi: Boolean = false): EffectiveVisibility =
     when (this) {
-        DescriptorVisibilities.PRIVATE, DescriptorVisibilities.PRIVATE_TO_THIS, DescriptorVisibilities.INVISIBLE_FAKE -> EffectiveVisibility.Private
+        DescriptorVisibilities.PRIVATE_TO_THIS, DescriptorVisibilities.INVISIBLE_FAKE -> EffectiveVisibility.Private
+        DescriptorVisibilities.PRIVATE -> if (descriptor is ClassDescriptor &&
+            descriptor.containingDeclaration is PackageFragmentDescriptor
+        ) EffectiveVisibility.PrivateInFile else EffectiveVisibility.Private
         DescriptorVisibilities.PROTECTED -> EffectiveVisibility.Protected(
             (descriptor.containingDeclaration as? ClassDescriptor)?.defaultType?.constructor
         )