Deprecate visibility of static members inherited from Java

Now they are not visible by short name through companion objects, just
like classifiers in KT-21515

^KT-25333 In progress

compiler/testData/diagnostics/tests/objects/kt21515/staticsFromJavaNew.kt

@@ -0,0 +1,48 @@
+// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
+// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
+
+// FILE: test/Java.java
+package test;
+
+public class Java {
+    public static void method() { }
+    public static int property = 42;
+    public static class Classifier { }
+    public static void syntheticSam(Runnable r) { }
+
+    public static int getStaticSyntheticProperty() { return 42; }
+    public static int setStaticSyntheticProperty(int x) { return 42; }
+
+    public int getInstanceSyntheticProperty() { return 42; }
+    public int setInstanceSyntheticProperty(int x) { return 42; }
+}
+
+// FILE: Kotlin.kt
+package test
+
+open class Base {
+    companion object : Java() {
+
+    }
+}
+
+class Derived : Base() {
+    fun test(javaStaticInTypePosition: <!UNRESOLVED_REFERENCE!>Classifier<!>) {
+        <!UNRESOLVED_REFERENCE!>method<!>()
+        <!UNRESOLVED_REFERENCE!>property<!>
+        <!UNRESOLVED_REFERENCE!>Classifier<!>()
+        <!UNRESOLVED_REFERENCE!>syntheticSam<!> { }
+
+        // Instance members shouldn't be affected, but we check them, just in case
+        val y = instanceSyntheticProperty
+        instanceSyntheticProperty = 43
+
+        // Note that statics actually aren't converted into synthetic property in Kotlin
+        val x = <!UNRESOLVED_REFERENCE!>syntheticProperty<!>
+        <!UNRESOLVED_REFERENCE!>syntheticProperty<!> = 42
+    }
+
+    class JavaStaticInSupertypeList : <!UNRESOLVED_REFERENCE!>Classifier<!>() {
+
+    }
+}

compiler/testData/diagnostics/tests/objects/kt21515/staticsFromJavaNew.txt

@@ -0,0 +1,58 @@
+package
+
+package test {
+
+    public open class Base {
+        public constructor Base()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public companion object Companion : test.Java {
+            private constructor Companion()
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*fake_override*/ fun getInstanceSyntheticProperty(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun setInstanceSyntheticProperty(/*0*/ x: kotlin.Int): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+
+    public final class Derived : test.Base {
+        public constructor Derived()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final fun test(/*0*/ javaStaticInTypePosition: [ERROR : Classifier]): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public final class JavaStaticInSupertypeList {
+            public constructor JavaStaticInSupertypeList()
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+
+    public open class Java {
+        public constructor Java()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open fun getInstanceSyntheticProperty(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open fun setInstanceSyntheticProperty(/*0*/ x: kotlin.Int): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public open class Classifier {
+            public constructor Classifier()
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+
+        // Static members
+        public final var property: kotlin.Int
+        public open fun getStaticSyntheticProperty(): kotlin.Int
+        public open fun method(): kotlin.Unit
+        public open fun setStaticSyntheticProperty(/*0*/ x: kotlin.Int): kotlin.Int
+        public open fun syntheticSam(/*0*/ r: java.lang.Runnable!): kotlin.Unit
+    }
+}

compiler/testData/diagnostics/tests/objects/kt21515/staticsFromJavaOld.kt

@@ -0,0 +1,48 @@
+// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
+// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
+
+// FILE: test/Java.java
+package test;
+
+public class Java {
+    public static void method() { }
+    public static int property = 42;
+    public static class Classifier { }
+    public static void syntheticSam(Runnable r) { }
+
+    public static int getStaticSyntheticProperty() { return 42; }
+    public static int setStaticSyntheticProperty(int x) { return 42; }
+
+    public int getInstanceSyntheticProperty() { return 42; }
+    public int setInstanceSyntheticProperty(int x) { return 42; }
+}
+
+// FILE: Kotlin.kt
+package test
+
+open class Base {
+    companion object : Java() {
+
+    }
+}
+
+class Derived : Base() {
+    fun test(javaStaticInTypePosition: <!DEPRECATED_ACCESS_BY_SHORT_NAME!>Classifier<!>) {
+        <!DEPRECATED_ACCESS_BY_SHORT_NAME!>method()<!>
+        <!DEPRECATED_ACCESS_BY_SHORT_NAME!>property<!>
+        <!DEPRECATED_ACCESS_BY_SHORT_NAME!>Classifier()<!>
+        <!DEPRECATED_ACCESS_BY_SHORT_NAME!>syntheticSam { }<!>
+
+        // Instance members shouldn't be affected, but we check them, just in case
+        val y = instanceSyntheticProperty
+        instanceSyntheticProperty = 43
+
+        // Note that statics actually aren't converted into synthetic property in Kotlin
+        val x = <!UNRESOLVED_REFERENCE!>syntheticProperty<!>
+        <!UNRESOLVED_REFERENCE!>syntheticProperty<!> = 42
+    }
+
+    class JavaStaticInSupertypeList : <!DEPRECATED_ACCESS_BY_SHORT_NAME!>Classifier<!>() {
+
+    }
+}

compiler/testData/diagnostics/tests/objects/kt21515/staticsFromJavaOld.txt

@@ -0,0 +1,58 @@
+package
+
+package test {
+
+    public open class Base {
+        public constructor Base()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public companion object Companion : test.Java {
+            private constructor Companion()
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*fake_override*/ fun getInstanceSyntheticProperty(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun setInstanceSyntheticProperty(/*0*/ x: kotlin.Int): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+
+    public final class Derived : test.Base {
+        public constructor Derived()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final fun test(/*0*/ javaStaticInTypePosition: test.Java.Classifier): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public final class JavaStaticInSupertypeList : test.Java.Classifier {
+            public constructor JavaStaticInSupertypeList()
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+
+    public open class Java {
+        public constructor Java()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open fun getInstanceSyntheticProperty(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open fun setInstanceSyntheticProperty(/*0*/ x: kotlin.Int): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public open class Classifier {
+            public constructor Classifier()
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+
+        // Static members
+        public final var property: kotlin.Int
+        public open fun getStaticSyntheticProperty(): kotlin.Int
+        public open fun method(): kotlin.Unit
+        public open fun setStaticSyntheticProperty(/*0*/ x: kotlin.Int): kotlin.Int
+        public open fun syntheticSam(/*0*/ r: java.lang.Runnable!): kotlin.Unit
+    }
+}

compiler/testData/diagnostics/tests/objects/kt21515/staticsFromJavaWithQualificationNew.kt

@@ -0,0 +1,53 @@
+// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
+// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
+
+// FILE: test/Java.java
+package test;
+
+public class Java {
+    public static void method() { }
+    public static int property = 42;
+    public static class Classifier { }
+    public static void syntheticSam(Runnable r) { }
+
+    public static int getStaticSyntheticProperty() { return 42; }
+    public static int setStaticSyntheticProperty(int x) { return 42; }
+
+    public int getInstanceSyntheticProperty() { return 42; }
+    public int setInstanceSyntheticProperty(int x) { return 42; }
+}
+
+// FILE: Kotlin.kt
+package test
+
+import test.Java.method
+import test.Java.Classifier
+import test.Java.property
+import test.Java.syntheticSam
+
+open class Base {
+    companion object : Java() {
+
+    }
+}
+
+class Derived : Base() {
+    fun test(javaStaticInTypePosition: Classifier) {
+        method()
+        property
+        Classifier()
+        syntheticSam { }
+
+        // Instance members shouldn't be affected, but we check them, just in case
+        val y = instanceSyntheticProperty
+        instanceSyntheticProperty = 43
+
+        // Note that statics actually aren't converted into synthetic property in Kotlin
+        val x = <!UNRESOLVED_REFERENCE!>syntheticProperty<!>
+        <!UNRESOLVED_REFERENCE!>syntheticProperty<!> = 42
+    }
+
+    class JavaStaticInSupertypeList : Classifier() {
+
+    }
+}

compiler/testData/diagnostics/tests/objects/kt21515/staticsFromJavaWithQualificationNew.txt

@@ -0,0 +1,58 @@
+package
+
+package test {
+
+    public open class Base {
+        public constructor Base()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public companion object Companion : test.Java {
+            private constructor Companion()
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*fake_override*/ fun getInstanceSyntheticProperty(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun setInstanceSyntheticProperty(/*0*/ x: kotlin.Int): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+
+    public final class Derived : test.Base {
+        public constructor Derived()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final fun test(/*0*/ javaStaticInTypePosition: test.Java.Classifier): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public final class JavaStaticInSupertypeList : test.Java.Classifier {
+            public constructor JavaStaticInSupertypeList()
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+
+    public open class Java {
+        public constructor Java()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open fun getInstanceSyntheticProperty(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open fun setInstanceSyntheticProperty(/*0*/ x: kotlin.Int): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public open class Classifier {
+            public constructor Classifier()
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+
+        // Static members
+        public final var property: kotlin.Int
+        public open fun getStaticSyntheticProperty(): kotlin.Int
+        public open fun method(): kotlin.Unit
+        public open fun setStaticSyntheticProperty(/*0*/ x: kotlin.Int): kotlin.Int
+        public open fun syntheticSam(/*0*/ r: java.lang.Runnable!): kotlin.Unit
+    }
+}

compiler/testData/diagnostics/tests/objects/kt21515/staticsFromJavaWithQualificationOld.kt

@@ -0,0 +1,53 @@
+// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
+// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
+
+// FILE: test/Java.java
+package test;
+
+public class Java {
+    public static void method() { }
+    public static int property = 42;
+    public static class Classifier { }
+    public static void syntheticSam(Runnable r) { }
+
+    public static int getStaticSyntheticProperty() { return 42; }
+    public static int setStaticSyntheticProperty(int x) { return 42; }
+
+    public int getInstanceSyntheticProperty() { return 42; }
+    public int setInstanceSyntheticProperty(int x) { return 42; }
+}
+
+// FILE: Kotlin.kt
+package test
+
+import test.Java.method
+import test.Java.Classifier
+import test.Java.property
+import test.Java.syntheticSam
+
+open class Base {
+    companion object : Java() {
+
+    }
+}
+
+class Derived : Base() {
+    fun test(javaStaticInTypePosition: Classifier) {
+        method()
+        property
+        Classifier()
+        syntheticSam { }
+
+        // Instance members shouldn't be affected, but we check them, just in case
+        val y = instanceSyntheticProperty
+        instanceSyntheticProperty = 43
+
+        // Note that statics actually aren't converted into synthetic property in Kotlin
+        val x = <!UNRESOLVED_REFERENCE!>syntheticProperty<!>
+        <!UNRESOLVED_REFERENCE!>syntheticProperty<!> = 42
+    }
+
+    class JavaStaticInSupertypeList : Classifier() {
+
+    }
+}

compiler/testData/diagnostics/tests/objects/kt21515/staticsFromJavaWithQualificationOld.txt

@@ -0,0 +1,58 @@
+package
+
+package test {
+
+    public open class Base {
+        public constructor Base()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public companion object Companion : test.Java {
+            private constructor Companion()
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*fake_override*/ fun getInstanceSyntheticProperty(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun setInstanceSyntheticProperty(/*0*/ x: kotlin.Int): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+
+    public final class Derived : test.Base {
+        public constructor Derived()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final fun test(/*0*/ javaStaticInTypePosition: test.Java.Classifier): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public final class JavaStaticInSupertypeList : test.Java.Classifier {
+            public constructor JavaStaticInSupertypeList()
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+
+    public open class Java {
+        public constructor Java()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open fun getInstanceSyntheticProperty(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open fun setInstanceSyntheticProperty(/*0*/ x: kotlin.Int): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public open class Classifier {
+            public constructor Classifier()
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+
+        // Static members
+        public final var property: kotlin.Int
+        public open fun getStaticSyntheticProperty(): kotlin.Int
+        public open fun method(): kotlin.Unit
+        public open fun setStaticSyntheticProperty(/*0*/ x: kotlin.Int): kotlin.Int
+        public open fun syntheticSam(/*0*/ r: java.lang.Runnable!): kotlin.Unit
+    }
+}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/accessToStaticMembersOfParentClassJKJ_after.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
 // FILE: J.java
 public class J {
     public static void foo() {}
@@ -17,20 +18,20 @@ open class A {
 
 class B : J2() {
     init {
-        foo()
+        <!UNRESOLVED_REFERENCE!>foo<!>()
         bar()
         boo()
     }
 
     fun test2() {
-        foo()
+        <!UNRESOLVED_REFERENCE!>foo<!>()
         bar()
         boo()
     }
 
     object O {
         fun test() {
-            foo()
+            <!UNRESOLVED_REFERENCE!>foo<!>()
             bar()
             boo()
         }
@@ -38,13 +39,13 @@ class B : J2() {
 
     companion object {
         init {
-            foo()
+            <!UNRESOLVED_REFERENCE!>foo<!>()
             bar()
             boo()
         }
 
         fun test() {
-            foo()
+            <!UNRESOLVED_REFERENCE!>foo<!>()
             bar()
             boo()
         }

compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/accessToStaticMembersOfParentClassJKJ_before.kt

@@ -0,0 +1,55 @@
+// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
+// FILE: J.java
+public class J {
+    public static void foo() {}
+}
+
+// FILE: J2.java
+public class J2 extends A {
+    public static void boo() {}
+}
+
+// FILE: test.kt
+open class A {
+    companion object : J() {
+        fun bar() {}
+    }
+}
+
+class B : J2() {
+    init {
+        <!DEPRECATED_ACCESS_BY_SHORT_NAME!>foo()<!>
+        bar()
+        boo()
+    }
+
+    fun test2() {
+        <!DEPRECATED_ACCESS_BY_SHORT_NAME!>foo()<!>
+        bar()
+        boo()
+    }
+
+    object O {
+        fun test() {
+            <!DEPRECATED_ACCESS_BY_SHORT_NAME!>foo()<!>
+            bar()
+            boo()
+        }
+    }
+
+    companion object {
+        init {
+            <!DEPRECATED_ACCESS_BY_SHORT_NAME!>foo()<!>
+            bar()
+            boo()
+        }
+
+        fun test() {
+            <!DEPRECATED_ACCESS_BY_SHORT_NAME!>foo()<!>
+            bar()
+            boo()
+        }
+
+        fun bar() {}
+    }
+}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/accessToStaticMembersOfParentClassJKJ_before.txt

@@ -0,0 +1,61 @@
+package
+
+public open class A {
+    public constructor A()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    public companion object Companion : J {
+        private constructor Companion()
+        public final fun bar(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
+
+public final class B : J2 {
+    public constructor B()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public final fun test2(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    public companion object Companion {
+        private constructor Companion()
+        public final fun bar(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final fun test(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+
+    public object O {
+        private constructor O()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final fun test(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
+
+public open class J {
+    public constructor J()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    // Static members
+    public open fun foo(): kotlin.Unit
+}
+
+public open class J2 : A {
+    public constructor J2()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    // Static members
+    public open fun boo(): kotlin.Unit
+}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/accessToStaticMembersOfParentClass_after.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
 // FILE: J.java
 public class J {
     public static void foo() {}
@@ -12,30 +13,30 @@ open class A {
 
 class B : A() {
     init {
-        foo()
+        <!UNRESOLVED_REFERENCE!>foo<!>()
         bar()
     }
 
     fun test2() {
-        foo()
+        <!UNRESOLVED_REFERENCE!>foo<!>()
         bar()
     }
 
     object O {
         fun test() {
-            foo()
+            <!UNRESOLVED_REFERENCE!>foo<!>()
             bar()
         }
     }
 
     companion object {
         init {
-            foo()
+            <!UNRESOLVED_REFERENCE!>foo<!>()
             bar()
         }
 
         fun test() {
-            foo()
+            <!UNRESOLVED_REFERENCE!>foo<!>()
             bar()
         }
 

compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/accessToStaticMembersOfParentClass_before.kt

@@ -0,0 +1,46 @@
+// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
+// FILE: J.java
+public class J {
+    public static void foo() {}
+}
+
+// FILE: test.kt
+open class A {
+    companion object : J() {
+        fun bar() {}
+    }
+}
+
+class B : A() {
+    init {
+        <!DEPRECATED_ACCESS_BY_SHORT_NAME!>foo()<!>
+        bar()
+    }
+
+    fun test2() {
+        <!DEPRECATED_ACCESS_BY_SHORT_NAME!>foo()<!>
+        bar()
+    }
+
+    object O {
+        fun test() {
+            <!DEPRECATED_ACCESS_BY_SHORT_NAME!>foo()<!>
+            bar()
+        }
+    }
+
+    companion object {
+        init {
+            <!DEPRECATED_ACCESS_BY_SHORT_NAME!>foo()<!>
+            bar()
+        }
+
+        fun test() {
+            <!DEPRECATED_ACCESS_BY_SHORT_NAME!>foo()<!>
+            bar()
+        }
+
+        fun bar() {}
+    }
+}
+

compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/accessToStaticMembersOfParentClass_before.txt

@@ -0,0 +1,51 @@
+package
+
+public open class A {
+    public constructor A()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    public companion object Companion : J {
+        private constructor Companion()
+        public final fun bar(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
+
+public final class B : A {
+    public constructor B()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public final fun test2(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    public companion object Companion {
+        private constructor Companion()
+        public final fun bar(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final fun test(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+
+    public object O {
+        private constructor O()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final fun test(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
+
+public open class J {
+    public constructor J()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    // Static members
+    public open fun foo(): kotlin.Unit
+}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_after.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
 // !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 

compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_before.kt

@@ -0,0 +1,54 @@
+// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
+// !WITH_NEW_INFERENCE
+// !DIAGNOSTICS: -UNUSED_VARIABLE
+
+// FILE: J.java
+public class J {
+    public static void foo() {}
+}
+
+// FILE: test.kt
+open class A<T> : J() {
+    init {
+        <!DEPRECATED_ACCESS_BY_SHORT_NAME!>foo()<!>
+        bar()
+        val a: Int = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!><!DEBUG_INFO_LEAKING_THIS!>baz<!>()<!>
+        val b: T = <!DEBUG_INFO_LEAKING_THIS!>baz<!>()
+    }
+
+    fun test1() {
+        <!DEPRECATED_ACCESS_BY_SHORT_NAME!>foo()<!>
+        bar()
+        val a: Int = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>baz()<!>
+        val b: T = baz()
+    }
+
+    fun baz(): T = null!!
+
+    object O {
+        fun test() {
+            <!DEPRECATED_ACCESS_BY_SHORT_NAME!>foo()<!>
+            bar()
+            val a: Int = baz()
+            val b: <!UNRESOLVED_REFERENCE!>T<!> = baz()
+        }
+    }
+
+    companion object : A<Int>() {
+        init {
+            <!DEPRECATED_ACCESS_BY_SHORT_NAME!>foo()<!>
+            bar()
+            val a: Int = baz()
+            val b: <!UNRESOLVED_REFERENCE!>T<!> = baz()
+        }
+
+        fun test() {
+            <!DEPRECATED_ACCESS_BY_SHORT_NAME!>foo()<!>
+            bar()
+            val a: Int = baz()
+            val b: <!UNRESOLVED_REFERENCE!>T<!> = baz()
+        }
+
+        fun bar() {}
+    }
+}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_before.txt

@@ -0,0 +1,39 @@
+package
+
+public open class A</*0*/ T> : J {
+    public constructor A</*0*/ T>()
+    public final fun baz(): T
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public final fun test1(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    public companion object Companion : A<kotlin.Int> {
+        private constructor Companion()
+        public final fun bar(): kotlin.Unit
+        public final override /*1*/ /*fake_override*/ fun baz(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final fun test(): kotlin.Unit
+        public final override /*1*/ /*fake_override*/ fun test1(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+
+    public object O {
+        private constructor O()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final fun test(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
+
+public open class J {
+    public constructor J()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    // Static members
+    public open fun foo(): kotlin.Unit
+}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromJavaAfterKotlin_after.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
 // FILE: J.java
 public class J {
     public static void foo() {}
@@ -11,20 +12,20 @@ open class B : J() {
 
 class A {
     init {
-        foo()
+        <!UNRESOLVED_REFERENCE!>foo<!>()
         bar()
         baz()
     }
 
     fun test1() {
-        foo()
+        <!UNRESOLVED_REFERENCE!>foo<!>()
         bar()
         baz()
     }
 
     object O {
         fun test() {
-            foo()
+            <!UNRESOLVED_REFERENCE!>foo<!>()
             bar()
             baz()
         }

compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromJavaAfterKotlin_before.kt

@@ -0,0 +1,50 @@
+// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
+// FILE: J.java
+public class J {
+    public static void foo() {}
+}
+
+// FILE: test.kt
+
+open class B : J() {
+    fun baz() {}
+}
+
+class A {
+    init {
+        <!DEPRECATED_ACCESS_BY_SHORT_NAME!>foo()<!>
+        bar()
+        baz()
+    }
+
+    fun test1() {
+        <!DEPRECATED_ACCESS_BY_SHORT_NAME!>foo()<!>
+        bar()
+        baz()
+    }
+
+    object O {
+        fun test() {
+            <!DEPRECATED_ACCESS_BY_SHORT_NAME!>foo()<!>
+            bar()
+            baz()
+        }
+    }
+
+
+    companion object : B() {
+        init {
+            foo()
+            bar()
+            baz()
+        }
+
+        fun test() {
+            foo()
+            bar()
+            baz()
+        }
+
+        fun bar() {}
+    }
+}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromJavaAfterKotlin_before.txt

@@ -0,0 +1,45 @@
+package
+
+public final class A {
+    public constructor A()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public final fun test1(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    public companion object Companion : B {
+        private constructor Companion()
+        public final fun bar(): kotlin.Unit
+        public final override /*1*/ /*fake_override*/ fun baz(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final fun test(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+
+    public object O {
+        private constructor O()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final fun test(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
+
+public open class B : J {
+    public constructor B()
+    public final fun baz(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public open class J {
+    public constructor J()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    // Static members
+    public open fun foo(): kotlin.Unit
+}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromJava_after.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
 // FILE: J.java
 public class J {
     public static void foo() {}
@@ -6,18 +7,18 @@ public class J {
 // FILE: test.kt
 class A {
     init {
-        foo()
+        <!UNRESOLVED_REFERENCE!>foo<!>()
         bar()
     }
 
     fun test1() {
-        foo()
+        <!UNRESOLVED_REFERENCE!>foo<!>()
         bar()
     }
 
     object O {
         fun test() {
-            foo()
+            <!UNRESOLVED_REFERENCE!>foo<!>()
             bar()
         }
     }

compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromJava_before.kt

@@ -0,0 +1,39 @@
+// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
+// FILE: J.java
+public class J {
+    public static void foo() {}
+}
+
+// FILE: test.kt
+class A {
+    init {
+        <!DEPRECATED_ACCESS_BY_SHORT_NAME!>foo()<!>
+        bar()
+    }
+
+    fun test1() {
+        <!DEPRECATED_ACCESS_BY_SHORT_NAME!>foo()<!>
+        bar()
+    }
+
+    object O {
+        fun test() {
+            <!DEPRECATED_ACCESS_BY_SHORT_NAME!>foo()<!>
+            bar()
+        }
+    }
+
+    companion object : J() {
+        init {
+            foo()
+            bar()
+        }
+
+        fun test() {
+            foo()
+            bar()
+        }
+
+        fun bar() {}
+    }
+}

compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromJava_before.txt

@@ -0,0 +1,36 @@
+package
+
+public final class A {
+    public constructor A()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public final fun test1(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    public companion object Companion : J {
+        private constructor Companion()
+        public final fun bar(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final fun test(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+
+    public object O {
+        private constructor O()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final fun test(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
+
+public open class J {
+    public constructor J()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    // Static members
+    public open fun foo(): kotlin.Unit
+}