Adding Java descriptors to the test data for nullability warnings

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.kt

-// FILE: p/J.java
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 
@@ -13,8 +12,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 fun test() {
     // @NotNull platform type
     var platformNN = J.staticNN

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.txt

 package
 
 internal fun test(): kotlin.Unit
+
+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 final var staticJ: kotlin.Int!
+    org.jetbrains.annotations.Nullable() public final var staticN: kotlin.Int!
+    org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.Int!
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/array.kt

-// FILE: p/J.java
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 
@@ -13,8 +12,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 fun test() {
     // @NotNull platform type
     val platformNN = J.staticNN

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/array.txt

 package
 
 internal fun test(): kotlin.Unit
+
+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 final var staticJ: kotlin.Array<(out) kotlin.Int!>!
+    org.jetbrains.annotations.Nullable() public final var staticN: kotlin.Array<(out) kotlin.Int!>!
+    org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.Array<(out) kotlin.Int!>!
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.kt

-// FILE: p/J.java
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 
@@ -13,8 +12,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 var v: J = J()
 var n: J? = J()
 

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.txt

 package
 
-internal var n: p.J?
-internal var v: p.J
+internal var n: J?
+internal var v: J
 internal fun test(): kotlin.Unit
+
+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 final var staticJ: J!
+    org.jetbrains.annotations.Nullable() public final var staticN: J!
+    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.kt

 // !DIAGNOSTICS: -UNUSED_EXPRESSION
-// FILE: p/J.java
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 
@@ -14,8 +13,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 fun test() {
     // @NotNull platform type
     val platformNN = J.staticNN

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.txt

 package
 
 internal fun test(): kotlin.Unit
+
+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 final var staticJ: kotlin.Boolean!
+    org.jetbrains.annotations.Nullable() public final var staticN: kotlin.Boolean!
+    org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.Boolean!
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.kt

 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// FILE: p/J.java
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 
@@ -13,8 +12,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 fun test() {
     val n = J.staticN
     foo(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>n<!>)

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.txt

 package
 
-internal fun foo(/*0*/ j: p.J): kotlin.Unit
+internal fun foo(/*0*/ j: J): kotlin.Unit
 internal fun test(): kotlin.Unit
+
+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
+    org.jetbrains.annotations.Nullable() public final var staticN: J!
+    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.kt

 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// FILE: p/J.java
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 
@@ -14,8 +13,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 fun test() {
     // @NotNull platform type
     val platformNN = J.staticNN

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.txt

 package
 
 internal fun test(): kotlin.Unit
+
+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 final var staticJ: J!
+    org.jetbrains.annotations.Nullable() public final var staticN: J!
+    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.kt

-// FILE: p/J.java
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 
@@ -19,8 +18,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 var A by J.staticNN
 var B by <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS, NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>J.staticN<!>
 var C by J.staticJ
\ No newline at end of file

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.txt

@@ -3,3 +3,23 @@ package
 internal var A: kotlin.String!
 internal var B: kotlin.String!
 internal var C: 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
+
+    public trait DP {
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public abstract fun get(/*0*/ a: kotlin.Any!, /*1*/ b: kotlin.Any!): kotlin.String!
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public abstract fun set(/*0*/ a: kotlin.Any!, /*1*/ b: kotlin.Any!, /*2*/ c: kotlin.Any!): kotlin.String!
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+
+    // Static members
+    public final var staticJ: J.DP!
+    org.jetbrains.annotations.Nullable() public final var staticN: J.DP!
+    org.jetbrains.annotations.NotNull() public final var staticNN: J.DP!
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.kt

-// FILE: p/J.java
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 import java.util.*;
@@ -14,8 +13,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 class A : List<String> by J.staticNN
 class B : List<String> by <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>J.staticN<!>
 class C : List<String> by J.staticJ
\ No newline at end of file

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.txt

@@ -53,3 +53,15 @@ internal final class C : kotlin.List<kotlin.String> {
     public open override /*1*/ /*delegation*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.List<kotlin.String>
     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 final var staticJ: kotlin.(Mutable)List<kotlin.String!>!
+    org.jetbrains.annotations.Nullable() public final var staticN: kotlin.(Mutable)List<kotlin.String!>!
+    org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.(Mutable)List<kotlin.String!>!
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceExtension.kt

 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-// FILE: p/J.java
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 
@@ -15,8 +14,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 fun test() {
     // @NotNull platform type
     val platformNN = J.staticNN

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceExtension.txt

@@ -2,5 +2,17 @@ package
 
 internal fun test(): kotlin.Unit
 internal fun </*0*/ T> with(/*0*/ t: T, /*1*/ f: T.() -> kotlin.Unit): kotlin.Unit
-internal fun p.J?.bar(): kotlin.Unit
-internal fun p.J.foo(): kotlin.Unit
+internal fun J?.bar(): kotlin.Unit
+internal fun J.foo(): kotlin.Unit
+
+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 final var staticJ: J!
+    org.jetbrains.annotations.Nullable() public final var staticN: J!
+    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceMember.kt

 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-// FILE: p/J.java
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 
@@ -17,8 +16,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 fun test() {
     // @NotNull platform type
     val platformNN = J.staticNN

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceMember.txt

@@ -2,3 +2,16 @@ package
 
 internal fun test(): kotlin.Unit
 internal fun </*0*/ T> with(/*0*/ t: T, /*1*/ f: T.() -> kotlin.Unit): kotlin.Unit
+
+public open class J {
+    public constructor J()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open fun foo(): kotlin.Unit
+    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 staticJ: J!
+    org.jetbrains.annotations.Nullable() public final var staticN: J!
+    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.kt

 // !DIAGNOSTICS: -UNUSED_VARIABLE -SENSELESS_COMPARISON
 
-// FILE: p/J.java
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 
@@ -15,8 +14,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 fun test() {
     // @NotNull platform type
     val platformNN = J.staticNN

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.txt

 package
 
 internal fun test(): kotlin.Unit
+
+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 final var staticJ: J!
+    org.jetbrains.annotations.Nullable() public final var staticN: J!
+    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/expectedType.kt

 // !CHECK_TYPE
 
-// FILE: p/J.java
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 
@@ -15,8 +14,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 fun test() {
     // @NotNull platform type
     val platformNN = J.staticNN

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/expectedType.txt

 package
 
 internal fun test(): kotlin.Unit
+
+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 final var staticJ: J!
+    org.jetbrains.annotations.Nullable() public final var staticN: J!
+    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.kt

-// FILE: p/J.java
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 import java.util.*;
@@ -14,8 +13,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 fun test() {
     // @NotNull platform type
     val platformNN = J.staticNN

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.txt

 package
 
 internal fun test(): kotlin.Unit
+
+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 final var staticJ: kotlin.(Mutable)List<kotlin.String!>!
+    org.jetbrains.annotations.Nullable() public final var staticN: kotlin.(Mutable)List<kotlin.String!>!
+    org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.(Mutable)List<kotlin.String!>!
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/functionArguments.kt

 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// FILE: p/J.java
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 
@@ -14,8 +13,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 fun test() {
     foo(J.staticNN)
     foo(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>J.staticN<!>)

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/functionArguments.txt

 package
 
-internal fun bar(/*0*/ j: p.J?): kotlin.Unit
-internal fun foo(/*0*/ j: p.J): kotlin.Unit
+internal fun bar(/*0*/ j: J?): kotlin.Unit
+internal fun foo(/*0*/ j: J): kotlin.Unit
 internal fun test(): kotlin.Unit
+
+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 final var staticJ: J!
+    org.jetbrains.annotations.Nullable() public final var staticN: J!
+    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/inferenceInConditionals.kt

-// FILE: p/J.java
-
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 import java.util.*;
@@ -15,8 +13,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 fun safeCall(c: J?) {
   c?.nn()?.length()
 }

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/inferenceInConditionals.txt

 package
 
-internal fun elvis(/*0*/ c: p.J): kotlin.Any?
-internal fun ifelse(/*0*/ c: p.J): kotlin.Any?
-internal fun safeCall(/*0*/ c: p.J?): kotlin.Unit
+internal fun elvis(/*0*/ c: J): kotlin.Any?
+internal fun ifelse(/*0*/ c: J): kotlin.Any?
+internal fun safeCall(/*0*/ c: J?): kotlin.Unit
+
+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
+    org.jetbrains.annotations.Nullable() public open fun n(): kotlin.(Mutable)List<kotlin.String!>!
+    org.jetbrains.annotations.NotNull() public open fun nn(): kotlin.String!
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/invoke.kt

-// FILE: p/J.java
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 
@@ -17,8 +16,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 fun test() {
     J.staticNN()
     J.<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>staticN<!>()

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/invoke.txt

 package
 
 internal fun test(): kotlin.Unit
+
+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
+
+    public trait Invoke {
+        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 abstract fun invoke(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+
+    // Static members
+    public final var staticJ: J.Invoke!
+    org.jetbrains.annotations.Nullable() public final var staticN: J.Invoke!
+    org.jetbrains.annotations.NotNull() public final var staticNN: J.Invoke!
+    public final /*synthesized*/ fun Invoke(/*0*/ function: () -> kotlin.Unit): J.Invoke
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/kt6829.kt

@@ -2,8 +2,7 @@
 
 // KT-6829 False warning on map to @Nullable
 
-// FILE: p/J.java
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 
@@ -15,8 +14,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 fun foo(collection: Collection<J>) {
     val mapped = collection.map { it.method() }
     <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>mapped[0]<!>.length()

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/kt6829.txt

 package
 
-internal fun foo(/*0*/ collection: kotlin.Collection<p.J>): kotlin.Unit
+internal fun foo(/*0*/ collection: kotlin.Collection<J>): kotlin.Unit
 public fun </*0*/ T, /*1*/ R> kotlin.Iterable<T>.map(/*0*/ transform: (T) -> R): kotlin.List<R>
+
+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
+    org.jetbrains.annotations.Nullable() public open fun method(): kotlin.String!
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/multiDeclaration.kt

 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// FILE: p/J.java
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 
@@ -19,8 +18,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 fun test() {
     // @NotNull platform type
     val platformNN = J.staticNN

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/multiDeclaration.txt

 package
 
 internal fun test(): kotlin.Unit
+
+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
+
+    public trait Multi {
+        public abstract fun component1(): kotlin.String!
+        public abstract fun component2(): kotlin.String!
+        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 staticJ: J.Multi!
+    org.jetbrains.annotations.Nullable() public final var staticN: J.Multi!
+    org.jetbrains.annotations.NotNull() public final var staticNN: J.Multi!
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAfterSafeCall.kt

-// FILE: p/J.java
-
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 
@@ -10,8 +8,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.J
-
 fun test(j: J?) {
     val s = j?.nn()
     if (s != null) {

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAfterSafeCall.txt

 package
 
-internal fun test(/*0*/ j: p.J?): kotlin.Unit
+internal fun test(/*0*/ j: J?): kotlin.Unit
+
+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
+    org.jetbrains.annotations.NotNull() public open fun nn(): kotlin.String!
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertion.kt

 // !DIAGNOSTICS: -UNUSED_EXPRESSION -SENSELESS_COMPARISON -UNUSED_PARAMETER
 
-// FILE: p/J.java
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 
@@ -15,8 +14,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 fun test() {
     // @NotNull platform type
     val platformNN = J.staticNN

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertion.txt

 package
 
 internal fun test(): kotlin.Unit
+
+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 final var staticJ: J!
+    org.jetbrains.annotations.Nullable() public final var staticN: J!
+    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertionInCall.kt

 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-// FILE: p/J.java
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 
@@ -12,8 +11,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 fun test() {
     // @NotNull platform type
     val platformNN = J.staticNN

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertionInCall.txt

@@ -10,3 +10,13 @@ internal final class Bar {
     internal final fun invoke(/*0*/ a: kotlin.Any): 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
+    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullTypeMarkedWithNullableAnnotation.kt

-// FILE: p/J.java
-
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 import java.util.*;
@@ -12,8 +10,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 fun list(j: J): Any {
     val a = j.n()!!
 

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullTypeMarkedWithNullableAnnotation.txt

 package
 
-internal fun list(/*0*/ j: p.J): kotlin.Any
+internal fun list(/*0*/ j: J): kotlin.Any
+
+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
+    org.jetbrains.annotations.Nullable() public open fun n(): kotlin.(Mutable)List<kotlin.String!>!
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.kt

-// FILE: p/J.java
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 
@@ -26,8 +25,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 fun test(n: J?, nn: J) {
     // @NotNull platform type
     val platformNN = J.staticNN

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.txt

 package
 
-internal fun test(/*0*/ n: p.J?, /*1*/ nn: p.J): kotlin.Unit
+internal fun test(/*0*/ n: J?, /*1*/ nn: J): kotlin.Unit
+
+public open class J {
+    public constructor J()
+    public constructor J(/*0*/ org.jetbrains.annotations.NotNull() nn: J!, /*1*/ org.jetbrains.annotations.Nullable() n: J!, /*2*/ j: J!)
+    public final var j: J!
+    org.jetbrains.annotations.Nullable() public final var n: J!
+    org.jetbrains.annotations.NotNull() public final var nn: 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 fun set(/*0*/ org.jetbrains.annotations.NotNull() nn: J!, /*1*/ org.jetbrains.annotations.Nullable() n: J!, /*2*/ j: J!): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    // Static members
+    public final var staticJ: J!
+    org.jetbrains.annotations.Nullable() public final var staticN: J!
+    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+    public open fun staticSet(/*0*/ org.jetbrains.annotations.NotNull() nn: J!, /*1*/ org.jetbrains.annotations.Nullable() n: J!, /*2*/ j: J!): kotlin.Unit
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/primitiveArray.kt

-// FILE: p/J.java
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 
@@ -13,8 +12,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 fun test() {
     // @NotNull platform type
     val platformNN = J.staticNN

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/primitiveArray.txt

 package
 
 internal fun test(): kotlin.Unit
+
+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 final var staticJ: kotlin.IntArray!
+    org.jetbrains.annotations.Nullable() public final var staticN: kotlin.IntArray!
+    org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.IntArray!
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/safeCall.kt

 // !DIAGNOSTICS: -SENSELESS_COMPARISON
 
-// FILE: p/J.java
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 
@@ -17,8 +16,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 fun test() {
     // @NotNull platform type
     val platformNN = J.staticNN

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/safeCall.txt

 package
 
 internal fun test(): kotlin.Unit
+
+public open class J {
+    public constructor J()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open fun foo(): kotlin.Unit
+    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 staticJ: J!
+    org.jetbrains.annotations.Nullable() public final var staticN: J!
+    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonEquals.kt

 // !DIAGNOSTICS: -UNUSED_EXPRESSION
 
-// FILE: p/J.java
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 
@@ -15,8 +14,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 fun test() {
     // @NotNull platform type
     val platformNN = J.staticNN

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonEquals.txt

 package
 
 internal fun test(): kotlin.Unit
+
+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 final var staticJ: J!
+    org.jetbrains.annotations.Nullable() public final var staticN: J!
+    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonIdentityEquals.kt

 // !DIAGNOSTICS: -UNUSED_EXPRESSION
 
-// FILE: p/J.java
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 
@@ -15,8 +14,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 fun test() {
     // @NotNull platform type
     val platformNN = J.staticNN

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonIdentityEquals.txt

 package
 
 internal fun test(): kotlin.Unit
+
+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 final var staticJ: J!
+    org.jetbrains.annotations.Nullable() public final var staticN: J!
+    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.kt

-// FILE: p/J.java
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 
@@ -13,8 +12,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 fun test() {
     throw J.staticNN
 }

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.txt

@@ -3,3 +3,15 @@ package
 internal fun test(): kotlin.Unit
 internal fun test1(): kotlin.Unit
 internal fun test2(): kotlin.Unit
+
+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 final var staticJ: java.lang.Exception!
+    org.jetbrains.annotations.Nullable() public final var staticN: java.lang.Exception!
+    org.jetbrains.annotations.NotNull() public final var staticNN: java.lang.Exception!
+}

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/uselessElvisInCall.kt

 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-// FILE: p/J.java
-package p;
+// FILE: J.java
 
 import org.jetbrains.annotations.*;
 
@@ -12,8 +11,6 @@ public class J {
 
 // FILE: k.kt
 
-import p.*
-
 fun test() {
     // @NotNull platform type
     val platformNN = J.staticNN

compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/uselessElvisInCall.txt

@@ -10,3 +10,13 @@ internal final class Bar {
     internal final fun invoke(/*0*/ a: kotlin.Any): 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
+    org.jetbrains.annotations.NotNull() public final var staticNN: J!
+}