From 4d6ab824c8e07de57694111932aaf27cff56ef4b Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Tue, 5 May 2015 19:01:16 +0300
Subject: [PATCH] Adding Java descriptors to the test data for nullability
 warnings

---
 .../nullabilityWarnings/arithmetic.kt         |  5 +----
 .../nullabilityWarnings/arithmetic.txt        | 12 +++++++++++
 .../nullabilityWarnings/array.kt              |  5 +----
 .../nullabilityWarnings/array.txt             | 12 +++++++++++
 .../nullabilityWarnings/assignToVar.kt        |  5 +----
 .../nullabilityWarnings/assignToVar.txt       | 16 +++++++++++++--
 .../nullabilityWarnings/conditions.kt         |  5 +----
 .../nullabilityWarnings/conditions.txt        | 12 +++++++++++
 .../nullabilityWarnings/dataFlowInfo.kt       |  5 +----
 .../nullabilityWarnings/dataFlowInfo.txt      | 13 +++++++++++-
 .../nullabilityWarnings/defaultParameters.kt  |  5 +----
 .../nullabilityWarnings/defaultParameters.txt | 12 +++++++++++
 .../delegatedProperties.kt                    |  5 +----
 .../delegatedProperties.txt                   | 20 +++++++++++++++++++
 .../nullabilityWarnings/delegation.kt         |  5 +----
 .../nullabilityWarnings/delegation.txt        | 12 +++++++++++
 .../nullabilityWarnings/derefenceExtension.kt |  5 +----
 .../derefenceExtension.txt                    | 16 +++++++++++++--
 .../nullabilityWarnings/derefenceMember.kt    |  5 +----
 .../nullabilityWarnings/derefenceMember.txt   | 13 ++++++++++++
 .../nullabilityWarnings/elvis.kt              |  5 +----
 .../nullabilityWarnings/elvis.txt             | 12 +++++++++++
 .../nullabilityWarnings/expectedType.kt       |  5 +----
 .../nullabilityWarnings/expectedType.txt      | 12 +++++++++++
 .../platformTypes/nullabilityWarnings/for.kt  |  5 +----
 .../platformTypes/nullabilityWarnings/for.txt | 12 +++++++++++
 .../nullabilityWarnings/functionArguments.kt  |  5 +----
 .../nullabilityWarnings/functionArguments.txt | 16 +++++++++++++--
 .../inferenceInConditionals.kt                |  6 +-----
 .../inferenceInConditionals.txt               | 15 +++++++++++---
 .../nullabilityWarnings/invoke.kt             |  5 +----
 .../nullabilityWarnings/invoke.txt            | 20 +++++++++++++++++++
 .../nullabilityWarnings/kt6829.kt             |  5 +----
 .../nullabilityWarnings/kt6829.txt            | 10 +++++++++-
 .../nullabilityWarnings/multiDeclaration.kt   |  5 +----
 .../nullabilityWarnings/multiDeclaration.txt  | 20 +++++++++++++++++++
 .../notNullAfterSafeCall.kt                   |  6 +-----
 .../notNullAfterSafeCall.txt                  | 10 +++++++++-
 .../nullabilityWarnings/notNullAssertion.kt   |  5 +----
 .../nullabilityWarnings/notNullAssertion.txt  | 12 +++++++++++
 .../notNullAssertionInCall.kt                 |  5 +----
 .../notNullAssertionInCall.txt                | 10 ++++++++++
 ...notNullTypeMarkedWithNullableAnnotation.kt |  6 +-----
 ...otNullTypeMarkedWithNullableAnnotation.txt | 10 +++++++++-
 .../nullabilityWarnings/passToJava.kt         |  5 +----
 .../nullabilityWarnings/passToJava.txt        | 20 ++++++++++++++++++-
 .../nullabilityWarnings/primitiveArray.kt     |  5 +----
 .../nullabilityWarnings/primitiveArray.txt    | 12 +++++++++++
 .../nullabilityWarnings/safeCall.kt           |  5 +----
 .../nullabilityWarnings/safeCall.txt          | 13 ++++++++++++
 .../senselessComparisonEquals.kt              |  5 +----
 .../senselessComparisonEquals.txt             | 12 +++++++++++
 .../senselessComparisonIdentityEquals.kt      |  5 +----
 .../senselessComparisonIdentityEquals.txt     | 12 +++++++++++
 .../nullabilityWarnings/throw.kt              |  5 +----
 .../nullabilityWarnings/throw.txt             | 12 +++++++++++
 .../nullabilityWarnings/uselessElvisInCall.kt |  5 +----
 .../uselessElvisInCall.txt                    | 10 ++++++++++
 58 files changed, 403 insertions(+), 133 deletions(-)

diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.kt
index 43aa5abd3d0..31a29d95c56 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.kt
@@ -1,5 +1,4 @@
-// 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
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.txt
index b8def46715c..7144141c3ca 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.txt
@@ -1,3 +1,15 @@
 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!
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/array.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/array.kt
index 2dce002aff8..928f061ef8d 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/array.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/array.kt
@@ -1,5 +1,4 @@
-// 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
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/array.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/array.txt
index b8def46715c..5fd62c6b767 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/array.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/array.txt
@@ -1,3 +1,15 @@
 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!>!
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.kt
index 600db661622..478a0ae9708 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.kt
@@ -1,5 +1,4 @@
-// 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()
 
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.txt
index b258b62a31a..4715dbb23bc 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.txt
@@ -1,5 +1,17 @@
 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!
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.kt
index 4e875c499b7..c9e785bb6d3 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.kt
@@ -1,6 +1,5 @@
 // !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
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.txt
index b8def46715c..65c7261ddc6 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.txt
@@ -1,3 +1,15 @@
 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!
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.kt
index eb1fd9521cd..e716abbe6a8 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.kt
@@ -1,6 +1,5 @@
 // !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<!>)
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.txt
index 7719efbbb09..64f161d3f05 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.txt
@@ -1,4 +1,15 @@
 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!
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.kt
index b9cbbe9a057..3cbba78872d 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.kt
@@ -1,6 +1,5 @@
 // !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
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.txt
index b8def46715c..34903ffd954 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.txt
@@ -1,3 +1,15 @@
 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!
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.kt
index 19bf516c533..e413b1e74fd 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.kt
@@ -1,5 +1,4 @@
-// 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
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.txt
index be11c83820c..4face54f705 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.txt
+++ b/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!
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.kt
index 38f22824d4b..bf012440dde 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.kt
@@ -1,5 +1,4 @@
-// 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
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.txt
index 8088400d541..c3c73d2853b 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.txt
+++ b/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!>!
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceExtension.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceExtension.kt
index 0c61dbac4c3..5c96709c95e 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceExtension.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceExtension.kt
@@ -1,7 +1,6 @@
 // !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
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceExtension.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceExtension.txt
index e909556b47c..71f08415efa 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceExtension.txt
+++ b/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!
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceMember.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceMember.kt
index 0ccc1a0b2fc..b0f108a737b 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceMember.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceMember.kt
@@ -1,7 +1,6 @@
 // !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
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceMember.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceMember.txt
index 7e19ffea500..8c9b73aa0f6 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceMember.txt
+++ b/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!
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.kt
index 7ec695beb29..6dcd4b4aeaa 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.kt
@@ -1,7 +1,6 @@
 // !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
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.txt
index b8def46715c..34903ffd954 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.txt
@@ -1,3 +1,15 @@
 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!
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/expectedType.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/expectedType.kt
index 0cdc5c96fce..5001e655040 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/expectedType.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/expectedType.kt
@@ -1,7 +1,6 @@
 // !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
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/expectedType.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/expectedType.txt
index b8def46715c..34903ffd954 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/expectedType.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/expectedType.txt
@@ -1,3 +1,15 @@
 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!
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.kt
index bb5589537e6..d15f6d928aa 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.kt
@@ -1,5 +1,4 @@
-// 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
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.txt
index b8def46715c..011c6034370 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.txt
@@ -1,3 +1,15 @@
 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!>!
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/functionArguments.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/functionArguments.kt
index dcca95d883d..228464fceba 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/functionArguments.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/functionArguments.kt
@@ -1,6 +1,5 @@
 // !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<!>)
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/functionArguments.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/functionArguments.txt
index febe9fdde72..818aef0eb85 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/functionArguments.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/functionArguments.txt
@@ -1,5 +1,17 @@
 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!
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/inferenceInConditionals.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/inferenceInConditionals.kt
index 2028b23d1f4..a35af95498a 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/inferenceInConditionals.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/inferenceInConditionals.kt
@@ -1,6 +1,4 @@
-// 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()
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/inferenceInConditionals.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/inferenceInConditionals.txt
index 3cd68f13413..3ed6cbe4fb4 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/inferenceInConditionals.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/inferenceInConditionals.txt
@@ -1,5 +1,14 @@
 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
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/invoke.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/invoke.kt
index d7fdcac56eb..0b055a57320 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/invoke.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/invoke.kt
@@ -1,5 +1,4 @@
-// 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<!>()
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/invoke.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/invoke.txt
index b8def46715c..fec729f8aa7 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/invoke.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/invoke.txt
@@ -1,3 +1,23 @@
 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
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/kt6829.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/kt6829.kt
index 21129c3c083..9d76a42b010 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/kt6829.kt
+++ b/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()
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/kt6829.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/kt6829.txt
index 066df5f85b8..099ffe5132d 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/kt6829.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/kt6829.txt
@@ -1,4 +1,12 @@
 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
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/multiDeclaration.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/multiDeclaration.kt
index c7ddde2a2b6..977f804794b 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/multiDeclaration.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/multiDeclaration.kt
@@ -1,6 +1,5 @@
 // !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
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/multiDeclaration.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/multiDeclaration.txt
index b8def46715c..66977b314a7 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/multiDeclaration.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/multiDeclaration.txt
@@ -1,3 +1,23 @@
 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!
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAfterSafeCall.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAfterSafeCall.kt
index 47bd945635a..420dc45a990 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAfterSafeCall.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAfterSafeCall.kt
@@ -1,6 +1,4 @@
-// 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) {
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAfterSafeCall.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAfterSafeCall.txt
index 4811fa11f1a..95590d06e57 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAfterSafeCall.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAfterSafeCall.txt
@@ -1,3 +1,11 @@
 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
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertion.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertion.kt
index 8d882af3213..75a31645695 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertion.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertion.kt
@@ -1,7 +1,6 @@
 // !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
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertion.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertion.txt
index b8def46715c..34903ffd954 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertion.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertion.txt
@@ -1,3 +1,15 @@
 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!
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertionInCall.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertionInCall.kt
index 42d5c782d80..7c4f02a8cd2 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertionInCall.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertionInCall.kt
@@ -1,7 +1,6 @@
 // !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
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertionInCall.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertionInCall.txt
index 79f259ce9cb..adf9031c655 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertionInCall.txt
+++ b/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!
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullTypeMarkedWithNullableAnnotation.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullTypeMarkedWithNullableAnnotation.kt
index 2c396a46367..40515b7c858 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullTypeMarkedWithNullableAnnotation.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullTypeMarkedWithNullableAnnotation.kt
@@ -1,6 +1,4 @@
-// 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()!!
 
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullTypeMarkedWithNullableAnnotation.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullTypeMarkedWithNullableAnnotation.txt
index 8059f2c7f76..aea2df5eedd 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullTypeMarkedWithNullableAnnotation.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullTypeMarkedWithNullableAnnotation.txt
@@ -1,3 +1,11 @@
 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
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.kt
index 89f3a61f6f2..257badf0b86 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.kt
@@ -1,5 +1,4 @@
-// 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
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.txt
index 468c30694dc..f1c3b9d5460 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.txt
@@ -1,3 +1,21 @@
 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
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/primitiveArray.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/primitiveArray.kt
index 84a3c69f789..75d088a0078 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/primitiveArray.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/primitiveArray.kt
@@ -1,5 +1,4 @@
-// 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
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/primitiveArray.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/primitiveArray.txt
index b8def46715c..ff4baf160aa 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/primitiveArray.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/primitiveArray.txt
@@ -1,3 +1,15 @@
 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!
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/safeCall.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/safeCall.kt
index 9c20b759ae9..0e3cb21c2fe 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/safeCall.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/safeCall.kt
@@ -1,7 +1,6 @@
 // !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
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/safeCall.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/safeCall.txt
index b8def46715c..c29fb5ad665 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/safeCall.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/safeCall.txt
@@ -1,3 +1,16 @@
 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!
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonEquals.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonEquals.kt
index 468ff5c4959..3e16583b802 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonEquals.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonEquals.kt
@@ -1,7 +1,6 @@
 // !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
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonEquals.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonEquals.txt
index b8def46715c..34903ffd954 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonEquals.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonEquals.txt
@@ -1,3 +1,15 @@
 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!
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonIdentityEquals.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonIdentityEquals.kt
index 6cab5d050bd..ee64b8d261e 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonIdentityEquals.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonIdentityEquals.kt
@@ -1,7 +1,6 @@
 // !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
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonIdentityEquals.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonIdentityEquals.txt
index b8def46715c..34903ffd954 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonIdentityEquals.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonIdentityEquals.txt
@@ -1,3 +1,15 @@
 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!
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.kt
index 9d74d623335..38ac1551f4f 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.kt
@@ -1,5 +1,4 @@
-// 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
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.txt
index 324eef14d41..27c21d877a9 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.txt
+++ b/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!
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/uselessElvisInCall.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/uselessElvisInCall.kt
index 230514a1596..ab1f846dcbf 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/uselessElvisInCall.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/uselessElvisInCall.kt
@@ -1,7 +1,6 @@
 // !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
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/uselessElvisInCall.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/uselessElvisInCall.txt
index 79f259ce9cb..adf9031c655 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/uselessElvisInCall.txt
+++ b/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!
+}