FIR: introduce flexible types pretty rendering for no arguments case

#KT-52020 Fixed
This commit is contained in:
Mikhail Glukhikh
2022-06-24 10:52:58 +02:00
committed by Space
parent 31ec10142b
commit 38f4a35be2
265 changed files with 654 additions and 638 deletions
@@ -1,10 +1,10 @@
public abstract interface ChangeProjectionKind1 : R|kotlin/Any| {
public abstract interface Sub : R|test/ChangeProjectionKind1.Super| {
public abstract fun foo(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
public abstract fun foo(p: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|): R|kotlin/Unit|
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun foo(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
public abstract fun foo(p: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|): R|kotlin/Unit|
public abstract fun dummy(): R|kotlin/Unit|
@@ -1,13 +1,13 @@
public abstract interface DeeplySubstitutedClassParameter : R|kotlin/Any| {
public abstract interface Middle<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/DeeplySubstitutedClassParameter.Super<ft<E & Any, E?>>| {
public abstract interface Middle<E : R|kotlin/Any!|> : R|test/DeeplySubstitutedClassParameter.Super<ft<E & Any, E?>>| {
public abstract fun foo(p: R|ft<E & Any, E?>|): R|kotlin/Unit|
}
public abstract interface Sub : R|test/DeeplySubstitutedClassParameter.Middle<ft<kotlin/String, kotlin/String?>>| {
public abstract fun foo(p: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
public abstract interface Sub : R|test/DeeplySubstitutedClassParameter.Middle<kotlin/String!>| {
public abstract fun foo(p: R|kotlin/String!|): R|kotlin/Unit|
}
public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public abstract interface Super<T : R|kotlin/Any!|> : R|kotlin/Any| {
public abstract fun foo(p: R|ft<T & Any, T?>|): R|kotlin/Unit|
public abstract fun dummy(): R|kotlin/Unit|
@@ -1,11 +1,11 @@
public abstract interface DeeplySubstitutedClassParameter2 : R|kotlin/Any| {
public abstract interface Middle<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/DeeplySubstitutedClassParameter2.Super<ft<E & Any, E?>>| {
public abstract interface Middle<E : R|kotlin/Any!|> : R|test/DeeplySubstitutedClassParameter2.Super<ft<E & Any, E?>>| {
}
public abstract interface Sub : R|test/DeeplySubstitutedClassParameter2.Middle<ft<kotlin/String, kotlin/String?>>| {
public abstract fun foo(p: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
public abstract interface Sub : R|test/DeeplySubstitutedClassParameter2.Middle<kotlin/String!>| {
public abstract fun foo(p: R|kotlin/String!|): R|kotlin/Unit|
}
public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public abstract interface Super<T : R|kotlin/Any!|> : R|kotlin/Any| {
public abstract fun foo(p: R|ft<T & Any, T?>|): R|kotlin/Unit|
public abstract fun dummy(): R|kotlin/Unit|
@@ -1,10 +1,10 @@
public abstract interface InheritNotVararg : R|kotlin/Any| {
public abstract interface Sub : R|test/InheritNotVararg.Super| {
public abstract fun foo(vararg p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
public abstract fun foo(vararg p: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun foo(p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
public abstract fun foo(p: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
public abstract fun dummy(): R|kotlin/Unit|
@@ -1,10 +1,10 @@
public abstract interface InheritNotVarargInteger : R|kotlin/Any| {
public abstract interface Sub : R|test/InheritNotVarargInteger.Super| {
public abstract fun foo(vararg p: R|ft<kotlin/Array<ft<kotlin/Int, kotlin/Int?>>, kotlin/Array<out ft<kotlin/Int, kotlin/Int?>>?>|): R|kotlin/Unit|
public abstract fun foo(vararg p: R|ft<kotlin/Array<kotlin/Int!>, kotlin/Array<out kotlin/Int!>?>|): R|kotlin/Unit|
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun foo(p: R|ft<kotlin/Array<ft<kotlin/Int, kotlin/Int?>>, kotlin/Array<out ft<kotlin/Int, kotlin/Int?>>?>|): R|kotlin/Unit|
public abstract fun foo(p: R|ft<kotlin/Array<kotlin/Int!>, kotlin/Array<out kotlin/Int!>?>|): R|kotlin/Unit|
public abstract fun dummy(): R|kotlin/Unit|
@@ -1,10 +1,10 @@
public abstract interface InheritNotVarargNotNull : R|kotlin/Any| {
public abstract interface Sub : R|test/InheritNotVarargNotNull.Super| {
public abstract fun foo(vararg p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
public abstract fun foo(vararg p: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun foo(p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
public abstract fun foo(p: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
public abstract fun dummy(): R|kotlin/Unit|
@@ -1,10 +1,10 @@
public abstract interface InheritNotVarargPrimitive : R|kotlin/Any| {
public abstract interface Sub : R|test/InheritNotVarargPrimitive.Super| {
public abstract fun foo(vararg p: R|ft<kotlin/IntArray, kotlin/IntArray?>|): R|kotlin/Unit|
public abstract fun foo(vararg p: R|kotlin/IntArray!|): R|kotlin/Unit|
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun foo(p: R|ft<kotlin/IntArray, kotlin/IntArray?>|): R|kotlin/Unit|
public abstract fun foo(p: R|kotlin/IntArray!|): R|kotlin/Unit|
public abstract fun dummy(): R|kotlin/Unit|
@@ -1,10 +1,10 @@
public abstract interface InheritVararg : R|kotlin/Any| {
public abstract interface Sub : R|test/InheritVararg.Super| {
public abstract fun foo(p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
public abstract fun foo(p: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun foo(vararg p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
public abstract fun foo(vararg p: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
public abstract fun dummy(): R|kotlin/Unit|
@@ -1,10 +1,10 @@
public abstract interface InheritVarargInteger : R|kotlin/Any| {
public abstract interface Sub : R|test/InheritVarargInteger.Super| {
public abstract fun foo(p: R|ft<kotlin/Array<ft<kotlin/Int, kotlin/Int?>>, kotlin/Array<out ft<kotlin/Int, kotlin/Int?>>?>|): R|kotlin/Unit|
public abstract fun foo(p: R|ft<kotlin/Array<kotlin/Int!>, kotlin/Array<out kotlin/Int!>?>|): R|kotlin/Unit|
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun foo(vararg p: R|ft<kotlin/Array<ft<kotlin/Int, kotlin/Int?>>, kotlin/Array<out ft<kotlin/Int, kotlin/Int?>>?>|): R|kotlin/Unit|
public abstract fun foo(vararg p: R|ft<kotlin/Array<kotlin/Int!>, kotlin/Array<out kotlin/Int!>?>|): R|kotlin/Unit|
public abstract fun dummy(): R|kotlin/Unit|
@@ -1,10 +1,10 @@
public abstract interface InheritVarargNotNull : R|kotlin/Any| {
public abstract interface Sub : R|test/InheritVarargNotNull.Super| {
public abstract fun foo(p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
public abstract fun foo(p: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun foo(vararg p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
public abstract fun foo(vararg p: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
public abstract fun dummy(): R|kotlin/Unit|
@@ -1,10 +1,10 @@
public abstract interface InheritVarargPrimitive : R|kotlin/Any| {
public abstract interface Sub : R|test/InheritVarargPrimitive.Super| {
public abstract fun foo(p: R|ft<kotlin/IntArray, kotlin/IntArray?>|): R|kotlin/Unit|
public abstract fun foo(p: R|kotlin/IntArray!|): R|kotlin/Unit|
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun foo(vararg p: R|ft<kotlin/IntArray, kotlin/IntArray?>|): R|kotlin/Unit|
public abstract fun foo(vararg p: R|kotlin/IntArray!|): R|kotlin/Unit|
public abstract fun dummy(): R|kotlin/Unit|
@@ -1,15 +1,15 @@
public abstract interface Kt3302 : R|kotlin/Any| {
public abstract interface BSONObject : R|kotlin/Any| {
public abstract fun put(@R|org/jetbrains/annotations/NotNull|() s: R|@EnhancedNullability kotlin/String|, @R|org/jetbrains/annotations/NotNull|() o: R|@EnhancedNullability kotlin/Any|): R|ft<kotlin/Any, kotlin/Any?>|
public abstract fun put(@R|org/jetbrains/annotations/NotNull|() s: R|@EnhancedNullability kotlin/String|, @R|org/jetbrains/annotations/NotNull|() o: R|@EnhancedNullability kotlin/Any|): R|kotlin/Any!|
public abstract fun dummy(): R|kotlin/Unit|
}
public abstract interface BasicBSONObject : R|test/Kt3302.LinkedHashMap<ft<kotlin/String, kotlin/String?>, ft<kotlin/Any, kotlin/Any?>>|, R|test/Kt3302.BSONObject| {
@R|java/lang/Override|() public abstract fun put(key: R|@EnhancedNullability kotlin/String|, value: R|@EnhancedNullability kotlin/Any|): R|ft<kotlin/Any, kotlin/Any?>|
public abstract interface BasicBSONObject : R|test/Kt3302.LinkedHashMap<kotlin/String!, kotlin/Any!>|, R|test/Kt3302.BSONObject| {
@R|java/lang/Override|() public abstract fun put(key: R|@EnhancedNullability kotlin/String|, value: R|@EnhancedNullability kotlin/Any|): R|kotlin/Any!|
}
public abstract interface LinkedHashMap<K : R|ft<kotlin/Any, kotlin/Any?>|, V : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public abstract interface LinkedHashMap<K : R|kotlin/Any!|, V : R|kotlin/Any!|> : R|kotlin/Any| {
public abstract fun put(key: R|ft<K & Any, K?>|, value: R|ft<V & Any, V?>|): R|ft<V & Any, V?>|
public abstract fun dummy(): R|kotlin/Unit|
@@ -1,10 +1,10 @@
public abstract interface MutableToReadOnly : R|kotlin/Any| {
public abstract interface Sub : R|test/MutableToReadOnly.Super| {
public abstract fun foo(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
public abstract fun foo(p: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|): R|kotlin/Unit|
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun foo(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
public abstract fun foo(p: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|): R|kotlin/Unit|
public abstract fun dummy(): R|kotlin/Unit|
@@ -4,7 +4,7 @@ public abstract interface NullableToNotNull : R|kotlin/Any| {
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun foo(p: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
public abstract fun foo(p: R|kotlin/String!|): R|kotlin/Unit|
public abstract fun dummy(): R|kotlin/Unit|
@@ -1,10 +1,10 @@
public abstract interface NullableToNotNullKotlinSignature : R|kotlin/Any| {
public abstract interface Sub : R|test/NullableToNotNullKotlinSignature.Super| {
public abstract fun foo(p: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
public abstract fun foo(p: R|kotlin/String!|): R|kotlin/Unit|
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun foo(p: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
public abstract fun foo(p: R|kotlin/String!|): R|kotlin/Unit|
public abstract fun dummy(): R|kotlin/Unit|
@@ -1,9 +1,9 @@
public abstract interface OverrideWithErasedParameter : R|kotlin/Any| {
public abstract interface Sub<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/OverrideWithErasedParameter.Super<ft<T & Any, T?>>| {
public abstract fun foo(o: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Unit|
public abstract interface Sub<T : R|kotlin/Any!|> : R|test/OverrideWithErasedParameter.Super<ft<T & Any, T?>>| {
public abstract fun foo(o: R|kotlin/Any!|): R|kotlin/Unit|
}
public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public abstract interface Super<T : R|kotlin/Any!|> : R|kotlin/Any| {
public abstract fun foo(t: R|ft<T & Any, T?>|): R|kotlin/Unit|
public abstract fun dummy(): R|kotlin/Unit|
@@ -1,10 +1,10 @@
public abstract interface ReadOnlyToMutable : R|kotlin/Any| {
public abstract interface Sub : R|test/ReadOnlyToMutable.Super| {
public abstract fun foo(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
public abstract fun foo(p: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|): R|kotlin/Unit|
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun foo(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
public abstract fun foo(p: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|): R|kotlin/Unit|
public abstract fun dummy(): R|kotlin/Unit|
@@ -1,5 +1,5 @@
public abstract interface SubclassFromGenericAndNot : R|kotlin/Any| {
public abstract interface Generic<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public abstract interface Generic<T : R|kotlin/Any!|> : R|kotlin/Any| {
public abstract fun foo(key: R|ft<T & Any, T?>|): R|kotlin/Unit|
public abstract fun dummy(): R|kotlin/Unit|
@@ -11,7 +11,7 @@ public abstract interface SubclassFromGenericAndNot : R|kotlin/Any| {
public abstract fun dummy(): R|kotlin/Unit|
}
public abstract interface Sub : R|test/SubclassFromGenericAndNot.NonGeneric|, R|test/SubclassFromGenericAndNot.Generic<ft<kotlin/String, kotlin/String?>>| {
public abstract interface Sub : R|test/SubclassFromGenericAndNot.NonGeneric|, R|test/SubclassFromGenericAndNot.Generic<kotlin/String!>| {
@R|java/lang/Override|() public abstract fun foo(key: R|@EnhancedNullability kotlin/String|): R|kotlin/Unit|
}
@@ -1,9 +1,9 @@
public abstract interface SubstitutedClassParameter : R|kotlin/Any| {
public abstract interface Sub : R|test/SubstitutedClassParameter.Super<ft<kotlin/String, kotlin/String?>>| {
public abstract fun foo(p: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
public abstract interface Sub : R|test/SubstitutedClassParameter.Super<kotlin/String!>| {
public abstract fun foo(p: R|kotlin/String!|): R|kotlin/Unit|
}
public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public abstract interface Super<T : R|kotlin/Any!|> : R|kotlin/Any| {
public abstract fun foo(p: R|ft<T & Any, T?>|): R|kotlin/Unit|
public abstract fun dummy(): R|kotlin/Unit|
@@ -1,15 +1,15 @@
public abstract interface SubstitutedClassParameters : R|kotlin/Any| {
public abstract interface Sub : R|test/SubstitutedClassParameters.Super1<ft<kotlin/String, kotlin/String?>>|, R|test/SubstitutedClassParameters.Super2<ft<kotlin/String, kotlin/String?>>| {
public abstract fun foo(p: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
public abstract interface Sub : R|test/SubstitutedClassParameters.Super1<kotlin/String!>|, R|test/SubstitutedClassParameters.Super2<kotlin/String!>| {
public abstract fun foo(p: R|kotlin/String!|): R|kotlin/Unit|
}
public abstract interface Super1<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public abstract interface Super1<T : R|kotlin/Any!|> : R|kotlin/Any| {
public abstract fun foo(p: R|ft<T & Any, T?>|): R|kotlin/Unit|
public abstract fun dummy(): R|kotlin/Unit|
}
public abstract interface Super2<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public abstract interface Super2<E : R|kotlin/Any!|> : R|kotlin/Any| {
public abstract fun foo(p: R|ft<E & Any, E?>|): R|kotlin/Unit|
public abstract fun dummy(): R|kotlin/Unit|