[FIR] Fix compact rendering of flexible collection types and arrays

#KT-71160 Fixed
JetBrains · Sep 3, 2024 · 63f7588 · 63f7588
1 parent b59f7eb
commit 63f7588
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRendererForReadability.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRendererForReadability.kt
@@ -61,7 +61,7 @@ open class ConeTypeRendererForReadability(
             return "$lowerRendered!"
         }
 
-        val kotlinCollectionsPrefix = StandardNames.COLLECTIONS_PACKAGE_FQ_NAME.asString() + "."
+        val kotlinCollectionsPrefix = (StandardNames.COLLECTIONS_PACKAGE_FQ_NAME.asString() + ".").takeIf { lowerRendered.startsWith(it) } ?: ""
         val mutablePrefix = "Mutable"
         // java.util.List<Foo> -> (Mutable)List<Foo!>!
         val simpleCollection = replacePrefixesInTypeRepresentations(
@@ -82,7 +82,7 @@ open class ConeTypeRendererForReadability(
         )
         if (mutableEntry != null) return mutableEntry
 
-        val kotlinPrefix = StandardNames.BUILT_INS_PACKAGE_FQ_NAME.asString() + "."
+        val kotlinPrefix = (StandardNames.BUILT_INS_PACKAGE_FQ_NAME.asString() + ".").takeIf { lowerRendered.startsWith(it) } ?: ""
         // Foo[] -> Array<(out) Foo!>!
         val array = replacePrefixesInTypeRepresentations(
             lowerRendered = lowerRendered,

diff --git a/compiler/testData/cli/jvm/firDeprecationJava.out b/compiler/testData/cli/jvm/firDeprecationJava.out
@@ -4,7 +4,7 @@ compiler/testData/cli/jvm/firDeprecationJava.kt:3:12: warning: 'fun stop(): Unit
 compiler/testData/cli/jvm/firDeprecationJava.kt:4:17: warning: 'fun bar(a: String!, b: Int, c: Double): String!' is deprecated. Deprecated in Java.
     JavaClass().bar("", 1, 2.0)
                 ^^^
-compiler/testData/cli/jvm/firDeprecationJava.kt:5:27: warning: 'field baz: (MutableList<String!>..List<String!>?)' is deprecated. Deprecated in Java.
+compiler/testData/cli/jvm/firDeprecationJava.kt:5:27: warning: 'field baz: (Mutable)List<String!>!' is deprecated. Deprecated in Java.
     val baz = JavaClass().baz
                           ^^^
 OK
diff --git a/...tests/j+k/types/notNullTypeParameterWithKotlinOverridesDefinitelyNonNullable.fir.diag.txt b/...tests/j+k/types/notNullTypeParameterWithKotlinOverridesDefinitelyNonNullable.fir.diag.txt
@@ -2,4 +2,4 @@
 fun takeV(value: X & Any): Unit
 
 /main.kt:(137,145): error: 'takeVList' overrides nothing. Potential signatures for overriding:
-fun takeVList(value: (MutableList<@NotNull() X & Any>..List<@NotNull() X & Any>)): Unit
+fun takeVList(value: (Mutable)List<@NotNull() X & Any>): Unit
diff --git a/compiler/testData/diagnostics/tests/override/nothingToOverrideMessageWithJava.fir.diag.txt b/compiler/testData/diagnostics/tests/override/nothingToOverrideMessageWithJava.fir.diag.txt
@@ -2,10 +2,10 @@
 fun test1(a: String!): Unit
 
 /test.kt:(129,137): error: 'test2' overrides nothing. Potential signatures for overriding:
-fun test2(a: (MutableList<Int!>..List<Int!>?)): (MutableList<Int!>..List<Int!>?)
+fun test2(a: (Mutable)List<Int!>!): (Mutable)List<Int!>!
 
 /test.kt:(201,209): error: 'test3' overrides nothing. Potential signatures for overriding:
-fun test3(a: (Array<String!>..Array<out String!>?)): (Array<String!>..Array<out String!>?)
+fun test3(a: Array<(out) String!>!): Array<(out) String!>!
 
 /test.kt:(287,295): error: 'test4' overrides nothing. Potential signatures for overriding:
 fun test4(vararg indices: String!): Unit

diff --git a/compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.fir.diag.txt b/compiler/testData/diagnostics/tests/testsWithJava21/newListMethods.fir.diag.txt
@@ -12,7 +12,7 @@
 
 /newListMethods.fir.kt:(724,731): warning: This declaration overrides a deprecated member but is not marked as deprecated itself. Please add the '@Deprecated' annotation or suppress the diagnostic.
 
-/newListMethods.fir.kt:(799,806): warning: 'fun <T : Any!> toArray(p0: IntFunction<(Array<T!>..Array<out T!>?)>!): (Array<T!>..Array<out T!>?)' is deprecated. This declaration is redundant in Kotlin and might be removed soon.
+/newListMethods.fir.kt:(799,806): warning: 'fun <T : Any!> toArray(p0: IntFunction<Array<(out) T!>!>!): Array<(out) T!>!' is deprecated. This declaration is redundant in Kotlin and might be removed soon.
 
 /newListMethods.fir.kt:(875,883): warning: This declaration overrides a deprecated member but is not marked as deprecated itself. Please add the '@Deprecated' annotation or suppress the diagnostic.