Clearify diagnostic messages that involve internal visibilities

KT-7354 Fixed Visibility.displayText is deprecated with warning. Diagnostics for java visibilities changed.
2019-09-13 12:30:11 +03:00
parent fc4865a440
commit 0a1b3a8455
14 changed files with 193 additions and 24 deletions
@@ -0,0 +1,62 @@
+// FILE: j/JavaPackageLocal.java
+package j;
+
+public class JavaPackageLocal {
+    static void javaMPackage() {}
+    static int javaPPackage = 4;
+}
+
+// FILE: j/JavaProtected.java
+package j;
+
+public class JavaProtected {
+    protected static void javaMProtectedStatic() {}
+    protected static int javaPProtectedStatic = 4;
+    protected final int javaPProtectedPackage = 4;
+}
+
+// FILE: k.kt
+package k
+
+import j.JavaProtected
+import j.JavaPackageLocal
+
+class A {
+    val p1 = JavaPackageLocal.<!INVISIBLE_MEMBER("javaPPackage", "package-private", "'JavaPackageLocal'")!>javaPPackage<!>
+    val p2 = JavaProtected.<!INVISIBLE_MEMBER("javaPProtectedStatic", "protected", "'JavaProtected'")!>javaPProtectedStatic<!>
+    val p3 = JavaProtected().<!INVISIBLE_MEMBER("javaPProtectedPackage", "protected", "'JavaProtected'")!>javaPProtectedPackage<!>
+
+    fun test() {
+        JavaProtected.<!INVISIBLE_MEMBER("javaMProtectedStatic", "protected", "'JavaProtected'")!>javaMProtectedStatic<!>()
+        JavaPackageLocal.<!INVISIBLE_MEMBER("javaMPackage", "package-private", "'JavaPackageLocal'")!>javaMPackage<!>()
+    }
+}
+
+class B : JavaProtected() {
+    val p1 = JavaPackageLocal.<!INVISIBLE_MEMBER("javaPPackage", "package-private", "'JavaPackageLocal'")!>javaPPackage<!>
+    val p2 = JavaProtected.javaPProtectedStatic
+    val p3 = javaPProtectedPackage
+
+    fun test() {
+        JavaProtected.javaMProtectedStatic()
+        JavaPackageLocal.<!INVISIBLE_MEMBER("javaMPackage", "package-private", "'JavaPackageLocal'")!>javaMPackage<!>()
+    }
+}
+
+// FILE: j.kt
+package j
+
+import j.JavaProtected
+import j.JavaPackageLocal
+
+class C {
+    val p1 = JavaPackageLocal.javaPPackage
+    val p2 = JavaProtected.javaPProtectedStatic
+    val p3 = JavaProtected().javaPProtectedPackage
+
+    fun test() {
+        JavaProtected.javaMProtectedStatic()
+        JavaProtected.javaMProtectedStatic()
+        JavaPackageLocal.javaMPackage()
+    }
+}
@@ -0,0 +1,64 @@
+package
+
+package j {
+
+    public final class C {
+        public constructor C()
+        public final val p1: kotlin.Int
+        public final val p2: kotlin.Int
+        public final val p3: kotlin.Int = 4
+        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 JavaPackageLocal {
+        public constructor JavaPackageLocal()
+        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/*package*/ final var javaPPackage: kotlin.Int
+        public/*package*/ open fun javaMPackage(): kotlin.Unit
+    }
+
+    public open class JavaProtected {
+        public constructor JavaProtected()
+        protected/*protected and package*/ final val javaPProtectedPackage: kotlin.Int = 4
+        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
+        protected/*protected static*/ final var javaPProtectedStatic: kotlin.Int
+        protected/*protected static*/ open fun javaMProtectedStatic(): kotlin.Unit
+    }
+}
+
+package k {
+
+    public final class A {
+        public constructor A()
+        public final val p1: kotlin.Int
+        public final val p2: kotlin.Int
+        public final val p3: kotlin.Int = 4
+        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 final class B : j.JavaProtected {
+        public constructor B()
+        protected/*protected and package*/ final override /*1*/ /*fake_override*/ val javaPProtectedPackage: kotlin.Int
+        public final val p1: kotlin.Int
+        public final val p2: kotlin.Int
+        public final val p3: 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 open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}