Regenerated all test data which uses NamespaceComparator.

compiler/testData/loadJava/kotlinSignature/ArrayType.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.ArrayType : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.ArrayType
-    public open fun foo(): jet.Array<jet.String>
+public open class ArrayType : java.lang.Object {
+    public constructor ArrayType()
+    public open fun foo() : jet.Array<jet.String>
 }

compiler/testData/loadJava/kotlinSignature/ConstructorWithNewTypeParams.txt

@@ -1,5 +1,5 @@
 namespace test
 
-public open class test.ConstructorWithNewTypeParams</*0*/ T : jet.Any?> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(/*0*/ p0: jet.Any): test.ConstructorWithNewTypeParams<T>
+public open class ConstructorWithNewTypeParams</*0*/ T> : java.lang.Object {
+    public constructor ConstructorWithNewTypeParams</*0*/ T>(/*0*/ p0 : jet.Any)
 }

compiler/testData/loadJava/kotlinSignature/ConstructorWithParentTypeParams.txt

@@ -1,5 +1,5 @@
 namespace test
 
-public open class test.ConstructorWithParentTypeParams</*0*/ T : jet.Any?> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(/*0*/ p0: T): test.ConstructorWithParentTypeParams<T>
+public open class ConstructorWithParentTypeParams</*0*/ T> : java.lang.Object {
+    public constructor ConstructorWithParentTypeParams</*0*/ T>(/*0*/ p0 : T)
 }

compiler/testData/loadJava/kotlinSignature/ConstructorWithSeveralParams.txt

@@ -1,5 +1,5 @@
 namespace test
 
-public open class test.ConstructorWithSeveralParams : java.lang.Object {
-    public final /*constructor*/ fun <init>(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int, /*2*/ p2: java.util.ArrayList<jet.String>): test.ConstructorWithSeveralParams
+public open class ConstructorWithSeveralParams : java.lang.Object {
+    public constructor ConstructorWithSeveralParams(/*0*/ p0 : jet.Int, /*1*/ p1 : jet.Int, /*2*/ p2 : java.util.ArrayList<jet.String>)
 }

compiler/testData/loadJava/kotlinSignature/ConstructorWithoutParams.txt

@@ -1,5 +1,5 @@
 namespace test
 
-public open class test.ConstructorWithoutParams : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.ConstructorWithoutParams
+public open class ConstructorWithoutParams : java.lang.Object {
+    public constructor ConstructorWithoutParams()
 }

compiler/testData/loadJava/kotlinSignature/CustomVariance.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.CustomVariance : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.CustomVariance
-    public open fun foo(): jet.MutableList<out jet.Number>
+public open class CustomVariance : java.lang.Object {
+    public constructor CustomVariance()
+    public open fun foo() : jet.MutableList<out jet.Number>
 }

compiler/testData/loadJava/kotlinSignature/MethodWithFunctionTypes.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.MethodWithFunctionTypes : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MethodWithFunctionTypes
-    public open fun foo(/*0*/ p0: jet.Function1<jet.String?, jet.String>): jet.ExtensionFunction0<jet.String, jet.String?>?
+public open class MethodWithFunctionTypes : java.lang.Object {
+    public constructor MethodWithFunctionTypes()
+    public open fun foo(/*0*/ p0 : (jet.String?) -> jet.String) : (jet.String.() -> jet.String?)?
 }

compiler/testData/loadJava/kotlinSignature/MethodWithGenerics.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.MethodWithGenerics : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MethodWithGenerics
-    public open fun foo(/*0*/ p0: jet.String, /*1*/ p1: jet.List<jet.Map.Entry<jet.String?, jet.String>?>): jet.String
+public open class MethodWithGenerics : java.lang.Object {
+    public constructor MethodWithGenerics()
+    public open fun foo(/*0*/ p0 : jet.String, /*1*/ p1 : jet.List<jet.Map.Entry<jet.String?, jet.String>?>) : jet.String
 }

compiler/testData/loadJava/kotlinSignature/MethodWithMappedClasses.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.MethodWithMappedClasses : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MethodWithMappedClasses
-    public open fun </*0*/ T : jet.Any?>copy(/*0*/ p0: jet.MutableList<in T>, /*1*/ p1: jet.List<out T>): jet.Tuple0
+public open class MethodWithMappedClasses : java.lang.Object {
+    public constructor MethodWithMappedClasses()
+    public open fun </*0*/ T> copy(/*0*/ p0 : jet.MutableList<in T>, /*1*/ p1 : jet.List<out T>) : Unit
 }

compiler/testData/loadJava/kotlinSignature/MethodWithTypeParameters.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.MethodWithTypeParameters : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MethodWithTypeParameters
-    public open fun </*0*/ A : jet.Any?, /*1*/ B : java.lang.Runnable & jet.List<java.lang.Cloneable>>foo(/*0*/ p0: A, /*1*/ p1: jet.List<out B>, /*2*/ p2: jet.MutableList<in jet.String?>): jet.Tuple0
+public open class MethodWithTypeParameters : java.lang.Object {
+    public constructor MethodWithTypeParameters()
+    public open fun </*0*/ A, /*1*/ B> foo(/*0*/ p0 : A, /*1*/ p1 : jet.List<out B>, /*2*/ p2 : jet.MutableList<in jet.String?>) : Unit where B : java.lang.Runnable, B : jet.List<java.lang.Cloneable>
 }

compiler/testData/loadJava/kotlinSignature/MethodWithVararg.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.MethodWithVararg : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MethodWithVararg
-    public open fun foo(/*0*/ vararg p0: jet.String /*jet.Array<jet.String>*/): jet.Tuple0
+public open class MethodWithVararg : java.lang.Object {
+    public constructor MethodWithVararg()
+    public open fun foo(/*0*/ vararg p0 : jet.String /*jet.Array<jet.String>*/) : Unit
 }

compiler/testData/loadJava/kotlinSignature/PropertyArrayTypes.txt

@@ -1,8 +1,8 @@
 namespace test
 
-public open class test.PropertyArrayTypes</*0*/ T : jet.Any?> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.PropertyArrayTypes<T>
-    public final var array: jet.Array<jet.String>
-    public final var arrayOfArrays: jet.Array<jet.Array<jet.String>>
-    public final var genericArray: jet.Array<T>
+public open class PropertyArrayTypes</*0*/ T> : java.lang.Object {
+    public constructor PropertyArrayTypes</*0*/ T>()
+    public final var array : jet.Array<jet.String>
+    public final var arrayOfArrays : jet.Array<jet.Array<jet.String>>
+    public final var genericArray : jet.Array<T>
 }

compiler/testData/loadJava/kotlinSignature/PropertyComplexTypes.txt

@@ -1,9 +1,9 @@
 namespace test
 
-public open class test.PropertyComplexTypes</*0*/ T : jet.Any?> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.PropertyComplexTypes<T>
-    public final var genericType: T
-    public final var listDefinedGeneric: java.util.ArrayList<jet.String>
-    public final var listGeneric: java.util.ArrayList<T>
-    public final var listOfGenericList: java.util.ArrayList<java.util.ArrayList<T>>
+public open class PropertyComplexTypes</*0*/ T> : java.lang.Object {
+    public constructor PropertyComplexTypes</*0*/ T>()
+    public final var genericType : T
+    public final var listDefinedGeneric : java.util.ArrayList<jet.String>
+    public final var listGeneric : java.util.ArrayList<T>
+    public final var listOfGenericList : java.util.ArrayList<java.util.ArrayList<T>>
 }

compiler/testData/loadJava/kotlinSignature/PropertySimpleType.txt

@@ -1,7 +1,7 @@
 namespace test
 
-public open class test.PropertySimpleType : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.PropertySimpleType
-    public final var fieldOne: jet.String
-    public final var fieldTwo: jet.String?
+public open class PropertySimpleType : java.lang.Object {
+    public constructor PropertySimpleType()
+    public final var fieldOne : jet.String
+    public final var fieldTwo : jet.String?
 }

compiler/testData/loadJava/kotlinSignature/StarProjection.txt

@@ -1,8 +1,9 @@
 namespace test
 
-public final class test.StarProjection : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.StarProjection
-    public final fun foo(): test.StarProjection.MyClass<out jet.CharSequence?>
-    public abstract trait test.StarProjection.MyClass</*0*/ T : jet.CharSequence?> : java.lang.Object {
+public final class StarProjection : java.lang.Object {
+    public constructor StarProjection()
+    public final fun foo() : test.StarProjection.MyClass<out jet.CharSequence?>
+    
+    public trait MyClass</*0*/ T : jet.CharSequence?> : java.lang.Object {
     }
 }

compiler/testData/loadJava/kotlinSignature/error/AddingNullability.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.AddingNullability : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.AddingNullability
-    public open fun foo(): jet.Int
+public open class AddingNullability : java.lang.Object {
+    public constructor AddingNullability()
+    public open fun foo() : jet.Int
 }

compiler/testData/loadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.ExplicitFieldGettersAndSetters : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.ExplicitFieldGettersAndSetters
-    public final var foo: jet.String?
+public open class ExplicitFieldGettersAndSetters : java.lang.Object {
+    public constructor ExplicitFieldGettersAndSetters()
+    public final var foo : jet.String?
 }

compiler/testData/loadJava/kotlinSignature/error/ExtraUpperBound.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.ExtraUpperBound : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.ExtraUpperBound
-    public open fun </*0*/ A : java.lang.Runnable?>foo(): jet.String?
+public open class ExtraUpperBound : java.lang.Object {
+    public constructor ExtraUpperBound()
+    public open fun </*0*/ A : java.lang.Runnable?> foo() : jet.String?
 }

compiler/testData/loadJava/kotlinSignature/error/MissingUpperBound.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.MissingUpperBound : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.MissingUpperBound
-    public open fun </*0*/ A : java.lang.Cloneable? & java.lang.Runnable?>foo(): jet.String?
+public open class MissingUpperBound : java.lang.Object {
+    public constructor MissingUpperBound()
+    public open fun </*0*/ A> foo() : jet.String? where A : java.lang.Cloneable?, A : java.lang.Runnable?
 }

compiler/testData/loadJava/kotlinSignature/error/NoFieldTypeRef.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.NoFieldTypeRef : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.NoFieldTypeRef
-    public final var foo: jet.String?
+public open class NoFieldTypeRef : java.lang.Object {
+    public constructor NoFieldTypeRef()
+    public final var foo : jet.String?
 }

compiler/testData/loadJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.NotVarargReplacedWithVararg : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.NotVarargReplacedWithVararg
-    public open fun foo(/*0*/ p0: jet.String?): jet.Tuple0
+public open class NotVarargReplacedWithVararg : java.lang.Object {
+    public constructor NotVarargReplacedWithVararg()
+    public open fun foo(/*0*/ p0 : jet.String?) : Unit
 }

compiler/testData/loadJava/kotlinSignature/error/ReturnTypeMissing.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.ReturnTypeMissing : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.ReturnTypeMissing
-    public open fun foo(/*0*/ p0: jet.String?): jet.Int
+public open class ReturnTypeMissing : java.lang.Object {
+    public constructor ReturnTypeMissing()
+    public open fun foo(/*0*/ p0 : jet.String?) : jet.Int
 }

compiler/testData/loadJava/kotlinSignature/error/SyntaxError.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.SyntaxError : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.SyntaxError
-    public open fun foo(): jet.Int?
+public open class SyntaxError : java.lang.Object {
+    public constructor SyntaxError()
+    public open fun foo() : jet.Int?
 }

compiler/testData/loadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.SyntaxErrorInFieldAnnotation : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.SyntaxErrorInFieldAnnotation
-    public final var foo: jet.String?
+public open class SyntaxErrorInFieldAnnotation : java.lang.Object {
+    public constructor SyntaxErrorInFieldAnnotation()
+    public final var foo : jet.String?
 }

compiler/testData/loadJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.VarargReplacedWithNotVararg : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.VarargReplacedWithNotVararg
-    public open fun foo(/*0*/ vararg p0: jet.String? /*jet.Array<jet.String?>*/): jet.Tuple0
+public open class VarargReplacedWithNotVararg : java.lang.Object {
+    public constructor VarargReplacedWithNotVararg()
+    public open fun foo(/*0*/ vararg p0 : jet.String? /*jet.Array<jet.String?>*/) : Unit
 }

compiler/testData/loadJava/kotlinSignature/error/WrongFieldInitializer.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongFieldInitializer : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongFieldInitializer
-    public final var foo: jet.String?
+public open class WrongFieldInitializer : java.lang.Object {
+    public constructor WrongFieldInitializer()
+    public final var foo : jet.String?
 }

compiler/testData/loadJava/kotlinSignature/error/WrongFieldMutability.txt

@@ -1,7 +1,7 @@
 namespace test
 
-public open class test.WrongFieldMutability : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongFieldMutability
-    public final val fooFinal: jet.String?
-    public final var fooNotFinal: jet.String?
+public open class WrongFieldMutability : java.lang.Object {
+    public constructor WrongFieldMutability()
+    public final val fooFinal : jet.String?
+    public final var fooNotFinal : jet.String?
 }

compiler/testData/loadJava/kotlinSignature/error/WrongFieldName.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongFieldName : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongFieldName
-    public final var foo: jet.String?
+public open class WrongFieldName : java.lang.Object {
+    public constructor WrongFieldName()
+    public final var foo : jet.String?
 }

compiler/testData/loadJava/kotlinSignature/error/WrongMethodName.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongMethodName : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongMethodName
-    public open fun foo(): jet.String?
+public open class WrongMethodName : java.lang.Object {
+    public constructor WrongMethodName()
+    public open fun foo() : jet.String?
 }

compiler/testData/loadJava/kotlinSignature/error/WrongReturnTypeStructure.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongReturnTypeStructure : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongReturnTypeStructure
-    public open fun foo(/*0*/ p0: jet.String?, /*1*/ p1: jet.List<jet.Map.Entry<jet.String, jet.String>>?): jet.String?
+public open class WrongReturnTypeStructure : java.lang.Object {
+    public constructor WrongReturnTypeStructure()
+    public open fun foo(/*0*/ p0 : jet.String?, /*1*/ p1 : jet.List<jet.Map.Entry<jet.String, jet.String>>?) : jet.String?
 }

compiler/testData/loadJava/kotlinSignature/error/WrongTypeName1.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongTypeName1 : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongTypeName1
-    public open fun foo(/*0*/ p0: jet.String?): jet.String?
+public open class WrongTypeName1 : java.lang.Object {
+    public constructor WrongTypeName1()
+    public open fun foo(/*0*/ p0 : jet.String?) : jet.String?
 }

compiler/testData/loadJava/kotlinSignature/error/WrongTypeName2.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongTypeName2 : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongTypeName2
-    public open fun foo(/*0*/ p0: jet.String?): jet.String?
+public open class WrongTypeName2 : java.lang.Object {
+    public constructor WrongTypeName2()
+    public open fun foo(/*0*/ p0 : jet.String?) : jet.String?
 }

compiler/testData/loadJava/kotlinSignature/error/WrongTypeName3.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongTypeName3 : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongTypeName3
-    public open fun foo(/*0*/ p0: jet.String?): jet.String?
+public open class WrongTypeName3 : java.lang.Object {
+    public constructor WrongTypeName3()
+    public open fun foo(/*0*/ p0 : jet.String?) : jet.String?
 }

compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongTypeParameterBoundStructure1 : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongTypeParameterBoundStructure1
-    public open fun </*0*/ A : jet.Any?, /*1*/ B : java.lang.Runnable? & jet.List<java.lang.Cloneable>?>foo(/*0*/ p0: A?, /*1*/ p1: jet.List<B>?): jet.Tuple0
+public open class WrongTypeParameterBoundStructure1 : java.lang.Object {
+    public constructor WrongTypeParameterBoundStructure1()
+    public open fun </*0*/ A, /*1*/ B> foo(/*0*/ p0 : A?, /*1*/ p1 : jet.List<B>?) : Unit where B : java.lang.Runnable?, B : jet.List<java.lang.Cloneable>?
 }

compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongTypeParameterBoundStructure2 : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongTypeParameterBoundStructure2
-    public open fun </*0*/ A : jet.Any?, /*1*/ B : java.lang.Runnable? & jet.List<java.lang.Cloneable>?>foo(/*0*/ p0: A?, /*1*/ p1: jet.List<B>?): jet.Tuple0
+public open class WrongTypeParameterBoundStructure2 : java.lang.Object {
+    public constructor WrongTypeParameterBoundStructure2()
+    public open fun </*0*/ A, /*1*/ B> foo(/*0*/ p0 : A?, /*1*/ p1 : jet.List<B>?) : Unit where B : java.lang.Runnable?, B : jet.List<java.lang.Cloneable>?
 }

compiler/testData/loadJava/kotlinSignature/error/WrongTypeParametersCount.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongTypeParametersCount : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongTypeParametersCount
-    public open fun </*0*/ A : jet.Any?, /*1*/ B : jet.Any?>foo(/*0*/ p0: A?, /*1*/ p1: jet.List<B>?): jet.Tuple0
+public open class WrongTypeParametersCount : java.lang.Object {
+    public constructor WrongTypeParametersCount()
+    public open fun </*0*/ A, /*1*/ B> foo(/*0*/ p0 : A?, /*1*/ p1 : jet.List<B>?) : Unit
 }

compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongTypeVariance : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongTypeVariance
-    public open fun copy(/*0*/ p0: jet.Array<out jet.Number>?, /*1*/ p1: jet.Array<out jet.Number>?): jet.MutableList<jet.Number>?
+public open class WrongTypeVariance : java.lang.Object {
+    public constructor WrongTypeVariance()
+    public open fun copy(/*0*/ p0 : jet.Array<out jet.Number>?, /*1*/ p1 : jet.Array<out jet.Number>?) : jet.MutableList<jet.Number>?
 }

compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure1.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongValueParameterStructure1 : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongValueParameterStructure1
-    public open fun foo(/*0*/ p0: jet.String?, /*1*/ p1: jet.List<jet.Map.Entry<jet.String, jet.String>>?): jet.String?
+public open class WrongValueParameterStructure1 : java.lang.Object {
+    public constructor WrongValueParameterStructure1()
+    public open fun foo(/*0*/ p0 : jet.String?, /*1*/ p1 : jet.List<jet.Map.Entry<jet.String, jet.String>>?) : jet.String?
 }

compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure2.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongValueParameterStructure2 : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongValueParameterStructure2
-    public open fun foo(/*0*/ p0: jet.String?, /*1*/ p1: jet.List<jet.Map.Entry<jet.String, jet.String>>?): jet.String?
+public open class WrongValueParameterStructure2 : java.lang.Object {
+    public constructor WrongValueParameterStructure2()
+    public open fun foo(/*0*/ p0 : jet.String?, /*1*/ p1 : jet.List<jet.Map.Entry<jet.String, jet.String>>?) : jet.String?
 }

compiler/testData/loadJava/kotlinSignature/error/WrongValueParametersCount.txt

@@ -1,6 +1,6 @@
 namespace test
 
-public open class test.WrongValueParametersCount : java.lang.Object {
-    public final /*constructor*/ fun <init>(): test.WrongValueParametersCount
-    public open fun foo(): jet.Int?
+public open class WrongValueParametersCount : java.lang.Object {
+    public constructor WrongValueParametersCount()
+    public open fun foo() : jet.Int?
 }

compiler/testData/loadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt

@@ -1,20 +1,22 @@
 namespace test
 
-public abstract trait test.PropagateTypeArgumentNullable : java.lang.Object {
-    public abstract trait test.PropagateTypeArgumentNullable.Sub : test.PropagateTypeArgumentNullable.Super {
-        public abstract override /*1*/ fun invOutR(): jet.MutableList<jet.List<jet.String?>>
-        public abstract override /*1*/ fun invOutS(/*0*/ p0: jet.MutableList<jet.List<jet.String?>>): jet.Tuple0
-        public abstract override /*1*/ fun invR(): jet.MutableList<jet.String?>
-        public abstract override /*1*/ fun outOutS(/*0*/ p0: jet.List<jet.List<jet.String?>>): jet.Tuple0
-        public abstract override /*1*/ fun outR(): jet.List<jet.String?>
-        public abstract override /*1*/ fun outS(/*0*/ p0: jet.List<jet.String?>): jet.Tuple0
+public trait PropagateTypeArgumentNullable : java.lang.Object {
+    
+    public trait Sub : test.PropagateTypeArgumentNullable.Super {
+        public abstract override /*1*/ fun invOutR() : jet.MutableList<jet.List<jet.String?>>
+        public abstract override /*1*/ fun invOutS(/*0*/ p0 : jet.MutableList<jet.List<jet.String?>>) : Unit
+        public abstract override /*1*/ fun invR() : jet.MutableList<jet.String?>
+        public abstract override /*1*/ fun outOutS(/*0*/ p0 : jet.List<jet.List<jet.String?>>) : Unit
+        public abstract override /*1*/ fun outR() : jet.List<jet.String?>
+        public abstract override /*1*/ fun outS(/*0*/ p0 : jet.List<jet.String?>) : Unit
     }
-    public abstract trait test.PropagateTypeArgumentNullable.Super : java.lang.Object {
-        public abstract fun invOutR(): jet.MutableList<jet.List<jet.String?>>
-        public abstract fun invOutS(/*0*/ p0: jet.MutableList<jet.List<jet.String?>>): jet.Tuple0
-        public abstract fun invR(): jet.MutableList<jet.String?>
-        public abstract fun outOutS(/*0*/ p0: jet.List<jet.List<jet.String?>>): jet.Tuple0
-        public abstract fun outR(): jet.List<jet.String?>
-        public abstract fun outS(/*0*/ p0: jet.List<jet.String?>): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun invOutR() : jet.MutableList<jet.List<jet.String?>>
+        public abstract fun invOutS(/*0*/ p0 : jet.MutableList<jet.List<jet.String?>>) : Unit
+        public abstract fun invR() : jet.MutableList<jet.String?>
+        public abstract fun outOutS(/*0*/ p0 : jet.List<jet.List<jet.String?>>) : Unit
+        public abstract fun outR() : jet.List<jet.String?>
+        public abstract fun outS(/*0*/ p0 : jet.List<jet.String?>) : Unit
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.ChangeProjectionKind1 : java.lang.Object {
-    public abstract trait test.ChangeProjectionKind1.Sub : test.ChangeProjectionKind1.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.MutableList<in jet.String>): jet.Tuple0
+public trait ChangeProjectionKind1 : java.lang.Object {
+    
+    public trait Sub : test.ChangeProjectionKind1.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.MutableList<in jet.String>) : Unit
     }
-    public abstract trait test.ChangeProjectionKind1.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.MutableList<in jet.String>): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.MutableList<in jet.String>) : Unit
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.ChangeProjectionKind2 : java.lang.Object {
-    public abstract trait test.ChangeProjectionKind2.Sub : test.ChangeProjectionKind2.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.MutableList<jet.String>): jet.Tuple0
+public trait ChangeProjectionKind2 : java.lang.Object {
+    
+    public trait Sub : test.ChangeProjectionKind2.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.MutableList<jet.String>) : Unit
     }
-    public abstract trait test.ChangeProjectionKind2.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.MutableList<jet.String>): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.MutableList<jet.String>) : Unit
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritMutability.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritMutability : java.lang.Object {
-    public abstract trait test.InheritMutability.Sub : test.InheritMutability.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.MutableList<jet.String>): jet.Tuple0
+public trait InheritMutability : java.lang.Object {
+    
+    public trait Sub : test.InheritMutability.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.MutableList<jet.String>) : Unit
     }
-    public abstract trait test.InheritMutability.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.MutableList<jet.String>): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.MutableList<jet.String>) : Unit
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVararg.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritNotVararg : java.lang.Object {
-    public abstract trait test.InheritNotVararg.Sub : test.InheritNotVararg.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.Array<out jet.String>?): jet.Tuple0
+public trait InheritNotVararg : java.lang.Object {
+    
+    public trait Sub : test.InheritNotVararg.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.Array<out jet.String>?) : Unit
     }
-    public abstract trait test.InheritNotVararg.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.Array<out jet.String>?): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.Array<out jet.String>?) : Unit
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritNotVarargInteger : java.lang.Object {
-    public abstract trait test.InheritNotVarargInteger.Sub : test.InheritNotVarargInteger.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.Array<out jet.Int>?): jet.Tuple0
+public trait InheritNotVarargInteger : java.lang.Object {
+    
+    public trait Sub : test.InheritNotVarargInteger.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.Array<out jet.Int>?) : Unit
     }
-    public abstract trait test.InheritNotVarargInteger.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.Array<out jet.Int>?): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.Array<out jet.Int>?) : Unit
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritNotVarargNotNull : java.lang.Object {
-    public abstract trait test.InheritNotVarargNotNull.Sub : test.InheritNotVarargNotNull.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.Array<out jet.String>): jet.Tuple0
+public trait InheritNotVarargNotNull : java.lang.Object {
+    
+    public trait Sub : test.InheritNotVarargNotNull.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.Array<out jet.String>) : Unit
     }
-    public abstract trait test.InheritNotVarargNotNull.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.Array<out jet.String>): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.Array<out jet.String>) : Unit
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritNotVarargPrimitive : java.lang.Object {
-    public abstract trait test.InheritNotVarargPrimitive.Sub : test.InheritNotVarargPrimitive.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.IntArray?): jet.Tuple0
+public trait InheritNotVarargPrimitive : java.lang.Object {
+    
+    public trait Sub : test.InheritNotVarargPrimitive.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.IntArray?) : Unit
     }
-    public abstract trait test.InheritNotVarargPrimitive.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.IntArray?): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.IntArray?) : Unit
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritNullability.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritNullability : java.lang.Object {
-    public abstract trait test.InheritNullability.Sub : test.InheritNullability.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.String): jet.Tuple0
+public trait InheritNullability : java.lang.Object {
+    
+    public trait Sub : test.InheritNullability.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.String) : Unit
     }
-    public abstract trait test.InheritNullability.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.String): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.String) : Unit
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritProjectionKind : java.lang.Object {
-    public abstract trait test.InheritProjectionKind.Sub : test.InheritProjectionKind.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.MutableList<in jet.String>): jet.Tuple0
+public trait InheritProjectionKind : java.lang.Object {
+    
+    public trait Sub : test.InheritProjectionKind.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.MutableList<in jet.String>) : Unit
     }
-    public abstract trait test.InheritProjectionKind.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.MutableList<in jet.String>): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.MutableList<in jet.String>) : Unit
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritReadOnliness : java.lang.Object {
-    public abstract trait test.InheritReadOnliness.Sub : test.InheritReadOnliness.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.List<jet.String>): jet.Tuple0
+public trait InheritReadOnliness : java.lang.Object {
+    
+    public trait Sub : test.InheritReadOnliness.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.List<jet.String>) : Unit
     }
-    public abstract trait test.InheritReadOnliness.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.List<jet.String>): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.List<jet.String>) : Unit
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVararg.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritVararg : java.lang.Object {
-    public abstract trait test.InheritVararg.Sub : test.InheritVararg.Super {
-        public abstract override /*1*/ fun foo(/*0*/ vararg p0: jet.String? /*jet.Array<jet.String?>*/): jet.Tuple0
+public trait InheritVararg : java.lang.Object {
+    
+    public trait Sub : test.InheritVararg.Super {
+        public abstract override /*1*/ fun foo(/*0*/ vararg p0 : jet.String? /*jet.Array<jet.String?>*/) : Unit
     }
-    public abstract trait test.InheritVararg.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ vararg p0: jet.String? /*jet.Array<jet.String?>*/): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ vararg p0 : jet.String? /*jet.Array<jet.String?>*/) : Unit
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritVarargInteger : java.lang.Object {
-    public abstract trait test.InheritVarargInteger.Sub : test.InheritVarargInteger.Super {
-        public abstract override /*1*/ fun foo(/*0*/ vararg p0: jet.Int? /*jet.Array<jet.Int?>*/): jet.Tuple0
+public trait InheritVarargInteger : java.lang.Object {
+    
+    public trait Sub : test.InheritVarargInteger.Super {
+        public abstract override /*1*/ fun foo(/*0*/ vararg p0 : jet.Int? /*jet.Array<jet.Int?>*/) : Unit
     }
-    public abstract trait test.InheritVarargInteger.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ vararg p0: jet.Int? /*jet.Array<jet.Int?>*/): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ vararg p0 : jet.Int? /*jet.Array<jet.Int?>*/) : Unit
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritVarargNotNull : java.lang.Object {
-    public abstract trait test.InheritVarargNotNull.Sub : test.InheritVarargNotNull.Super {
-        public abstract override /*1*/ fun foo(/*0*/ vararg p0: jet.String /*jet.Array<jet.String>*/): jet.Tuple0
+public trait InheritVarargNotNull : java.lang.Object {
+    
+    public trait Sub : test.InheritVarargNotNull.Super {
+        public abstract override /*1*/ fun foo(/*0*/ vararg p0 : jet.String /*jet.Array<jet.String>*/) : Unit
     }
-    public abstract trait test.InheritVarargNotNull.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ vararg p0: jet.String /*jet.Array<jet.String>*/): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ vararg p0 : jet.String /*jet.Array<jet.String>*/) : Unit
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritVarargPrimitive : java.lang.Object {
-    public abstract trait test.InheritVarargPrimitive.Sub : test.InheritVarargPrimitive.Super {
-        public abstract override /*1*/ fun foo(/*0*/ vararg p0: jet.Int /*jet.IntArray*/): jet.Tuple0
+public trait InheritVarargPrimitive : java.lang.Object {
+    
+    public trait Sub : test.InheritVarargPrimitive.Super {
+        public abstract override /*1*/ fun foo(/*0*/ vararg p0 : jet.Int /*jet.IntArray*/) : Unit
     }
-    public abstract trait test.InheritVarargPrimitive.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ vararg p0: jet.Int /*jet.IntArray*/): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ vararg p0 : jet.Int /*jet.IntArray*/) : Unit
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.MutableToReadOnly : java.lang.Object {
-    public abstract trait test.MutableToReadOnly.Sub : test.MutableToReadOnly.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.MutableList<jet.String>): jet.Tuple0
+public trait MutableToReadOnly : java.lang.Object {
+    
+    public trait Sub : test.MutableToReadOnly.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.MutableList<jet.String>) : Unit
     }
-    public abstract trait test.MutableToReadOnly.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.MutableList<jet.String>): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.MutableList<jet.String>) : Unit
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/parameter/NotNullToNullable.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.NotNullToNullable : java.lang.Object {
-    public abstract trait test.NotNullToNullable.Sub : test.NotNullToNullable.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.String): jet.Tuple0
+public trait NotNullToNullable : java.lang.Object {
+    
+    public trait Sub : test.NotNullToNullable.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.String) : Unit
     }
-    public abstract trait test.NotNullToNullable.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.String): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.String) : Unit
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.NullableToNotNull : java.lang.Object {
-    public abstract trait test.NullableToNotNull.Sub : test.NullableToNotNull.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.String?): jet.Tuple0
+public trait NullableToNotNull : java.lang.Object {
+    
+    public trait Sub : test.NullableToNotNull.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.String?) : Unit
     }
-    public abstract trait test.NullableToNotNull.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.String?): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.String?) : Unit
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.NullableToNotNullKotlinSignature : java.lang.Object {
-    public abstract trait test.NullableToNotNullKotlinSignature.Sub : test.NullableToNotNullKotlinSignature.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.String?): jet.Tuple0
+public trait NullableToNotNullKotlinSignature : java.lang.Object {
+    
+    public trait Sub : test.NullableToNotNullKotlinSignature.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.String?) : Unit
     }
-    public abstract trait test.NullableToNotNullKotlinSignature.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.String?): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.String?) : Unit
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.ReadOnlyToMutable : java.lang.Object {
-    public abstract trait test.ReadOnlyToMutable.Sub : test.ReadOnlyToMutable.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0: jet.List<jet.String>): jet.Tuple0
+public trait ReadOnlyToMutable : java.lang.Object {
+    
+    public trait Sub : test.ReadOnlyToMutable.Super {
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.List<jet.String>) : Unit
     }
-    public abstract trait test.ReadOnlyToMutable.Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0: jet.List<jet.String>): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.List<jet.String>) : Unit
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.AddNotNullJavaSubtype : java.lang.Object {
-    public abstract trait test.AddNotNullJavaSubtype.Sub : test.AddNotNullJavaSubtype.Super {
-        public abstract override /*1*/ fun foo(): jet.String
+public trait AddNotNullJavaSubtype : java.lang.Object {
+    
+    public trait Sub : test.AddNotNullJavaSubtype.Super {
+        public abstract override /*1*/ fun foo() : jet.String
     }
-    public abstract trait test.AddNotNullJavaSubtype.Super : java.lang.Object {
-        public abstract fun foo(): jet.CharSequence?
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.CharSequence?
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.AddNotNullSameJavaType : java.lang.Object {
-    public abstract trait test.AddNotNullSameJavaType.Sub : test.AddNotNullSameJavaType.Super {
-        public abstract override /*1*/ fun foo(): jet.CharSequence
+public trait AddNotNullSameJavaType : java.lang.Object {
+    
+    public trait Sub : test.AddNotNullSameJavaType.Super {
+        public abstract override /*1*/ fun foo() : jet.CharSequence
     }
-    public abstract trait test.AddNotNullSameJavaType.Super : java.lang.Object {
-        public abstract fun foo(): jet.CharSequence?
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.CharSequence?
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.AddNullabilityJavaSubtype : java.lang.Object {
-    public abstract trait test.AddNullabilityJavaSubtype.Sub : test.AddNullabilityJavaSubtype.Super {
-        public abstract override /*1*/ fun foo(): jet.String
+public trait AddNullabilityJavaSubtype : java.lang.Object {
+    
+    public trait Sub : test.AddNullabilityJavaSubtype.Super {
+        public abstract override /*1*/ fun foo() : jet.String
     }
-    public abstract trait test.AddNullabilityJavaSubtype.Super : java.lang.Object {
-        public abstract fun foo(): jet.CharSequence
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.CharSequence
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.AddNullabilitySameGenericType1 : java.lang.Object {
-    public abstract trait test.AddNullabilitySameGenericType1.Sub : test.AddNullabilitySameGenericType1.Super {
-        public abstract override /*1*/ fun foo(): jet.MutableList<jet.String>
+public trait AddNullabilitySameGenericType1 : java.lang.Object {
+    
+    public trait Sub : test.AddNullabilitySameGenericType1.Super {
+        public abstract override /*1*/ fun foo() : jet.MutableList<jet.String>
     }
-    public abstract trait test.AddNullabilitySameGenericType1.Super : java.lang.Object {
-        public abstract fun foo(): jet.MutableList<jet.String>
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.MutableList<jet.String>
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.AddNullabilitySameGenericType2 : java.lang.Object {
-    public abstract trait test.AddNullabilitySameGenericType2.Sub : test.AddNullabilitySameGenericType2.Super {
-        public abstract override /*1*/ fun foo(): jet.MutableList<jet.String>
+public trait AddNullabilitySameGenericType2 : java.lang.Object {
+    
+    public trait Sub : test.AddNullabilitySameGenericType2.Super {
+        public abstract override /*1*/ fun foo() : jet.MutableList<jet.String>
     }
-    public abstract trait test.AddNullabilitySameGenericType2.Super : java.lang.Object {
-        public abstract fun foo(): jet.MutableList<jet.String>
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.MutableList<jet.String>
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.AddNullabilitySameJavaType : java.lang.Object {
-    public abstract trait test.AddNullabilitySameJavaType.Sub : test.AddNullabilitySameJavaType.Super {
-        public abstract override /*1*/ fun foo(): jet.CharSequence
+public trait AddNullabilitySameJavaType : java.lang.Object {
+    
+    public trait Sub : test.AddNullabilitySameJavaType.Super {
+        public abstract override /*1*/ fun foo() : jet.CharSequence
     }
-    public abstract trait test.AddNullabilitySameJavaType.Super : java.lang.Object {
-        public abstract fun foo(): jet.CharSequence
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.CharSequence
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.CantMakeImmutableInSubclass : java.lang.Object {
-    public abstract trait test.CantMakeImmutableInSubclass.Sub : test.CantMakeImmutableInSubclass.Super {
-        public abstract override /*1*/ fun foo(): jet.MutableList<jet.String>
+public trait CantMakeImmutableInSubclass : java.lang.Object {
+    
+    public trait Sub : test.CantMakeImmutableInSubclass.Super {
+        public abstract override /*1*/ fun foo() : jet.MutableList<jet.String>
     }
-    public abstract trait test.CantMakeImmutableInSubclass.Super : java.lang.Object {
-        public abstract fun foo(): jet.MutableCollection<jet.String>
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.MutableCollection<jet.String>
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt

@@ -1,35 +1,38 @@
 namespace test
 
-public abstract trait test.HalfSubstitutedTypeParameters : java.lang.Object {
-    public abstract trait test.HalfSubstitutedTypeParameters.Sub : test.HalfSubstitutedTypeParameters.Super {
-        public abstract override /*1*/ fun foo(): test.HalfSubstitutedTypeParameters.TrickyList<jet.Int, jet.String?>
+public trait HalfSubstitutedTypeParameters : java.lang.Object {
+    
+    public trait Sub : test.HalfSubstitutedTypeParameters.Super {
+        public abstract override /*1*/ fun foo() : test.HalfSubstitutedTypeParameters.TrickyList<jet.Int, jet.String?>
     }
-    public abstract trait test.HalfSubstitutedTypeParameters.Super : java.lang.Object {
-        public abstract fun foo(): jet.MutableList<jet.String?>
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.MutableList<jet.String?>
     }
-    public abstract trait test.HalfSubstitutedTypeParameters.TrickyList</*0*/ X : jet.Any?, /*1*/ E : jet.Any?> : jet.MutableList<E> {
-        public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: E): jet.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ index: jet.Int, /*1*/ element: E): jet.Tuple0
-        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: jet.Collection<E>): jet.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: jet.Int, /*1*/ c: jet.Collection<E>): jet.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun clear(): jet.Tuple0
-        public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: jet.Any?): jet.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: jet.Collection<jet.Any?>): jet.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: jet.Int): E
-        public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: jet.Any?): jet.Int
-        public abstract override /*1*/ /*fake_override*/ fun isEmpty(): jet.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun iterator(): jet.Iterator<E>
-        public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: jet.Any?): jet.Int
-        public abstract override /*1*/ /*fake_override*/ fun listIterator(): jet.MutableListIterator<E>
-        public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: jet.Int): jet.MutableListIterator<E>
-        public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ index: jet.Int): E
-        public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: jet.Any?): jet.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: jet.Collection<jet.Any?>): jet.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: jet.Collection<jet.Any?>): jet.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun set(/*0*/ index: jet.Int, /*1*/ element: E): E
-        public abstract override /*1*/ /*fake_override*/ fun size(): jet.Int
-        public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: jet.Int, /*1*/ toIndex: jet.Int): jet.MutableList<E>
-        public abstract override /*1*/ /*fake_override*/ fun toArray(): jet.Array<jet.Any?>
-        public abstract override /*1*/ /*fake_override*/ fun </*0*/ T : jet.Any?>toArray(/*0*/ a: jet.Array<out T>): jet.Array<T>
+    
+    public trait TrickyList</*0*/ X, /*1*/ E> : jet.MutableList<E> {
+        public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e : E) : jet.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ index : jet.Int, /*1*/ element : E) : Unit
+        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c : jet.Collection<E>) : jet.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ index : jet.Int, /*1*/ c : jet.Collection<E>) : jet.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun clear() : Unit
+        public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o : jet.Any?) : jet.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index : jet.Int) : E
+        public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o : jet.Any?) : jet.Int
+        public abstract override /*1*/ /*fake_override*/ fun isEmpty() : jet.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun iterator() : jet.Iterator<E>
+        public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o : jet.Any?) : jet.Int
+        public abstract override /*1*/ /*fake_override*/ fun listIterator() : jet.MutableListIterator<E>
+        public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index : jet.Int) : jet.MutableListIterator<E>
+        public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o : jet.Any?) : jet.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ index : jet.Int) : E
+        public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun set(/*0*/ index : jet.Int, /*1*/ element : E) : E
+        public abstract override /*1*/ /*fake_override*/ fun size() : jet.Int
+        public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex : jet.Int, /*1*/ toIndex : jet.Int) : jet.MutableList<E>
+        public abstract override /*1*/ /*fake_override*/ fun toArray() : jet.Array<jet.Any?>
+        public abstract override /*1*/ /*fake_override*/ fun </*0*/ T> toArray(/*0*/ a : jet.Array<out T>) : jet.Array<T>
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritNullabilityGenericSubclassSimple : java.lang.Object {
-    public abstract trait test.InheritNullabilityGenericSubclassSimple.Sub : test.InheritNullabilityGenericSubclassSimple.Super {
-        public abstract override /*1*/ fun foo(): jet.MutableList<jet.String>
+public trait InheritNullabilityGenericSubclassSimple : java.lang.Object {
+    
+    public trait Sub : test.InheritNullabilityGenericSubclassSimple.Super {
+        public abstract override /*1*/ fun foo() : jet.MutableList<jet.String>
     }
-    public abstract trait test.InheritNullabilityGenericSubclassSimple.Super : java.lang.Object {
-        public abstract fun foo(): jet.MutableCollection<jet.String>
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.MutableCollection<jet.String>
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritNullabilityJavaSubtype : java.lang.Object {
-    public abstract trait test.InheritNullabilityJavaSubtype.Sub : test.InheritNullabilityJavaSubtype.Super {
-        public abstract override /*1*/ fun foo(): jet.String
+public trait InheritNullabilityJavaSubtype : java.lang.Object {
+    
+    public trait Sub : test.InheritNullabilityJavaSubtype.Super {
+        public abstract override /*1*/ fun foo() : jet.String
     }
-    public abstract trait test.InheritNullabilityJavaSubtype.Super : java.lang.Object {
-        public abstract fun foo(): jet.CharSequence
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.CharSequence
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritNullabilitySameGenericType : java.lang.Object {
-    public abstract trait test.InheritNullabilitySameGenericType.Sub : test.InheritNullabilitySameGenericType.Super {
-        public abstract override /*1*/ fun foo(): jet.MutableList<jet.String>
+public trait InheritNullabilitySameGenericType : java.lang.Object {
+    
+    public trait Sub : test.InheritNullabilitySameGenericType.Super {
+        public abstract override /*1*/ fun foo() : jet.MutableList<jet.String>
     }
-    public abstract trait test.InheritNullabilitySameGenericType.Super : java.lang.Object {
-        public abstract fun foo(): jet.MutableList<jet.String>
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.MutableList<jet.String>
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritNullabilitySameJavaType : java.lang.Object {
-    public abstract trait test.InheritNullabilitySameJavaType.Sub : test.InheritNullabilitySameJavaType.Super {
-        public abstract override /*1*/ fun foo(): jet.CharSequence
+public trait InheritNullabilitySameJavaType : java.lang.Object {
+    
+    public trait Sub : test.InheritNullabilitySameJavaType.Super {
+        public abstract override /*1*/ fun foo() : jet.CharSequence
     }
-    public abstract trait test.InheritNullabilitySameJavaType.Super : java.lang.Object {
-        public abstract fun foo(): jet.CharSequence
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.CharSequence
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritReadOnlinessOfArgument : java.lang.Object {
-    public abstract trait test.InheritReadOnlinessOfArgument.Sub : test.InheritReadOnlinessOfArgument.Super {
-        public abstract override /*1*/ fun foo(): jet.List<jet.List<jet.String>>
+public trait InheritReadOnlinessOfArgument : java.lang.Object {
+    
+    public trait Sub : test.InheritReadOnlinessOfArgument.Super {
+        public abstract override /*1*/ fun foo() : jet.List<jet.List<jet.String>>
     }
-    public abstract trait test.InheritReadOnlinessOfArgument.Super : java.lang.Object {
-        public abstract fun foo(): jet.List<jet.List<jet.String>>
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.List<jet.List<jet.String>>
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritReadOnlinessSameClass : java.lang.Object {
-    public abstract trait test.InheritReadOnlinessSameClass.Sub : test.InheritReadOnlinessSameClass.Super {
-        public abstract override /*1*/ fun foo(): jet.List<jet.String>
+public trait InheritReadOnlinessSameClass : java.lang.Object {
+    
+    public trait Sub : test.InheritReadOnlinessSameClass.Super {
+        public abstract override /*1*/ fun foo() : jet.List<jet.String>
     }
-    public abstract trait test.InheritReadOnlinessSameClass.Super : java.lang.Object {
-        public abstract fun foo(): jet.List<jet.String>
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.List<jet.String>
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritReadOnlinessSubclass : java.lang.Object {
-    public abstract trait test.InheritReadOnlinessSubclass.Sub : test.InheritReadOnlinessSubclass.Super {
-        public abstract override /*1*/ fun foo(): jet.List<jet.String>
+public trait InheritReadOnlinessSubclass : java.lang.Object {
+    
+    public trait Sub : test.InheritReadOnlinessSubclass.Super {
+        public abstract override /*1*/ fun foo() : jet.List<jet.String>
     }
-    public abstract trait test.InheritReadOnlinessSubclass.Super : java.lang.Object {
-        public abstract fun foo(): jet.Collection<jet.String>
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.Collection<jet.String>
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/InheritVariance.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritVariance : java.lang.Object {
-    public abstract trait test.InheritVariance.Sub : test.InheritVariance.Super {
-        public abstract override /*1*/ fun foo(): jet.MutableList<out jet.Number>
+public trait InheritVariance : java.lang.Object {
+    
+    public trait Sub : test.InheritVariance.Super {
+        public abstract override /*1*/ fun foo() : jet.MutableList<out jet.Number>
     }
-    public abstract trait test.InheritVariance.Super : java.lang.Object {
-        public abstract fun foo(): jet.MutableCollection<out jet.Number>
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.MutableCollection<out jet.Number>
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/SameProjectionKind.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.SameProjectionKind : java.lang.Object {
-    public abstract trait test.SameProjectionKind.Sub : test.SameProjectionKind.Super {
-        public abstract override /*1*/ fun foo(): jet.MutableCollection<out jet.Number?>?
+public trait SameProjectionKind : java.lang.Object {
+    
+    public trait Sub : test.SameProjectionKind.Super {
+        public abstract override /*1*/ fun foo() : jet.MutableCollection<out jet.Number?>?
     }
-    public abstract trait test.SameProjectionKind.Super : java.lang.Object {
-        public abstract fun foo(): jet.MutableCollection<out jet.Number?>?
+    
+    public trait Super : java.lang.Object {
+        public abstract fun foo() : jet.MutableCollection<out jet.Number?>?
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfCollection.txt

@@ -1,17 +1,17 @@
 namespace test
 
-public abstract trait test.SubclassOfCollection</*0*/ E : jet.Any?> : jet.MutableCollection<E> {
-    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: E): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: jet.Collection<E>): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun clear(): jet.Tuple0
-    public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: jet.Any?): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: jet.Collection<jet.Any?>): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun isEmpty(): jet.Boolean
-    public abstract override /*1*/ fun iterator(): jet.MutableIterator<E>
-    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: jet.Any?): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: jet.Collection<jet.Any?>): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: jet.Collection<jet.Any?>): jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun size(): jet.Int
-    public abstract override /*1*/ /*fake_override*/ fun toArray(): jet.Array<jet.Any?>
-    public abstract override /*1*/ /*fake_override*/ fun </*0*/ T : jet.Any?>toArray(/*0*/ a: jet.Array<out T>): jet.Array<T>
+public trait SubclassOfCollection</*0*/ E> : jet.MutableCollection<E> {
+    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e : E) : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c : jet.Collection<E>) : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun clear() : Unit
+    public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o : jet.Any?) : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun isEmpty() : jet.Boolean
+    public abstract override /*1*/ fun iterator() : jet.MutableIterator<E>
+    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o : jet.Any?) : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun size() : jet.Int
+    public abstract override /*1*/ /*fake_override*/ fun toArray() : jet.Array<jet.Any?>
+    public abstract override /*1*/ /*fake_override*/ fun </*0*/ T> toArray(/*0*/ a : jet.Array<out T>) : jet.Array<T>
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt

@@ -1,7 +1,7 @@
 namespace test
 
-public abstract trait test.SubclassOfMapEntry</*0*/ K : jet.Any?, /*1*/ V : jet.Any?> : jet.MutableMap.MutableEntry<K, V> {
-    public abstract override /*1*/ /*fake_override*/ fun getKey(): K
-    public abstract override /*1*/ /*fake_override*/ fun getValue(): V
-    public abstract override /*1*/ fun setValue(/*0*/ p0: V): V
+public trait SubclassOfMapEntry</*0*/ K, /*1*/ V> : jet.MutableMap.MutableEntry<K, V> {
+    public abstract override /*1*/ /*fake_override*/ fun getKey() : K
+    public abstract override /*1*/ /*fake_override*/ fun getValue() : V
+    public abstract override /*1*/ fun setValue(/*0*/ p0 : V) : V
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt

@@ -1,13 +1,16 @@
 namespace test
 
-public abstract trait test.TwoSuperclassesConflictingProjectionKinds : java.lang.Object {
-    public abstract trait test.TwoSuperclassesConflictingProjectionKinds.Sub : test.TwoSuperclassesConflictingProjectionKinds.Super1, test.TwoSuperclassesConflictingProjectionKinds.Super2 {
-        public abstract override /*2*/ fun foo(): jet.MutableCollection<jet.CharSequence>
+public trait TwoSuperclassesConflictingProjectionKinds : java.lang.Object {
+    
+    public trait Sub : test.TwoSuperclassesConflictingProjectionKinds.Super1, test.TwoSuperclassesConflictingProjectionKinds.Super2 {
+        public abstract override /*2*/ fun foo() : jet.MutableCollection<jet.CharSequence>
     }
-    public abstract trait test.TwoSuperclassesConflictingProjectionKinds.Super1 : java.lang.Object {
-        public abstract fun foo(): jet.MutableCollection<jet.CharSequence>
+    
+    public trait Super1 : java.lang.Object {
+        public abstract fun foo() : jet.MutableCollection<jet.CharSequence>
     }
-    public abstract trait test.TwoSuperclassesConflictingProjectionKinds.Super2 : java.lang.Object {
-        public abstract fun foo(): jet.MutableCollection<out jet.CharSequence>
+    
+    public trait Super2 : java.lang.Object {
+        public abstract fun foo() : jet.MutableCollection<out jet.CharSequence>
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt

@@ -1,13 +1,16 @@
 namespace test
 
-public abstract trait test.TwoSuperclassesInvariantAndCovariantInferMutability : java.lang.Object {
-    public abstract trait test.TwoSuperclassesInvariantAndCovariantInferMutability.Sub : test.TwoSuperclassesInvariantAndCovariantInferMutability.Super1, test.TwoSuperclassesInvariantAndCovariantInferMutability.Super2 {
-        public abstract override /*2*/ fun foo(): jet.MutableList<jet.MutableList<jet.String>>
+public trait TwoSuperclassesInvariantAndCovariantInferMutability : java.lang.Object {
+    
+    public trait Sub : test.TwoSuperclassesInvariantAndCovariantInferMutability.Super1, test.TwoSuperclassesInvariantAndCovariantInferMutability.Super2 {
+        public abstract override /*2*/ fun foo() : jet.MutableList<jet.MutableList<jet.String>>
     }
-    public abstract trait test.TwoSuperclassesInvariantAndCovariantInferMutability.Super1 : java.lang.Object {
-        public abstract fun foo(): jet.List<jet.List<jet.String>>
+    
+    public trait Super1 : java.lang.Object {
+        public abstract fun foo() : jet.List<jet.List<jet.String>>
     }
-    public abstract trait test.TwoSuperclassesInvariantAndCovariantInferMutability.Super2 : java.lang.Object {
-        public abstract fun foo(): jet.MutableList<jet.MutableList<jet.String>>
+    
+    public trait Super2 : java.lang.Object {
+        public abstract fun foo() : jet.MutableList<jet.MutableList<jet.String>>
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt

@@ -1,13 +1,16 @@
 namespace test
 
-public abstract trait test.TwoSuperclassesInvariantAndCovariantInferNullability : java.lang.Object {
-    public abstract trait test.TwoSuperclassesInvariantAndCovariantInferNullability.Sub : test.TwoSuperclassesInvariantAndCovariantInferNullability.Super1, test.TwoSuperclassesInvariantAndCovariantInferNullability.Super2 {
-        public abstract override /*2*/ fun foo(): jet.MutableList<jet.String>
+public trait TwoSuperclassesInvariantAndCovariantInferNullability : java.lang.Object {
+    
+    public trait Sub : test.TwoSuperclassesInvariantAndCovariantInferNullability.Super1, test.TwoSuperclassesInvariantAndCovariantInferNullability.Super2 {
+        public abstract override /*2*/ fun foo() : jet.MutableList<jet.String>
     }
-    public abstract trait test.TwoSuperclassesInvariantAndCovariantInferNullability.Super1 : java.lang.Object {
-        public abstract fun foo(): jet.List<jet.String?>
+    
+    public trait Super1 : java.lang.Object {
+        public abstract fun foo() : jet.List<jet.String?>
     }
-    public abstract trait test.TwoSuperclassesInvariantAndCovariantInferNullability.Super2 : java.lang.Object {
-        public abstract fun foo(): jet.MutableList<jet.String>
+    
+    public trait Super2 : java.lang.Object {
+        public abstract fun foo() : jet.MutableList<jet.String>
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt

@@ -1,13 +1,16 @@
 namespace test
 
-public abstract trait test.TwoSuperclassesMutableAndNot : java.lang.Object {
-    public abstract trait test.TwoSuperclassesMutableAndNot.Sub : test.TwoSuperclassesMutableAndNot.Super1, test.TwoSuperclassesMutableAndNot.Super2 {
-        public abstract override /*2*/ fun foo(): jet.MutableList<jet.String>
+public trait TwoSuperclassesMutableAndNot : java.lang.Object {
+    
+    public trait Sub : test.TwoSuperclassesMutableAndNot.Super1, test.TwoSuperclassesMutableAndNot.Super2 {
+        public abstract override /*2*/ fun foo() : jet.MutableList<jet.String>
     }
-    public abstract trait test.TwoSuperclassesMutableAndNot.Super1 : java.lang.Object {
-        public abstract fun foo(): jet.MutableCollection<jet.String>
+    
+    public trait Super1 : java.lang.Object {
+        public abstract fun foo() : jet.MutableCollection<jet.String>
     }
-    public abstract trait test.TwoSuperclassesMutableAndNot.Super2 : java.lang.Object {
-        public abstract fun foo(): jet.List<jet.String>
+    
+    public trait Super2 : java.lang.Object {
+        public abstract fun foo() : jet.List<jet.String>
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt

@@ -1,13 +1,16 @@
 namespace test
 
-public abstract trait test.TwoSuperclassesReturnJavaSubtype : java.lang.Object {
-    public abstract trait test.TwoSuperclassesReturnJavaSubtype.Sub : test.TwoSuperclassesReturnJavaSubtype.Super1, test.TwoSuperclassesReturnJavaSubtype.Super2 {
-        public abstract override /*2*/ fun foo(): jet.String
+public trait TwoSuperclassesReturnJavaSubtype : java.lang.Object {
+    
+    public trait Sub : test.TwoSuperclassesReturnJavaSubtype.Super1, test.TwoSuperclassesReturnJavaSubtype.Super2 {
+        public abstract override /*2*/ fun foo() : jet.String
     }
-    public abstract trait test.TwoSuperclassesReturnJavaSubtype.Super1 : java.lang.Object {
-        public abstract fun foo(): jet.CharSequence?
+    
+    public trait Super1 : java.lang.Object {
+        public abstract fun foo() : jet.CharSequence?
     }
-    public abstract trait test.TwoSuperclassesReturnJavaSubtype.Super2 : java.lang.Object {
-        public abstract fun foo(): jet.CharSequence
+    
+    public trait Super2 : java.lang.Object {
+        public abstract fun foo() : jet.CharSequence
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt

@@ -1,13 +1,16 @@
 namespace test
 
-public abstract trait test.TwoSuperclassesReturnSameJavaType : java.lang.Object {
-    public abstract trait test.TwoSuperclassesReturnSameJavaType.Sub : test.TwoSuperclassesReturnSameJavaType.Super1, test.TwoSuperclassesReturnSameJavaType.Super2 {
-        public abstract override /*2*/ fun foo(): jet.CharSequence
+public trait TwoSuperclassesReturnSameJavaType : java.lang.Object {
+    
+    public trait Sub : test.TwoSuperclassesReturnSameJavaType.Super1, test.TwoSuperclassesReturnSameJavaType.Super2 {
+        public abstract override /*2*/ fun foo() : jet.CharSequence
     }
-    public abstract trait test.TwoSuperclassesReturnSameJavaType.Super1 : java.lang.Object {
-        public abstract fun foo(): jet.CharSequence?
+    
+    public trait Super1 : java.lang.Object {
+        public abstract fun foo() : jet.CharSequence?
     }
-    public abstract trait test.TwoSuperclassesReturnSameJavaType.Super2 : java.lang.Object {
-        public abstract fun foo(): jet.CharSequence
+    
+    public trait Super2 : java.lang.Object {
+        public abstract fun foo() : jet.CharSequence
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt

@@ -1,13 +1,16 @@
 namespace test
 
-public abstract trait test.TwoSuperclassesSupplementNotNull : java.lang.Object {
-    public abstract trait test.TwoSuperclassesSupplementNotNull.Sub : test.TwoSuperclassesSupplementNotNull.Super1, test.TwoSuperclassesSupplementNotNull.Super2 {
-        public abstract override /*2*/ fun foo(): jet.List<jet.String>
+public trait TwoSuperclassesSupplementNotNull : java.lang.Object {
+    
+    public trait Sub : test.TwoSuperclassesSupplementNotNull.Super1, test.TwoSuperclassesSupplementNotNull.Super2 {
+        public abstract override /*2*/ fun foo() : jet.List<jet.String>
     }
-    public abstract trait test.TwoSuperclassesSupplementNotNull.Super1 : java.lang.Object {
-        public abstract fun foo(): jet.List<jet.String?>
+    
+    public trait Super1 : java.lang.Object {
+        public abstract fun foo() : jet.List<jet.String?>
     }
-    public abstract trait test.TwoSuperclassesSupplementNotNull.Super2 : java.lang.Object {
-        public abstract fun foo(): jet.List<jet.String>?
+    
+    public trait Super2 : java.lang.Object {
+        public abstract fun foo() : jet.List<jet.String>?
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/TypeParamOfClass.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.TypeParamOfClass : java.lang.Object {
-    public abstract trait test.TypeParamOfClass.Sub</*0*/ T : jet.Any?> : test.TypeParamOfClass.Super<T> {
-        public abstract override /*1*/ fun foo(): T
+public trait TypeParamOfClass : java.lang.Object {
+    
+    public trait Sub</*0*/ T> : test.TypeParamOfClass.Super<T> {
+        public abstract override /*1*/ fun foo() : T
     }
-    public abstract trait test.TypeParamOfClass.Super</*0*/ T : jet.Any?> : java.lang.Object {
-        public abstract fun foo(): T
+    
+    public trait Super</*0*/ T> : java.lang.Object {
+        public abstract fun foo() : T
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.TypeParamOfClassSubstituted : java.lang.Object {
-    public abstract trait test.TypeParamOfClassSubstituted.Sub : test.TypeParamOfClassSubstituted.Super<jet.String> {
-        public abstract override /*1*/ fun foo(): jet.String
+public trait TypeParamOfClassSubstituted : java.lang.Object {
+    
+    public trait Sub : test.TypeParamOfClassSubstituted.Super<jet.String> {
+        public abstract override /*1*/ fun foo() : jet.String
     }
-    public abstract trait test.TypeParamOfClassSubstituted.Super</*0*/ T : jet.Any?> : java.lang.Object {
-        public abstract fun foo(): T
+    
+    public trait Super</*0*/ T> : java.lang.Object {
+        public abstract fun foo() : T
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/return/TypeParamOfFun.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.TypeParamOfFun : java.lang.Object {
-    public abstract trait test.TypeParamOfFun.Sub : test.TypeParamOfFun.Super {
-        public abstract override /*1*/ fun </*0*/ E : jet.Any?>foo(): E
+public trait TypeParamOfFun : java.lang.Object {
+    
+    public trait Sub : test.TypeParamOfFun.Super {
+        public abstract override /*1*/ fun </*0*/ E> foo() : E
     }
-    public abstract trait test.TypeParamOfFun.Super : java.lang.Object {
-        public abstract fun </*0*/ T : jet.Any?>foo(): T
+    
+    public trait Super : java.lang.Object {
+        public abstract fun </*0*/ T> foo() : T
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritMutability : java.lang.Object {
-    public abstract trait test.InheritMutability.Sub : test.InheritMutability.Super {
-        public abstract override /*1*/ fun </*0*/ B : jet.MutableList<jet.String>>foo(/*0*/ p0: B): jet.Tuple0
+public trait InheritMutability : java.lang.Object {
+    
+    public trait Sub : test.InheritMutability.Super {
+        public abstract override /*1*/ fun </*0*/ B : jet.MutableList<jet.String>> foo(/*0*/ p0 : B) : Unit
     }
-    public abstract trait test.InheritMutability.Super : java.lang.Object {
-        public abstract fun </*0*/ A : jet.MutableList<jet.String>>foo(/*0*/ p0: A): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun </*0*/ A : jet.MutableList<jet.String>> foo(/*0*/ p0 : A) : Unit
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/InheritNullability.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritNullability : java.lang.Object {
-    public abstract trait test.InheritNullability.Sub : test.InheritNullability.Super {
-        public abstract override /*1*/ fun </*0*/ B : jet.CharSequence>foo(/*0*/ p0: B): jet.Tuple0
+public trait InheritNullability : java.lang.Object {
+    
+    public trait Sub : test.InheritNullability.Super {
+        public abstract override /*1*/ fun </*0*/ B : jet.CharSequence> foo(/*0*/ p0 : B) : Unit
     }
-    public abstract trait test.InheritNullability.Super : java.lang.Object {
-        public abstract fun </*0*/ A : jet.CharSequence>foo(/*0*/ p0: A): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun </*0*/ A : jet.CharSequence> foo(/*0*/ p0 : A) : Unit
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.InheritReadOnliness : java.lang.Object {
-    public abstract trait test.InheritReadOnliness.Sub : test.InheritReadOnliness.Super {
-        public abstract override /*1*/ fun </*0*/ B : jet.List<jet.String>>foo(/*0*/ p0: B): jet.Tuple0
+public trait InheritReadOnliness : java.lang.Object {
+    
+    public trait Sub : test.InheritReadOnliness.Super {
+        public abstract override /*1*/ fun </*0*/ B : jet.List<jet.String>> foo(/*0*/ p0 : B) : Unit
     }
-    public abstract trait test.InheritReadOnliness.Super : java.lang.Object {
-        public abstract fun </*0*/ A : jet.List<jet.String>>foo(/*0*/ p0: A): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun </*0*/ A : jet.List<jet.String>> foo(/*0*/ p0 : A) : Unit
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/TwoBounds.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.TwoBounds : java.lang.Object {
-    public abstract trait test.TwoBounds.Sub : test.TwoBounds.Super {
-        public abstract override /*1*/ fun </*0*/ B : java.lang.Cloneable & jet.CharSequence>foo(/*0*/ p0: B): jet.Tuple0
+public trait TwoBounds : java.lang.Object {
+    
+    public trait Sub : test.TwoBounds.Super {
+        public abstract override /*1*/ fun </*0*/ B> foo(/*0*/ p0 : B) : Unit where B : java.lang.Cloneable, B : jet.CharSequence
     }
-    public abstract trait test.TwoBounds.Super : java.lang.Object {
-        public abstract fun </*0*/ A : java.lang.Cloneable & jet.CharSequence>foo(/*0*/ p0: A): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun </*0*/ A> foo(/*0*/ p0 : A) : Unit where A : java.lang.Cloneable, A : jet.CharSequence
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt

@@ -1,13 +1,16 @@
 namespace test
 
-public abstract trait test.TwoSuperclasses : java.lang.Object {
-    public abstract trait test.TwoSuperclasses.Sub : test.TwoSuperclasses.Super1, test.TwoSuperclasses.Super2 {
-        public abstract override /*2*/ fun </*0*/ C : jet.CharSequence>foo(/*0*/ p0: C): jet.Tuple0
+public trait TwoSuperclasses : java.lang.Object {
+    
+    public trait Sub : test.TwoSuperclasses.Super1, test.TwoSuperclasses.Super2 {
+        public abstract override /*2*/ fun </*0*/ C : jet.CharSequence> foo(/*0*/ p0 : C) : Unit
     }
-    public abstract trait test.TwoSuperclasses.Super1 : java.lang.Object {
-        public abstract fun </*0*/ A : jet.CharSequence>foo(/*0*/ p0: A): jet.Tuple0
+    
+    public trait Super1 : java.lang.Object {
+        public abstract fun </*0*/ A : jet.CharSequence> foo(/*0*/ p0 : A) : Unit
     }
-    public abstract trait test.TwoSuperclasses.Super2 : java.lang.Object {
-        public abstract fun </*0*/ B : jet.CharSequence>foo(/*0*/ p0: B): jet.Tuple0
+    
+    public trait Super2 : java.lang.Object {
+        public abstract fun </*0*/ B : jet.CharSequence> foo(/*0*/ p0 : B) : Unit
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.TwoTypeParameters : java.lang.Object {
-    public abstract trait test.TwoTypeParameters.Sub : test.TwoTypeParameters.Super {
-        public abstract override /*1*/ fun </*0*/ B : jet.CharSequence, /*1*/ A : java.lang.Cloneable>foo(/*0*/ p0: B, /*1*/ p1: A): jet.Tuple0
+public trait TwoTypeParameters : java.lang.Object {
+    
+    public trait Sub : test.TwoTypeParameters.Super {
+        public abstract override /*1*/ fun </*0*/ B : jet.CharSequence, /*1*/ A : java.lang.Cloneable> foo(/*0*/ p0 : B, /*1*/ p1 : A) : Unit
     }
-    public abstract trait test.TwoTypeParameters.Super : java.lang.Object {
-        public abstract fun </*0*/ A : jet.CharSequence, /*1*/ B : java.lang.Cloneable>foo(/*0*/ p0: A, /*1*/ p1: B): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun </*0*/ A : jet.CharSequence, /*1*/ B : java.lang.Cloneable> foo(/*0*/ p0 : A, /*1*/ p1 : B) : Unit
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.UseParameterAsUpperBound : java.lang.Object {
-    public abstract trait test.UseParameterAsUpperBound.Sub : test.UseParameterAsUpperBound.Super {
-        public abstract override /*1*/ fun </*0*/ B : jet.Any?, /*1*/ A : B>foo(/*0*/ p0: B, /*1*/ p1: A): jet.Tuple0
+public trait UseParameterAsUpperBound : java.lang.Object {
+    
+    public trait Sub : test.UseParameterAsUpperBound.Super {
+        public abstract override /*1*/ fun </*0*/ B, /*1*/ A : B> foo(/*0*/ p0 : B, /*1*/ p1 : A) : Unit
     }
-    public abstract trait test.UseParameterAsUpperBound.Super : java.lang.Object {
-        public abstract fun </*0*/ A : jet.Any?, /*1*/ B : A>foo(/*0*/ p0: A, /*1*/ p1: B): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun </*0*/ A, /*1*/ B : A> foo(/*0*/ p0 : A, /*1*/ p1 : B) : Unit
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.UseParameterInUpperBound : java.lang.Object {
-    public abstract trait test.UseParameterInUpperBound.Sub : test.UseParameterInUpperBound.Super {
-        public abstract override /*1*/ fun </*0*/ B : jet.Any?, /*1*/ A : jet.List<B>>foo(/*0*/ p0: B, /*1*/ p1: A): jet.Tuple0
+public trait UseParameterInUpperBound : java.lang.Object {
+    
+    public trait Sub : test.UseParameterInUpperBound.Super {
+        public abstract override /*1*/ fun </*0*/ B, /*1*/ A : jet.List<B>> foo(/*0*/ p0 : B, /*1*/ p1 : A) : Unit
     }
-    public abstract trait test.UseParameterInUpperBound.Super : java.lang.Object {
-        public abstract fun </*0*/ A : jet.Any?, /*1*/ B : jet.List<A>>foo(/*0*/ p0: A, /*1*/ p1: B): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun </*0*/ A, /*1*/ B : jet.List<A>> foo(/*0*/ p0 : A, /*1*/ p1 : B) : Unit
     }
 }

compiler/testData/loadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt

@@ -1,10 +1,12 @@
 namespace test
 
-public abstract trait test.UseParameterInUpperBoundWithKotlinSignature : java.lang.Object {
-    public abstract trait test.UseParameterInUpperBoundWithKotlinSignature.Sub : test.UseParameterInUpperBoundWithKotlinSignature.Super {
-        public abstract override /*1*/ fun </*0*/ B : jet.Any?, /*1*/ A : jet.List<B>>foo(/*0*/ p0: B, /*1*/ p1: A): jet.Tuple0
+public trait UseParameterInUpperBoundWithKotlinSignature : java.lang.Object {
+    
+    public trait Sub : test.UseParameterInUpperBoundWithKotlinSignature.Super {
+        public abstract override /*1*/ fun </*0*/ B, /*1*/ A : jet.List<B>> foo(/*0*/ p0 : B, /*1*/ p1 : A) : Unit
     }
-    public abstract trait test.UseParameterInUpperBoundWithKotlinSignature.Super : java.lang.Object {
-        public abstract fun </*0*/ A : jet.Any?, /*1*/ B : jet.List<A>>foo(/*0*/ p0: A, /*1*/ p1: B): jet.Tuple0
+    
+    public trait Super : java.lang.Object {
+        public abstract fun </*0*/ A, /*1*/ B : jet.List<A>> foo(/*0*/ p0 : A, /*1*/ p1 : B) : Unit
     }
 }