FIR: introduce flexible types pretty rendering for no arguments case

#KT-52020 Fixed

compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt

@@ -1,4 +1,4 @@
-public abstract interface Comparator<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+public abstract interface Comparator<T : R|kotlin/Any!|> : R|kotlin/Any| {
     public abstract fun compare(o1: R|ft<T & Any, T?>|, o2: R|ft<T & Any, T?>|): R|kotlin/Int|
 
 }

compiler/testData/loadJava/compiledJava/sam/DifferentParametersCount.fir.txt

@@ -2,15 +2,15 @@ public final class DifferentParametersCount : R|kotlin/Any| {
     public constructor(): R|test/DifferentParametersCount|
 
     public open class A : R|kotlin/Any| {
-        public open static fun foo(x: R|ft<java/lang/Runnable, java/lang/Runnable?>|, y: R|kotlin/Int|): R|kotlin/Unit|
+        public open static fun foo(x: R|java/lang/Runnable!|, y: R|kotlin/Int|): R|kotlin/Unit|
 
         public constructor(): R|test/DifferentParametersCount.A|
 
     }
     public open class B : R|test/DifferentParametersCount.A| {
-        public open static fun foo(x: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public open static fun foo(x: R|java/lang/Runnable!|): R|kotlin/Unit|
 
-        public open static fun foo(x: R|ft<java/lang/Runnable, java/lang/Runnable?>|, y: R|kotlin/Int|): R|kotlin/Unit|
+        public open static fun foo(x: R|java/lang/Runnable!|, y: R|kotlin/Int|): R|kotlin/Unit|
 
         public constructor(): R|test/DifferentParametersCount.B|
 

compiler/testData/loadJava/compiledJava/sam/FakeStaticOverrides.fir.txt

@@ -2,15 +2,15 @@ public final class FakeStaticOverrides : R|kotlin/Any| {
     public constructor(): R|test/FakeStaticOverrides|
 
     public open class A : R|kotlin/Any| {
-        public open static fun foo(x: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
+        public open static fun foo(x: R|ft<kotlin/Function0<kotlin/Unit!>, kotlin/Function0<kotlin/Unit!>?>|): R|kotlin/Unit|
 
         public constructor(): R|test/FakeStaticOverrides.A|
 
     }
     public open class B : R|test/FakeStaticOverrides.A| {
-        public open static fun foo(x: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public open static fun foo(x: R|java/lang/Runnable!|): R|kotlin/Unit|
 
-        public open static fun foo(x: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
+        public open static fun foo(x: R|ft<kotlin/Function0<kotlin/Unit!>, kotlin/Function0<kotlin/Unit!>?>|): R|kotlin/Unit|
 
         public constructor(): R|test/FakeStaticOverrides.B|
 

compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt

@@ -1,4 +1,4 @@
 public abstract interface FilenameFilter : R|kotlin/Any| {
-    public abstract fun accept(dir: R|ft<java/io/File, java/io/File?>|, name: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Boolean|
+    public abstract fun accept(dir: R|java/io/File!|, name: R|kotlin/String!|): R|kotlin/Boolean|
 
 }

compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt

@@ -1,4 +1,4 @@
-public abstract interface GenericInterfaceParametersWithBounds<A : R|ft<kotlin/Comparable<ft<A & Any, A?>>, kotlin/Comparable<ft<A & Any, A?>>?>|, R|ft<kotlin/Cloneable, kotlin/Cloneable?>|, B : R|ft<kotlin/collections/MutableList<ft<A & Any, A?>>, kotlin/collections/List<ft<A & Any, A?>>?>|> : R|kotlin/Any| {
+public abstract interface GenericInterfaceParametersWithBounds<A : R|ft<kotlin/Comparable<ft<A & Any, A?>>, kotlin/Comparable<ft<A & Any, A?>>?>|, R|kotlin/Cloneable!|, B : R|ft<kotlin/collections/MutableList<ft<A & Any, A?>>, kotlin/collections/List<ft<A & Any, A?>>?>|> : R|kotlin/Any| {
     public abstract fun method(a: R|ft<kotlin/Array<ft<A & Any, A?>>, kotlin/Array<out ft<A & Any, A?>>?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt

@@ -1,4 +1,4 @@
 public abstract interface GenericMethodParameters : R|kotlin/Any| {
-    public abstract fun <A : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, B : R|ft<kotlin/collections/MutableList<ft<A & Any, A?>>, kotlin/collections/List<ft<A & Any, A?>>?>|> method(a: R|ft<kotlin/Array<ft<A & Any, A?>>, kotlin/Array<out ft<A & Any, A?>>?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
+    public abstract fun <A : R|kotlin/CharSequence!|, B : R|ft<kotlin/collections/MutableList<ft<A & Any, A?>>, kotlin/collections/List<ft<A & Any, A?>>?>|> method(a: R|ft<kotlin/Array<ft<A & Any, A?>>, kotlin/Array<out ft<A & Any, A?>>?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.fir.txt

@@ -1,11 +1,11 @@
 public abstract interface SamSubinterfaceOfTwo : R|kotlin/Any| {
-    public abstract interface Sub : R|test/SamSubinterfaceOfTwo.Super1|, R|test/SamSubinterfaceOfTwo.Super2<ft<kotlin/String, kotlin/String?>>| {
+    public abstract interface Sub : R|test/SamSubinterfaceOfTwo.Super1|, R|test/SamSubinterfaceOfTwo.Super2<kotlin/String!>| {
     }
     public abstract interface Super1 : R|kotlin/Any| {
-        public abstract fun f(): R|ft<kotlin/CharSequence, kotlin/CharSequence?>|
+        public abstract fun f(): R|kotlin/CharSequence!|
 
     }
-    public abstract interface Super2<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public abstract interface Super2<T : R|kotlin/Any!|> : R|kotlin/Any| {
         public abstract fun f(): R|ft<T & Any, T?>|
 
     }

compiler/testData/loadJava/compiledJava/sam/StaticOverrides.fir.txt

@@ -2,15 +2,15 @@ public final class StaticOverrides : R|kotlin/Any| {
     public constructor(): R|test/StaticOverrides|
 
     public open class A : R|kotlin/Any| {
-        public open static fun foo(x: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
+        public open static fun foo(x: R|ft<kotlin/Function0<kotlin/Unit!>, kotlin/Function0<kotlin/Unit!>?>|): R|kotlin/Unit|
 
         public constructor(): R|test/StaticOverrides.A|
 
     }
     public open class B : R|test/StaticOverrides.A| {
-        public open static fun foo(x: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public open static fun foo(x: R|java/lang/Runnable!|): R|kotlin/Unit|
 
-        public open static fun foo(x: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
+        public open static fun foo(x: R|ft<kotlin/Function0<kotlin/Unit!>, kotlin/Function0<kotlin/Unit!>?>|): R|kotlin/Unit|
 
         public constructor(): R|test/StaticOverrides.B|
 

compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.fir.txt

@@ -1,2 +1,2 @@
-public abstract interface SubstitutedSamInterface : R|java/util/Comparator<ft<kotlin/String, kotlin/String?>>| {
+public abstract interface SubstitutedSamInterface : R|java/util/Comparator<kotlin/String!>| {
 }

compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.fir.txt

@@ -1,2 +1,2 @@
-public abstract interface SubstitutedSamInterfaceSubclassOfBuiltin : R|kotlin/Comparable<ft<test/SubstitutedSamInterfaceSubclassOfBuiltin, test/SubstitutedSamInterfaceSubclassOfBuiltin?>>| {
+public abstract interface SubstitutedSamInterfaceSubclassOfBuiltin : R|kotlin/Comparable<test/SubstitutedSamInterfaceSubclassOfBuiltin!>| {
 }

compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt

@@ -1,4 +1,4 @@
 public abstract interface VarargParameter : R|kotlin/Any| {
-    public abstract fun f(vararg strings: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+    public abstract fun f(vararg strings: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt

@@ -1,7 +1,7 @@
 public open class AmbiguousAdapters : R|kotlin/Any| {
-    public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+    public open fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
-    public open fun foo(c: R|ft<java/io/Closeable, java/io/Closeable?>|): R|kotlin/Unit|
+    public open fun foo(c: R|java/io/Closeable!|): R|kotlin/Unit|
 
     public constructor(): R|test/AmbiguousAdapters|
 

compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt

@@ -1,7 +1,7 @@
 public open class Basic : R|kotlin/Any| {
-    public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+    public open fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
-    public open static fun bar(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+    public open static fun bar(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
     public constructor(): R|test/Basic|
 

compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.fir.txt

@@ -1,4 +1,4 @@
 public open class Constructor : R|kotlin/Any| {
-    public constructor(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|test/Constructor|
+    public constructor(r: R|java/lang/Runnable!|): R|test/Constructor|
 
 }

compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.fir.txt

@@ -1,4 +1,4 @@
 public open class ConstructorWithAnnotations : R|kotlin/Any| {
-    public constructor(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|, @R|org/jetbrains/annotations/NotNull|() s: R|@EnhancedNullability kotlin/String|): R|test/ConstructorWithAnnotations|
+    public constructor(r: R|java/lang/Runnable!|, @R|org/jetbrains/annotations/NotNull|() s: R|@EnhancedNullability kotlin/String|): R|test/ConstructorWithAnnotations|
 
 }

compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.fir.txt

@@ -1,10 +1,10 @@
 public abstract interface DeepSamLoop : R|kotlin/Any| {
     public abstract interface Bar : R|kotlin/Any| {
-        public abstract fun foo(p: R|ft<test/DeepSamLoop.Foo, test/DeepSamLoop.Foo?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|test/DeepSamLoop.Foo!|): R|kotlin/Unit|
 
     }
     public abstract interface Foo : R|kotlin/Any| {
-        public abstract fun foo(p: R|ft<test/DeepSamLoop.Bar, test/DeepSamLoop.Bar?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|test/DeepSamLoop.Bar!|): R|kotlin/Unit|
 
     }
 }

compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt

@@ -1,11 +1,11 @@
 public open class NonTrivialFunctionType : R|kotlin/Any| {
-    public open fun foo(filenameFilter: R|ft<java/io/FilenameFilter, java/io/FilenameFilter?>|): R|kotlin/Unit|
+    public open fun foo(filenameFilter: R|java/io/FilenameFilter!|): R|kotlin/Unit|
 
-    public open fun foo(comparator: R|ft<java/util/Comparator<ft<kotlin/String, kotlin/String?>>, java/util/Comparator<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+    public open fun foo(comparator: R|ft<java/util/Comparator<kotlin/String!>, java/util/Comparator<kotlin/String!>?>|): R|kotlin/Unit|
 
     public open fun wildcardUnbound(comparator: R|ft<java/util/Comparator<*>, java/util/Comparator<*>?>|): R|kotlin/Unit|
 
-    public open fun wildcardBound(comparator: R|ft<java/util/Comparator<in ft<kotlin/CharSequence, kotlin/CharSequence?>>, java/util/Comparator<in ft<kotlin/CharSequence, kotlin/CharSequence?>>?>|): R|kotlin/Unit|
+    public open fun wildcardBound(comparator: R|ft<java/util/Comparator<in kotlin/CharSequence!>, java/util/Comparator<in kotlin/CharSequence!>?>|): R|kotlin/Unit|
 
     public constructor(): R|test/NonTrivialFunctionType|
 

compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt

@@ -1,5 +1,5 @@
 public open class PrivateSamAdapter : R|kotlin/Any| {
-    private open fun samAdapter(r: R|ft<test/PrivateSamAdapter.SamInterface, test/PrivateSamAdapter.SamInterface?>|): R|kotlin/Unit|
+    private open fun samAdapter(r: R|test/PrivateSamAdapter.SamInterface!|): R|kotlin/Unit|
 
     public constructor(): R|test/PrivateSamAdapter|
 

compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt

@@ -1,4 +1,4 @@
 public abstract interface SelfAsParameter : R|kotlin/Any| {
-    public abstract fun foo(p: R|ft<test/SelfAsParameter, test/SelfAsParameter?>|): R|kotlin/Unit|
+    public abstract fun foo(p: R|test/SelfAsParameter!|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt

@@ -1,5 +1,5 @@
 public open class SeveralSamParameters : R|kotlin/Any| {
-    public open static fun findMaxAndInvokeCallback(comparator: R|ft<java/util/Comparator<ft<kotlin/String, kotlin/String?>>, java/util/Comparator<ft<kotlin/String, kotlin/String?>>?>|, a: R|ft<kotlin/String, kotlin/String?>|, b: R|ft<kotlin/String, kotlin/String?>|, afterRunnable: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|ft<kotlin/String, kotlin/String?>|
+    public open static fun findMaxAndInvokeCallback(comparator: R|ft<java/util/Comparator<kotlin/String!>, java/util/Comparator<kotlin/String!>?>|, a: R|kotlin/String!|, b: R|kotlin/String!|, afterRunnable: R|java/lang/Runnable!|): R|kotlin/String!|
 
     public constructor(): R|test/SeveralSamParameters|
 

compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt

@@ -1,6 +1,6 @@
-public open class TypeParameterOfClass<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+public open class TypeParameterOfClass<T : R|kotlin/Any!|> : R|kotlin/Any| {
     public open fun foo(comparator: R|ft<java/util/Comparator<ft<T & Any, T?>>, java/util/Comparator<ft<T & Any, T?>>?>|): R|kotlin/Unit|
 
-    public constructor<T : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/TypeParameterOfClass<T>|
+    public constructor<T : R|kotlin/Any!|>(): R|test/TypeParameterOfClass<T>|
 
 }

compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt

@@ -1,9 +1,9 @@
 public open class TypeParameterOfMethod : R|kotlin/Any| {
-    public open static fun <T : R|ft<kotlin/Any, kotlin/Any?>|> max(comparator: R|ft<java/util/Comparator<ft<T & Any, T?>>, java/util/Comparator<ft<T & Any, T?>>?>|, value1: R|ft<T & Any, T?>|, value2: R|ft<T & Any, T?>|): R|ft<T & Any, T?>|
+    public open static fun <T : R|kotlin/Any!|> max(comparator: R|ft<java/util/Comparator<ft<T & Any, T?>>, java/util/Comparator<ft<T & Any, T?>>?>|, value1: R|ft<T & Any, T?>|, value2: R|ft<T & Any, T?>|): R|ft<T & Any, T?>|
 
-    public open static fun <T : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> max2(comparator: R|ft<java/util/Comparator<ft<T & Any, T?>>, java/util/Comparator<ft<T & Any, T?>>?>|, value1: R|ft<T & Any, T?>|, value2: R|ft<T & Any, T?>|): R|ft<T & Any, T?>|
+    public open static fun <T : R|kotlin/CharSequence!|> max2(comparator: R|ft<java/util/Comparator<ft<T & Any, T?>>, java/util/Comparator<ft<T & Any, T?>>?>|, value1: R|ft<T & Any, T?>|, value2: R|ft<T & Any, T?>|): R|ft<T & Any, T?>|
 
-    public open static fun <A : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, B : R|ft<kotlin/collections/MutableList<ft<A & Any, A?>>, kotlin/collections/List<ft<A & Any, A?>>?>|> method(a: R|ft<java/util/Comparator<ft<A & Any, A?>>, java/util/Comparator<ft<A & Any, A?>>?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
+    public open static fun <A : R|kotlin/CharSequence!|, B : R|ft<kotlin/collections/MutableList<ft<A & Any, A?>>, kotlin/collections/List<ft<A & Any, A?>>?>|> method(a: R|ft<java/util/Comparator<ft<A & Any, A?>>, java/util/Comparator<ft<A & Any, A?>>?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
 
     public constructor(): R|test/TypeParameterOfMethod|
 

compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt

@@ -1,7 +1,7 @@
-public open class TypeParameterOfOuterClass<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-    public constructor<T : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/TypeParameterOfOuterClass<T>|
+public open class TypeParameterOfOuterClass<T : R|kotlin/Any!|> : R|kotlin/Any| {
+    public constructor<T : R|kotlin/Any!|>(): R|test/TypeParameterOfOuterClass<T>|
 
-    public open inner class Inner<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public open inner class Inner<T : R|kotlin/Any!|> : R|kotlin/Any| {
         public open fun foo(comparator: R|ft<java/util/Comparator<ft<T & Any, T?>>, java/util/Comparator<ft<T & Any, T?>>?>|): R|kotlin/Unit|
 
         public test/TypeParameterOfOuterClass<T>.constructor(): R|test/TypeParameterOfOuterClass.Inner<T>|

compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.fir.txt

@@ -1,12 +1,12 @@
 public abstract interface AdapterDoesntOverrideDeclaration : R|kotlin/Any| {
     public abstract interface Sub : R|test/AdapterDoesntOverrideDeclaration.Super| {
-        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
-        public abstract fun foo(r: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|ft<kotlin/Function0<kotlin/Unit!>, kotlin/Function0<kotlin/Unit!>?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(r: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|ft<kotlin/Function0<kotlin/Unit!>, kotlin/Function0<kotlin/Unit!>?>|): R|kotlin/Unit|
 
     }
 }

compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.fir.txt

@@ -2,9 +2,9 @@ public abstract interface InheritedAdapterAndDeclaration : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritedAdapterAndDeclaration.Super| {
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
-        public abstract fun foo(r: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|ft<kotlin/Function0<kotlin/Unit!>, kotlin/Function0<kotlin/Unit!>?>|): R|kotlin/Unit|
 
     }
 }

compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.fir.txt

@@ -2,9 +2,9 @@ public abstract interface InheritedAmbiguousAdapters : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritedAmbiguousAdapters.Super| {
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
-        public abstract fun foo(r: R|ft<java/io/Closeable, java/io/Closeable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/io/Closeable!|): R|kotlin/Unit|
 
     }
 }

compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.fir.txt

@@ -1,14 +1,14 @@
 public abstract interface InheritedAndOverriddenAmbiguousAdapters : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritedAndOverriddenAmbiguousAdapters.Super| {
-        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
-        public abstract fun foo(r: R|ft<java/io/Closeable, java/io/Closeable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/io/Closeable!|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
-        public abstract fun foo(r: R|ft<java/io/Closeable, java/io/Closeable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/io/Closeable!|): R|kotlin/Unit|
 
     }
 }

compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.fir.txt

@@ -1,12 +1,12 @@
 public abstract interface InheritedOverridden : R|kotlin/Any| {
     public open class Sub : R|test/InheritedOverridden.Super| {
-        public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public open fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
         public constructor(): R|test/InheritedOverridden.Sub|
 
     }
     public open class Super : R|kotlin/Any| {
-        public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public open fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
         public constructor(): R|test/InheritedOverridden.Super|
 

compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.fir.txt

@@ -1,14 +1,14 @@
 public abstract interface InheritedOverriddenAdapter : R|kotlin/Any| {
     public open class Sub : R|test/InheritedOverriddenAdapter.Super| {
-        public open fun foo(r: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
+        public open fun foo(r: R|ft<kotlin/Function0<kotlin/Unit!>, kotlin/Function0<kotlin/Unit!>?>|): R|kotlin/Unit|
 
-        public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public open fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
         public constructor(): R|test/InheritedOverriddenAdapter.Sub|
 
     }
     public open class Super : R|kotlin/Any| {
-        public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public open fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
         public constructor(): R|test/InheritedOverriddenAdapter.Super|
 

compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.fir.txt

@@ -2,11 +2,11 @@ public abstract interface InheritedSameAdapters : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritedSameAdapters.Super1|, R|test/InheritedSameAdapters.Super2| {
     }
     public abstract interface Super1 : R|kotlin/Any| {
-        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
     }
     public abstract interface Super2 : R|kotlin/Any| {
-        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
     }
 }

compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.fir.txt

@@ -2,13 +2,13 @@ public abstract interface InheritedSameAdaptersWithSubstitution : R|kotlin/Any|
     public abstract interface Sub : R|test/InheritedSameAdaptersWithSubstitution.Super1|, R|test/InheritedSameAdaptersWithSubstitution.Super2Substituted| {
     }
     public abstract interface Super1 : R|kotlin/Any| {
-        public abstract fun foo(r: R|ft<java/util/Comparator<ft<kotlin/String, kotlin/String?>>, java/util/Comparator<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|ft<java/util/Comparator<kotlin/String!>, java/util/Comparator<kotlin/String!>?>|): R|kotlin/Unit|
 
     }
-    public abstract interface Super2<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public abstract interface Super2<T : R|kotlin/Any!|> : R|kotlin/Any| {
         public abstract fun foo(r: R|ft<java/util/Comparator<ft<T & Any, T?>>, java/util/Comparator<ft<T & Any, T?>>?>|): R|kotlin/Unit|
 
     }
-    public abstract interface Super2Substituted : R|test/InheritedSameAdaptersWithSubstitution.Super2<ft<kotlin/String, kotlin/String?>>| {
+    public abstract interface Super2Substituted : R|test/InheritedSameAdaptersWithSubstitution.Super2<kotlin/String!>| {
     }
 }

compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.fir.txt

@@ -2,7 +2,7 @@ public abstract interface InheritedSimple : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritedSimple.Super| {
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
     }
 }

compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.fir.txt

@@ -1,16 +1,16 @@
 public abstract interface OverriddenAmbiguousAdapters : R|kotlin/Any| {
     public abstract interface Sub : R|test/OverriddenAmbiguousAdapters.Super| {
-        public abstract fun foo(r: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|ft<kotlin/Function0<kotlin/Unit!>, kotlin/Function0<kotlin/Unit!>?>|): R|kotlin/Unit|
 
-        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
-        public abstract fun foo(r: R|ft<java/io/Closeable, java/io/Closeable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/io/Closeable!|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
-        public abstract fun foo(r: R|ft<java/io/Closeable, java/io/Closeable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/io/Closeable!|): R|kotlin/Unit|
 
     }
 }