FIR: Refine visibility check for class members

compiler/testData/diagnostics/tests/annotations/requireKotlin.fir.kt

@@ -8,5 +8,5 @@ class IllegalVersion()
 @<!INVISIBLE_REFERENCE!>RequireKotlin<!>("1.2")
 class LegalMinimum()
 
-@<!INVISIBLE_REFERENCE!>RequireKotlin<!>("1.2", versionKind = <!INVISIBLE_REFERENCE!>RequireKotlinVersionKind<!>.COMPILER_VERSION, message = "Requires newer compiler version to be inlined correctly.")
+@<!INVISIBLE_REFERENCE!>RequireKotlin<!>("1.2", versionKind = <!INVISIBLE_REFERENCE!>RequireKotlinVersionKind<!>.<!INVISIBLE_REFERENCE!>COMPILER_VERSION<!>, message = "Requires newer compiler version to be inlined correctly.")
 class LegalStdLib()

compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.fir.kt

@@ -5,7 +5,7 @@ fun test() {
   A.Companion.<!INVISIBLE_REFERENCE!>f<!>
   B.D
   CCC
-  CCC.classObjectVar
+  CCC.<!INVISIBLE_REFERENCE!>classObjectVar<!>
 }
 
 class A() {

compiler/testData/diagnostics/tests/classObjects/companionObjectOfPrivateClassVisibility.fir.kt

@@ -3,7 +3,7 @@ package test
 fun use() {
     Default.create()
 
-    Explicit.create()
+    Explicit.<!INVISIBLE_REFERENCE!>create<!>()
 }
 
 private class Default {
@@ -16,4 +16,4 @@ private class Explicit {
     private companion object {
         fun create() = Explicit()
     }
-}
+}

compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.fir.kt

@@ -40,12 +40,12 @@ fun test() {
     f(<!INVISIBLE_REFERENCE!>D<!>)
 
     A.foo()
-    <!INVISIBLE_REFERENCE!>B<!>.bar()
-    C.baz()
-    <!INVISIBLE_REFERENCE!>D<!>.quux()
+    <!INVISIBLE_REFERENCE!>B<!>.<!INVISIBLE_REFERENCE!>bar<!>()
+    C.<!INVISIBLE_REFERENCE!>baz<!>()
+    <!INVISIBLE_REFERENCE!>D<!>.<!INVISIBLE_REFERENCE!>quux<!>()
 
     a.A.foo()
-    a.C.baz()
+    a.C.<!INVISIBLE_REFERENCE!>baz<!>()
 }
 
 fun f(unused: Any) {}

compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.fir.kt

@@ -12,4 +12,4 @@ class A {
 
 fun <!EXPOSED_FUNCTION_RETURN_TYPE!>f1<!>() = A.Companion.B.<!INVISIBLE_REFERENCE!>C<!>
 
-fun f2() = A.Companion.B.<!INVISIBLE_REFERENCE!>C<!>.foo()
+fun f2() = A.Companion.B.<!INVISIBLE_REFERENCE!>C<!>.<!INVISIBLE_REFERENCE!>foo<!>()

compiler/testData/diagnostics/tests/imports/ImportPrivateMember.fir.kt

@@ -31,7 +31,7 @@ private object TopLevelObject {
 fun testAccess() {
     <!INVISIBLE_REFERENCE!>NestedClass<!>()
     E1
-    InNested()
-    NestedEntry
+    <!INVISIBLE_REFERENCE!>InNested<!>()
+    <!INVISIBLE_REFERENCE!>NestedEntry<!>
     inObject()
 }

compiler/testData/diagnostics/tests/imports/ImportPrivateMemberFromOtherFile.fir.kt

@@ -22,5 +22,5 @@ import B.JC.JC1
 
 fun test() {
     <!INVISIBLE_REFERENCE!>O1<!>
-    JC1()
+    <!INVISIBLE_REFERENCE!>JC1<!>()
 }

compiler/testData/diagnostics/tests/imports/ImportPrivateMembersWithStar.fir.kt

@@ -26,7 +26,7 @@ private enum class TopLevelEnum(private val e: NestedEnum) {
 
 fun testAccess() {
     E1
-    NestedEntry
-    A1()
+    <!INVISIBLE_REFERENCE!>NestedEntry<!>
+    <!INVISIBLE_REFERENCE!>A1<!>()
     <!INVISIBLE_REFERENCE!>A2<!>
 }

compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.fir.kt

@@ -14,5 +14,5 @@ public class Foo {
 // FILE: 1.kt
 
 fun main() {
-    javaPackage.Foo.<!INVISIBLE_REFERENCE!>Bar<!>.doSmth()
+    javaPackage.Foo.<!INVISIBLE_REFERENCE!>Bar<!>.<!INVISIBLE_REFERENCE!>doSmth<!>()
 }

compiler/testData/diagnostics/tests/privateInFile/visibility.fir.kt

@@ -29,7 +29,7 @@ package a
 
 fun test() {
     val y = makeA()
-    y.bar()
+    y.<!INVISIBLE_REFERENCE!>bar<!>()
     <!INVISIBLE_REFERENCE!>foo<!>()
 
     val u : A = <!INVISIBLE_REFERENCE!>A<!>()

compiler/testData/diagnostics/tests/scopes/visibility2.fir.kt

@@ -24,7 +24,7 @@ import a.PO
 
 fun test() {
     val y = makeA()
-    y.bar()
+    y.<!INVISIBLE_REFERENCE!>bar<!>()
     <!INVISIBLE_REFERENCE!>foo<!>()
 
     val u : A = <!INVISIBLE_REFERENCE!>A<!>()

compiler/testData/diagnostics/tests/scopes/visibility3.fir.kt

@@ -25,7 +25,7 @@ package a
 
 fun test() {
     val y = makeA()
-    y.bar()
+    y.<!INVISIBLE_REFERENCE!>bar<!>()
     <!INVISIBLE_REFERENCE!>foo<!>()
 
     val u : A = <!INVISIBLE_REFERENCE!>A<!>()

compiler/testData/diagnostics/tests/smartCasts/smartcastToInvisibleType_java.fir.kt

@@ -33,7 +33,7 @@ fun testSmartcast(x: Any) {
 
 fun testInference(a: A, b: B) {
     val x = <!DEBUG_INFO_EXPRESSION_TYPE("foo.PackagePrivateInterface")!>select(a, b)<!>
-    x.foo()
+    x.<!INVISIBLE_REFERENCE!>foo<!>()
 }
 
 // FILE: samePackage.kt

compiler/testData/diagnostics/tests/smartCasts/smartcastToInvisibleType_kotlin.fir.kt

@@ -39,5 +39,5 @@ fun testSmartcast(x: Any) {
 
 fun testInference(a: A, b: B) {
     val x = <!DEBUG_INFO_EXPRESSION_TYPE("foo.PrivateInterface")!>select(a, b)<!>
-    x.foo()
+    x.<!INVISIBLE_REFERENCE!>foo<!>()
 }

compiler/testData/diagnostics/tests/visibility/overrideOfMemberInPackagePrivateClass.kt

@@ -0,0 +1,20 @@
+// FIR_IDENTICAL
+// SKIP_TXT
+// FILE: test/JavaBase.java
+package test;
+
+abstract /* package-private */ class JavaBase {
+    public void foo() {}
+}
+
+// FILE: test/JavaBase2.java
+package test;
+public class JavaBase2 extends JavaBase {}
+
+// FILE: main.kt
+
+import test.*
+
+class KotlinClass : JavaBase2() {
+    override fun foo() {}
+}

compiler/testData/diagnostics/tests/visibility/privateCompanionInSuperClass.fir.kt

@@ -0,0 +1,24 @@
+// SKIP_TXT
+open class BaseWithPrivate {
+    private companion object {
+        val X: Int = 1
+        val Y: Int = 1
+    }
+}
+
+open class Base {
+    companion object {
+        val X: String = ""
+    }
+}
+
+class Derived : Base() {
+    fun foo() {
+        object : BaseWithPrivate() {
+            fun bar() {
+                X.length
+                <!INVISIBLE_REFERENCE!>Y<!>.hashCode()
+            }
+        }
+    }
+}

compiler/testData/diagnostics/tests/visibility/privateCompanionInSuperClass.kt

@@ -0,0 +1,24 @@
+// SKIP_TXT
+open class BaseWithPrivate {
+    private companion object {
+        val X: Int = 1
+        val Y: Int = 1
+    }
+}
+
+open class Base {
+    companion object {
+        val X: String = ""
+    }
+}
+
+class Derived : Base() {
+    fun foo() {
+        object : BaseWithPrivate() {
+            fun bar() {
+                X.length
+                <!INVISIBLE_MEMBER!>Y<!>.hashCode()
+            }
+        }
+    }
+}