diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt index 4475ad9ffd7..445e3e835c9 100644 --- a/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt +++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt @@ -1,4 +1,4 @@ -public abstract class ClassWithTypePExtendsIterableP

|> : R|kotlin/Any|, R|kotlin/collections/MutableIterable>| { +public abstract class ClassWithTypePExtendsIterableP

|> : R|kotlin/Any|, R|kotlin/collections/MutableIterable>| { public constructor

|>(): R|test/ClassWithTypePExtendsIterableP

| } diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt index 84992f9f2f3..11bea72a5f6 100644 --- a/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt +++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt @@ -1,4 +1,4 @@ -public final class ClassWithTypePP

|, Q : R|ft|> : R|kotlin/Any| { - public constructor

|, Q : R|ft|>(): R|test/ClassWithTypePP| +public final class ClassWithTypePP

|, Q : R|ft

|> : R|kotlin/Any| { + public constructor

|, Q : R|ft

|>(): R|test/ClassWithTypePP| } diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt index 2b417533b60..42ef77a5c26 100644 --- a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt +++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt @@ -1,4 +1,4 @@ -public open class ClassWithTypePRefNext>, kotlin/collections/Iterable>?>|, P : R|ft|> : R|kotlin/Any| { - public constructor>, kotlin/collections/Iterable>?>|, P : R|ft|>(): R|test/ClassWithTypePRefNext| +public open class ClassWithTypePRefNext>, kotlin/collections/Iterable>?>|, P : R|ft|> : R|kotlin/Any| { + public constructor>, kotlin/collections/Iterable>?>|, P : R|ft|>(): R|test/ClassWithTypePRefNext| } diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt index 13aaa3ea193..671a2f24b6e 100644 --- a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt +++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt @@ -1,4 +1,4 @@ -public final class ClassWithTypePRefSelf

>, kotlin/Enum>?>|> : R|kotlin/Any| { - public constructor

>, kotlin/Enum>?>|>(): R|test/ClassWithTypePRefSelf

| +public final class ClassWithTypePRefSelf

>, kotlin/Enum>?>|> : R|kotlin/Any| { + public constructor

>, kotlin/Enum>?>|>(): R|test/ClassWithTypePRefSelf

| } diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt index b936b2e57f7..58e99fdbfc9 100644 --- a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt +++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt @@ -1,4 +1,4 @@ -public final class ClassWithTypePRefSelfAndClass

>, test/ClassWithTypePRefSelfAndClass>?>|> : R|kotlin/Any| { - public constructor

>, test/ClassWithTypePRefSelfAndClass>?>|>(): R|test/ClassWithTypePRefSelfAndClass

| +public final class ClassWithTypePRefSelfAndClass

>, test/ClassWithTypePRefSelfAndClass>?>|> : R|kotlin/Any| { + public constructor

>, test/ClassWithTypePRefSelfAndClass>?>|>(): R|test/ClassWithTypePRefSelfAndClass

| } diff --git a/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.fir.txt index 2eb1fcee88f..a89ada7f63c 100644 --- a/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.fir.txt +++ b/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.fir.txt @@ -4,15 +4,15 @@ public final class InheritMethodsDifferentReturnTypesGeneric : R|kotlin/Any| { public abstract interface Sub : R|test/InheritMethodsDifferentReturnTypesGeneric.Super1, ft>|, R|test/InheritMethodsDifferentReturnTypesGeneric.Super2, ft>| { } public abstract interface Super1|, B : R|ft|> : R|kotlin/Any| { - public abstract fun foo(): R|ft| + public abstract fun foo(): R|ft| - public abstract fun bar(): R|ft| + public abstract fun bar(): R|ft| } public abstract interface Super2|, BB : R|ft|> : R|kotlin/Any| { - public abstract fun foo(): R|ft| + public abstract fun foo(): R|ft| - public abstract fun bar(): R|ft| + public abstract fun bar(): R|ft| } } diff --git a/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt index bb3a3ccf194..19613056b94 100644 --- a/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt +++ b/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt @@ -1,8 +1,8 @@ public open class InnerClassReferencesOuterTP

|> : R|kotlin/Any| { public constructor

|>(): R|test/InnerClassReferencesOuterTP

| - public open inner class Inner|, P : R|ft|> : R|kotlin/Any| { - public test/InnerClassReferencesOuterTP

.constructor|>(): R|test/InnerClassReferencesOuterTP.Inner| + public open inner class Inner|, P : R|ft|> : R|kotlin/Any| { + public test/InnerClassReferencesOuterTP

.constructor|>(): R|test/InnerClassReferencesOuterTP.Inner| } } diff --git a/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt index e3855274667..c1dbfec166a 100644 --- a/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt +++ b/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt @@ -11,12 +11,12 @@ public open class InnerClassTypeMultipleGeneric : R|kotlin/Any| { } } - public open inner class Outer|, E2 : R|ft|> : R|test/InnerClassTypeMultipleGeneric.BaseOuter, ft>| { - public open fun bar(): R|ft, java/lang/Class<*>?>, ft, ft, ft>, test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner, java/lang/Class<*>?>, ft, ft, ft>?>| + public open inner class Outer|, E2 : R|ft|> : R|test/InnerClassTypeMultipleGeneric.BaseOuter, ft>| { + public open fun bar(): R|ft, java/lang/Class<*>?>, ft, ft, ft>, test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner, java/lang/Class<*>?>, ft, ft, ft>?>| public test/InnerClassTypeMultipleGeneric.constructor|, E2 : R|ft|>(): R|test/InnerClassTypeMultipleGeneric.Outer| - public open inner class Inner|, E1 : R|ft|, E2 : R|ft|> : R|test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner, ft, ft, ft>| { + public open inner class Inner|, E1 : R|ft|, E2 : R|ft|> : R|test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner, ft, ft, ft>| { public test/InnerClassTypeMultipleGeneric.Outer.constructor|>(): R|test/InnerClassTypeMultipleGeneric.Outer.Inner| } diff --git a/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt index a27bbcb237b..2bdcb5e1452 100644 --- a/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt +++ b/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt @@ -5,8 +5,8 @@ public open class InnerClassesInGeneric

|, Q : public test/InnerClassesInGeneric.constructor(): R|test/InnerClassesInGeneric.Inner| } - public open inner class Inner2

|, Q : R|ft|> : R|test/InnerClassesInGeneric.Inner, ft>| { - public open operator fun iterator(): R|ft>, kotlin/collections/Iterator>?>| + public open inner class Inner2

|, Q : R|ft|> : R|test/InnerClassesInGeneric.Inner, ft>| { + public open operator fun iterator(): R|ft>, kotlin/collections/Iterator>?>| public test/InnerClassesInGeneric.constructor(): R|test/InnerClassesInGeneric.Inner2| diff --git a/compiler/testData/loadJava/compiledJava/InnerOfGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InnerOfGeneric.fir.txt index 61863a44650..1da6bd40cbd 100644 --- a/compiler/testData/loadJava/compiledJava/InnerOfGeneric.fir.txt +++ b/compiler/testData/loadJava/compiledJava/InnerOfGeneric.fir.txt @@ -4,23 +4,23 @@ public open class InnerOfGeneric : R|kotlin/Any| { public abstract inner class A|> : R|kotlin/Any| { public test/InnerOfGeneric.constructor|>(): R|test/InnerOfGeneric.A| - public abstract inner class Inner|> : R|test/InnerOfGeneric.S>| { + public abstract inner class Inner|> : R|test/InnerOfGeneric.S>| { public test/InnerOfGeneric.A.constructor(): R|test/InnerOfGeneric.A.Inner| } } - public open inner class B|> : R|test/InnerOfGeneric.A>| { + public open inner class B|> : R|test/InnerOfGeneric.A>| { public test/InnerOfGeneric.constructor|>(): R|test/InnerOfGeneric.B| - public open inner class SubInner|> : R|test/InnerOfGeneric.A.Inner>| { - @R|java/lang/Override|() public open operator fun iterator(): R|ft>, kotlin/collections/Iterator>?>| + public open inner class SubInner|> : R|test/InnerOfGeneric.A.Inner>| { + @R|java/lang/Override|() public open operator fun iterator(): R|ft>, kotlin/collections/Iterator>?>| public test/InnerOfGeneric.B.constructor(): R|test/InnerOfGeneric.B.SubInner| } } public open inner class S|> : R|kotlin/Any| { - public open operator fun iterator(): R|ft>, kotlin/collections/Iterator>?>| + public open operator fun iterator(): R|ft>, kotlin/collections/Iterator>?>| public test/InnerOfGeneric.constructor|>(): R|test/InnerOfGeneric.S| diff --git a/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt index 6d5e54104fc..a1425a87e24 100644 --- a/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt +++ b/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt @@ -2,7 +2,7 @@ public final class MethodReferencesOuterClassTP

|>(): R|test/MethodReferencesOuterClassTP

| public final inner class Inner

|> : R|kotlin/Any| { - public final fun |> f(): R|kotlin/Unit| + public final fun |> f(): R|kotlin/Unit| public test/MethodReferencesOuterClassTP

.constructor(): R|test/MethodReferencesOuterClassTP.Inner

| diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt index 3cc5c7fca2d..86805b310f0 100644 --- a/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt +++ b/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt @@ -1,5 +1,5 @@ public final class MethodWithTypePP : R|kotlin/Any| { - public final fun

|, Q : R|ft|> f(): R|kotlin/Unit| + public final fun

|, Q : R|ft

|> f(): R|kotlin/Unit| public constructor(): R|test/MethodWithTypePP| diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt index a540480fd47..7d5db7672c1 100644 --- a/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt +++ b/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt @@ -1,5 +1,5 @@ public open class MethodWithTypePRefClassP

|> : R|kotlin/Any| { - public final fun |> f(): R|kotlin/Unit| + public final fun |> f(): R|kotlin/Unit| public constructor

|>(): R|test/MethodWithTypePRefClassP

| diff --git a/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt b/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt index a9aa9266b12..e7a19e2d516 100644 --- a/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt +++ b/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt @@ -1,5 +1,5 @@ public final class MethosWithPRefTP : R|kotlin/Any| { - public final fun

|> f(p: R|ft|): R|kotlin/Unit| + public final fun

|> f(p: R|ft

|): R|kotlin/Unit| public constructor(): R|test/MethosWithPRefTP| diff --git a/compiler/testData/loadJava/compiledJava/RawOverrides.fir.txt b/compiler/testData/loadJava/compiledJava/RawOverrides.fir.txt index 56b0be92532..f17b5c92acc 100644 --- a/compiler/testData/loadJava/compiledJava/RawOverrides.fir.txt +++ b/compiler/testData/loadJava/compiledJava/RawOverrides.fir.txt @@ -2,7 +2,7 @@ public open class RawOverrides : R|kotlin/Any| { public constructor(): R|test/RawOverrides| public abstract interface A|> : R|kotlin/Any| { - public abstract fun |> foo(x: R|ft|, y: R|ft>, kotlin/collections/List>?>|): R|ft| + public abstract fun |> foo(x: R|ft|, y: R|ft>, kotlin/collections/List>?>|): R|ft| } public open inner class B : R|kotlin/Any|, R|test/RawOverrides.A>| { @@ -12,7 +12,7 @@ public open class RawOverrides : R|kotlin/Any| { } public open inner class C : R|kotlin/Any| { - public/*package*/ open fun |, F : R|ft|> bar(x: R|ft|, y: R|ft, ft>, kotlin/collections/Map, ft>?>>, kotlin/collections/List, ft>, kotlin/collections/Map, ft>?>>?>|): R|ft| + public/*package*/ open fun |, F : R|ft|> bar(x: R|ft|, y: R|ft, ft>, kotlin/collections/Map, ft>?>>, kotlin/collections/List, ft>, kotlin/collections/Map, ft>?>>?>|): R|ft| public test/RawOverrides.constructor(): R|test/RawOverrides.C| @@ -20,7 +20,7 @@ public open class RawOverrides : R|kotlin/Any| { public open inner class D : R|test/RawOverrides.C| { @R|java/lang/Override|() public open fun bar(x: R|ft|, y: R|ft, kotlin/collections/List<*>?>|): R|ft| - public/*package*/ open fun |, F : R|ft|> bar(x: R|ft|, y: R|ft, ft>, kotlin/collections/Map, ft>?>>, kotlin/collections/List, ft>, kotlin/collections/Map, ft>?>>?>|): R|ft| + public/*package*/ open fun |, F : R|ft|> bar(x: R|ft|, y: R|ft, ft>, kotlin/collections/Map, ft>?>>, kotlin/collections/List, ft>, kotlin/collections/Map, ft>?>>?>|): R|ft| public test/RawOverrides.constructor(): R|test/RawOverrides.D| diff --git a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt index 6ad2e2c26f7..0410c2a9154 100644 --- a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt +++ b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt @@ -1,4 +1,4 @@ public open class ConstructorGenericDeep : R|kotlin/Any| { - public constructor

|>(cl: R|ft>, java/lang/Class>?>|): R|test/ConstructorGenericDeep| + public constructor

|>(cl: R|ft>, java/lang/Class>?>|): R|test/ConstructorGenericDeep| } diff --git a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.fir.txt b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.fir.txt index 57b67146525..81ba747f8fa 100644 --- a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.fir.txt +++ b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.fir.txt @@ -1,4 +1,4 @@ public open class ConstructorGenericSimple : R|kotlin/Any| { - public constructor

|>(p: R|ft|): R|test/ConstructorGenericSimple| + public constructor

|>(p: R|ft

|): R|test/ConstructorGenericSimple| } diff --git a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt index 3395cd7f6a1..b3edc0ad914 100644 --- a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt +++ b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt @@ -1,4 +1,4 @@ public open class ConstructorGenericUpperBound : R|kotlin/Any| { - public constructor

|>(p: R|ft|): R|test/ConstructorGenericUpperBound| + public constructor

|>(p: R|ft

|): R|test/ConstructorGenericUpperBound| } diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt index ced2c810bb1..26dae831ccf 100644 --- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt +++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt @@ -1,7 +1,7 @@ public open class JavaBeanVarOfGenericType

|> : R|kotlin/Any| { - public open fun getCharacters(): R|ft>, java/util/ArrayList>?>| + public open fun getCharacters(): R|ft>, java/util/ArrayList>?>| - public open fun setCharacters(characters: R|ft>, java/util/ArrayList>?>|): R|kotlin/Unit| + public open fun setCharacters(characters: R|ft>, java/util/ArrayList>?>|): R|kotlin/Unit| public constructor

|>(): R|test/JavaBeanVarOfGenericType

| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt index 3c61f534e7d..aaa365760a2 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt @@ -1,4 +1,4 @@ public open class ConstructorWithNewTypeParams|> : R|kotlin/Any| { - public constructor|, U : R|ft|>(first: R|ft|): R|test/ConstructorWithNewTypeParams| + public constructor|, U : R|ft|>(first: R|ft|): R|test/ConstructorWithNewTypeParams| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt index 348ea27c971..8e958e00753 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt @@ -1,4 +1,4 @@ public open class ConstructorWithParentTypeParams|> : R|kotlin/Any| { - public constructor|>(first: R|ft|): R|test/ConstructorWithParentTypeParams| + public constructor|>(first: R|ft|): R|test/ConstructorWithParentTypeParams| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt index eeac0e9fdfc..02024c4f17b 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt @@ -1,7 +1,7 @@ public open class MethodWithMappedClasses : R|kotlin/Any| { - public open fun |> copy(dest: R|ft>, kotlin/collections/MutableList>?>|, src: R|ft>, kotlin/collections/List>?>|): R|kotlin/Unit| + public open fun |> copy(dest: R|ft>, kotlin/collections/MutableList>?>|, src: R|ft>, kotlin/collections/List>?>|): R|kotlin/Unit| - public open fun |> copyMap(dest: R|ft, in ft>, kotlin/collections/MutableMap, in ft>?>|, src: R|ft, ft>, kotlin/collections/Map, ft>?>|): R|kotlin/Unit| + public open fun |> copyMap(dest: R|ft, in ft>, kotlin/collections/MutableMap, in ft>?>|, src: R|ft, ft>, kotlin/collections/Map, ft>?>|): R|kotlin/Unit| public constructor(): R|test/MethodWithMappedClasses| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt index c94f9821e52..45523ae7ebe 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt @@ -1,5 +1,5 @@ public open class MethodWithTypeParameters : R|kotlin/Any| { - public open fun |, B : R|ft|, R|ft>, kotlin/collections/List>?>|> foo(a: R|ft|, b: R|ft>, kotlin/collections/List>?>|, list: R|ft>, kotlin/collections/MutableList>?>|): R|kotlin/Unit| + public open fun |, B : R|ft|, R|ft>, kotlin/collections/List>?>|> foo(a: R|ft|, b: R|ft>, kotlin/collections/List>?>|, list: R|ft>, kotlin/collections/MutableList>?>|): R|kotlin/Unit| public constructor(): R|test/MethodWithTypeParameters| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt index 694ab1827bc..5be54802354 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt @@ -3,7 +3,7 @@ public open class PropertyArrayTypes|> : R|kot public open field array: R|ft>, kotlin/Array>?>| - public open field genericArray: R|ft>, kotlin/Array>?>| + public open field genericArray: R|ft>, kotlin/Array>?>| public constructor|>(): R|test/PropertyArrayTypes| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt index 42a6b5d12e6..f23ef08a6d4 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt @@ -1,11 +1,11 @@ public open class PropertyComplexTypes|> : R|kotlin/Any| { - public open field genericType: R|ft| + public open field genericType: R|ft| public open field listDefinedGeneric: R|ft>, java/util/ArrayList>?>| - public open field listGeneric: R|ft>, java/util/ArrayList>?>| + public open field listGeneric: R|ft>, java/util/ArrayList>?>| - public open field listOfGenericList: R|ft>, java/util/ArrayList>?>>, java/util/ArrayList>, java/util/ArrayList>?>>?>| + public open field listOfGenericList: R|ft>, java/util/ArrayList>?>>, java/util/ArrayList>, java/util/ArrayList>?>>?>| public constructor|>(): R|test/PropertyComplexTypes| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt index f9f80107f0d..d7f7ffd3582 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt @@ -1,5 +1,5 @@ public open class WrongTypeParameterBoundStructure1 : R|kotlin/Any| { - public open fun |, B : R|ft|, R|ft>, kotlin/collections/List>?>|> foo(a: R|ft|, b: R|ft>, kotlin/collections/List>?>|): R|kotlin/Unit| + public open fun |, B : R|ft|, R|ft>, kotlin/collections/List>?>|> foo(a: R|ft|, b: R|ft>, kotlin/collections/List>?>|): R|kotlin/Unit| public constructor(): R|test/WrongTypeParameterBoundStructure1| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.fir.txt index 5f08c2888aa..f80ef8ff92d 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.fir.txt @@ -1,6 +1,6 @@ public abstract interface DeeplySubstitutedClassParameter : R|kotlin/Any| { - public abstract interface Middle|> : R|test/DeeplySubstitutedClassParameter.Super>| { - public abstract fun foo(p: R|ft|): R|kotlin/Unit| + public abstract interface Middle|> : R|test/DeeplySubstitutedClassParameter.Super>| { + public abstract fun foo(p: R|ft|): R|kotlin/Unit| } public abstract interface Sub : R|test/DeeplySubstitutedClassParameter.Middle>| { @@ -8,7 +8,7 @@ public abstract interface DeeplySubstitutedClassParameter : R|kotlin/Any| { } public abstract interface Super|> : R|kotlin/Any| { - public abstract fun foo(p: R|ft|): R|kotlin/Unit| + public abstract fun foo(p: R|ft|): R|kotlin/Unit| public abstract fun dummy(): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.fir.txt index bd325964c4c..56e405304ec 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.fir.txt @@ -1,12 +1,12 @@ public abstract interface DeeplySubstitutedClassParameter2 : R|kotlin/Any| { - public abstract interface Middle|> : R|test/DeeplySubstitutedClassParameter2.Super>| { + public abstract interface Middle|> : R|test/DeeplySubstitutedClassParameter2.Super>| { } public abstract interface Sub : R|test/DeeplySubstitutedClassParameter2.Middle>| { public abstract fun foo(p: R|ft|): R|kotlin/Unit| } public abstract interface Super|> : R|kotlin/Any| { - public abstract fun foo(p: R|ft|): R|kotlin/Unit| + public abstract fun foo(p: R|ft|): R|kotlin/Unit| public abstract fun dummy(): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.fir.txt index f56c57623ba..1fd5ebca775 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.fir.txt @@ -10,7 +10,7 @@ public abstract interface Kt3302 : R|kotlin/Any| { } public abstract interface LinkedHashMap|, V : R|ft|> : R|kotlin/Any| { - public abstract fun put(key: R|ft|, value: R|ft|): R|ft| + public abstract fun put(key: R|ft|, value: R|ft|): R|ft| public abstract fun dummy(): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.fir.txt index 6268364ccf9..03dbef969c4 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.fir.txt @@ -1,10 +1,12 @@ public abstract interface OverrideWithErasedParameter : R|kotlin/Any| { - public abstract interface Sub|> : R|test/OverrideWithErasedParameter.Super>| { + public abstract interface Sub|> : R|test/OverrideWithErasedParameter.Super>| { public abstract fun foo(o: R|ft|): R|kotlin/Unit| + public abstract fun foo(t: R|ft|): R|kotlin/Unit| + } public abstract interface Super|> : R|kotlin/Any| { - public abstract fun foo(t: R|ft|): R|kotlin/Unit| + public abstract fun foo(t: R|ft|): R|kotlin/Unit| public abstract fun dummy(): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.fir.txt index 8c7c53e8d3f..4aad1ac2415 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.fir.txt @@ -1,6 +1,6 @@ public abstract interface SubclassFromGenericAndNot : R|kotlin/Any| { public abstract interface Generic|> : R|kotlin/Any| { - public abstract fun foo(key: R|ft|): R|kotlin/Unit| + public abstract fun foo(key: R|ft|): R|kotlin/Unit| public abstract fun dummy(): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.fir.txt index 345cde191b5..18ea49c7dc3 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.fir.txt @@ -4,7 +4,7 @@ public abstract interface SubstitutedClassParameter : R|kotlin/Any| { } public abstract interface Super|> : R|kotlin/Any| { - public abstract fun foo(p: R|ft|): R|kotlin/Unit| + public abstract fun foo(p: R|ft|): R|kotlin/Unit| public abstract fun dummy(): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.fir.txt index 4c7a0e9540b..7857acc22ad 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.fir.txt @@ -4,13 +4,13 @@ public abstract interface SubstitutedClassParameters : R|kotlin/Any| { } public abstract interface Super1|> : R|kotlin/Any| { - public abstract fun foo(p: R|ft|): R|kotlin/Unit| + public abstract fun foo(p: R|ft|): R|kotlin/Unit| public abstract fun dummy(): R|kotlin/Unit| } public abstract interface Super2|> : R|kotlin/Any| { - public abstract fun foo(p: R|ft|): R|kotlin/Unit| + public abstract fun foo(p: R|ft|): R|kotlin/Unit| public abstract fun dummy(): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.fir.txt index 835e00d92d1..287d2cf529d 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.fir.txt @@ -1,6 +1,6 @@ public abstract interface DeeplySubstitutedClassParameter : R|kotlin/Any| { - public abstract interface Middle|> : R|test/DeeplySubstitutedClassParameter.Super>| { - public abstract fun foo(): R|ft| + public abstract interface Middle|> : R|test/DeeplySubstitutedClassParameter.Super>| { + public abstract fun foo(): R|ft| } public abstract interface Sub : R|test/DeeplySubstitutedClassParameter.Middle>| { @@ -8,7 +8,7 @@ public abstract interface DeeplySubstitutedClassParameter : R|kotlin/Any| { } public abstract interface Super|> : R|kotlin/Any| { - public abstract fun foo(): R|ft| + public abstract fun foo(): R|ft| public abstract fun dummy(): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.fir.txt index dbaa02563f0..6c0af73efa9 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.fir.txt @@ -1,12 +1,12 @@ public abstract interface DeeplySubstitutedClassParameter2 : R|kotlin/Any| { - public abstract interface Middle|> : R|test/DeeplySubstitutedClassParameter2.Super>| { + public abstract interface Middle|> : R|test/DeeplySubstitutedClassParameter2.Super>| { } public abstract interface Sub : R|test/DeeplySubstitutedClassParameter2.Middle>| { public abstract fun foo(): R|ft| } public abstract interface Super|> : R|kotlin/Any| { - public abstract fun foo(): R|ft| + public abstract fun foo(): R|ft| public abstract fun dummy(): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.fir.txt index 22850f95218..bb9d64b8611 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.fir.txt @@ -9,6 +9,6 @@ public abstract interface HalfSubstitutedTypeParameters : R|kotlin/Any| { public abstract fun dummy(): R|kotlin/Unit| } - public abstract interface TrickyList|, E : R|ft|> : R|kotlin/collections/MutableList>| { + public abstract interface TrickyList|, E : R|ft|> : R|kotlin/collections/MutableList>| { } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.fir.txt index a505021dfee..0458ea29ed9 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.fir.txt @@ -1,6 +1,6 @@ public abstract interface SubclassFromGenericAndNot : R|kotlin/Any| { public abstract interface Generic|> : R|kotlin/Any| { - public abstract fun foo(): R|ft| + public abstract fun foo(): R|ft| public abstract fun dummy(): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt index 81d83705de0..706dfea3fe4 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt @@ -1,4 +1,4 @@ -public abstract interface SubclassOfCollection|> : R|kotlin/collections/MutableCollection>| { - public abstract operator fun iterator(): R|@EnhancedNullability kotlin/collections/MutableIterator>| +public abstract interface SubclassOfCollection|> : R|kotlin/collections/MutableCollection>| { + public abstract operator fun iterator(): R|@EnhancedNullability kotlin/collections/MutableIterator>| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt index b04e4d830ea..54a0c7b0843 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt @@ -1,4 +1,4 @@ -public abstract interface SubclassOfMapEntry|, V : R|ft|> : R|kotlin/collections/MutableMap.MutableEntry, ft>| { - public abstract operator fun setValue(value: R|ft|): R|ft| +public abstract interface SubclassOfMapEntry|, V : R|ft|> : R|kotlin/collections/MutableMap.MutableEntry, ft>| { + public abstract operator fun setValue(value: R|ft|): R|ft| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.fir.txt index b17a5722804..b6d7b955eb1 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.fir.txt @@ -4,7 +4,7 @@ public abstract interface SubstitutedClassParameter : R|kotlin/Any| { } public abstract interface Super|> : R|kotlin/Any| { - public abstract fun foo(): R|ft| + public abstract fun foo(): R|ft| public abstract fun dummy(): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.fir.txt index c131a608659..b5c612146de 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.fir.txt @@ -4,13 +4,13 @@ public abstract interface SubstitutedClassParameters : R|kotlin/Any| { } public abstract interface Super1|> : R|kotlin/Any| { - public abstract fun foo(): R|ft| + public abstract fun foo(): R|ft| public abstract fun dummy(): R|kotlin/Unit| } public abstract interface Super2|> : R|kotlin/Any| { - public abstract fun foo(): R|ft| + public abstract fun foo(): R|ft| public abstract fun dummy(): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.fir.txt index 39338142ec8..382c412cf2c 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.fir.txt @@ -1,5 +1,5 @@ public abstract interface TypeParamOfClass : R|kotlin/Any| { - public abstract interface Sub|> : R|test/TypeParamOfClass.Super>| { + public abstract interface Sub|> : R|test/TypeParamOfClass.Super>| { public abstract fun foo(): R|@EnhancedNullability T & Any| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.fir.txt index 894eb81fa56..a5b02c0979d 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.fir.txt @@ -1,10 +1,10 @@ public abstract interface InheritNullability : R|kotlin/Any| { public abstract interface Sub : R|test/InheritNullability.Super| { - public abstract fun |> foo(b: R|ft|): R|kotlin/Unit| + public abstract fun |> foo(b: R|ft|): R|kotlin/Unit| } public abstract interface Super : R|kotlin/Any| { - public abstract fun |> foo(a: R|ft|): R|kotlin/Unit| + public abstract fun |> foo(a: R|ft|): R|kotlin/Unit| } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.fir.txt index 5f1feca2000..4c9f0aef364 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.fir.txt @@ -1,10 +1,10 @@ public abstract interface TwoBounds : R|kotlin/Any| { public abstract interface Sub : R|test/TwoBounds.Super| { - public abstract fun |, R|ft|> foo(b: R|ft|): R|kotlin/Unit| + public abstract fun |, R|ft|> foo(b: R|ft|): R|kotlin/Unit| } public abstract interface Super : R|kotlin/Any| { - public abstract fun |, R|ft|> foo(a: R|ft|): R|kotlin/Unit| + public abstract fun |, R|ft|> foo(a: R|ft|): R|kotlin/Unit| } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.fir.txt index 72e6bf4b091..20e84c0721a 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.fir.txt @@ -1,14 +1,14 @@ public abstract interface TwoSuperclasses : R|kotlin/Any| { public abstract interface Sub : R|test/TwoSuperclasses.Super1|, R|test/TwoSuperclasses.Super2| { - public abstract fun |> foo(c: R|ft|): R|kotlin/Unit| + public abstract fun |> foo(c: R|ft|): R|kotlin/Unit| } public abstract interface Super1 : R|kotlin/Any| { - public abstract fun |> foo(a: R|ft|): R|kotlin/Unit| + public abstract fun |> foo(a: R|ft|): R|kotlin/Unit| } public abstract interface Super2 : R|kotlin/Any| { - public abstract fun |> foo(a: R|ft|): R|kotlin/Unit| + public abstract fun |> foo(a: R|ft|): R|kotlin/Unit| } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.fir.txt index 7c026169a19..88eaea489c3 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.fir.txt @@ -1,10 +1,10 @@ public abstract interface TwoTypeParameters : R|kotlin/Any| { public abstract interface Sub : R|test/TwoTypeParameters.Super| { - public abstract fun |, A : R|ft|> foo(b: R|ft|, a: R|ft|): R|kotlin/Unit| + public abstract fun |, A : R|ft|> foo(b: R|ft|, a: R|ft|): R|kotlin/Unit| } public abstract interface Super : R|kotlin/Any| { - public abstract fun |, B : R|ft|> foo(a: R|ft|, b: R|ft|): R|kotlin/Unit| + public abstract fun |, B : R|ft|> foo(a: R|ft|, b: R|ft|): R|kotlin/Unit| } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.fir.txt index 5e123cf946d..26154157a77 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.fir.txt @@ -1,12 +1,12 @@ public abstract interface UseParameterAsUpperBound : R|kotlin/Any| { public abstract interface Sub : R|test/UseParameterAsUpperBound.Super| { - public abstract fun |, A : R|ft|> foo(b: R|ft|, a: R|ft|): R|kotlin/Unit| + public abstract fun |, A : R|ft|> foo(b: R|ft|, a: R|ft|): R|kotlin/Unit| - public abstract fun |, B : R|ft|> foo(a: R|ft|, b: R|ft|): R|kotlin/Unit| + public abstract fun |, B : R|ft|> foo(a: R|ft|, b: R|ft|): R|kotlin/Unit| } public abstract interface Super : R|kotlin/Any| { - public abstract fun |, B : R|ft|> foo(a: R|ft|, b: R|ft|): R|kotlin/Unit| + public abstract fun |, B : R|ft|> foo(a: R|ft|, b: R|ft|): R|kotlin/Unit| } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.fir.txt index 3e1e4d0746e..ba501ec6622 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.fir.txt @@ -1,10 +1,10 @@ public abstract interface UseParameterInUpperBound : R|kotlin/Any| { public abstract interface Sub : R|test/UseParameterInUpperBound.Super| { - public abstract fun |, A : R|ft>, kotlin/collections/List>?>|> foo(b: R|ft|, a: R|ft|): R|kotlin/Unit| + public abstract fun |, A : R|ft>, kotlin/collections/List>?>|> foo(b: R|ft|, a: R|ft|): R|kotlin/Unit| } public abstract interface Super : R|kotlin/Any| { - public abstract fun |, B : R|ft>, kotlin/collections/List>?>|> foo(a: R|ft|, b: R|ft|): R|kotlin/Unit| + public abstract fun |, B : R|ft>, kotlin/collections/List>?>|> foo(a: R|ft|, b: R|ft|): R|kotlin/Unit| } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.fir.txt index 7228c4d50d2..955f9ea23bf 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.fir.txt @@ -1,10 +1,10 @@ public abstract interface UseParameterInUpperBoundWithKotlinSignature : R|kotlin/Any| { public abstract interface Sub : R|test/UseParameterInUpperBoundWithKotlinSignature.Super| { - public abstract fun |, A : R|ft>, kotlin/collections/List>?>|> foo(b: R|ft|, a: R|ft|): R|kotlin/Unit| + public abstract fun |, A : R|ft>, kotlin/collections/List>?>|> foo(b: R|ft|, a: R|ft|): R|kotlin/Unit| } public abstract interface Super : R|kotlin/Any| { - public abstract fun |, B : R|ft>, kotlin/collections/List>?>|> foo(a: R|ft|, b: R|ft|): R|kotlin/Unit| + public abstract fun |, B : R|ft>, kotlin/collections/List>?>|> foo(a: R|ft|, b: R|ft|): R|kotlin/Unit| } } diff --git a/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt b/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt index acd4e283abd..6a1c4015a52 100644 --- a/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt +++ b/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt @@ -1,6 +1,6 @@ public abstract interface LoadIterable|> : R|kotlin/Any| { - public abstract fun getIterable(): R|ft>, kotlin/collections/Iterable>?>| + public abstract fun getIterable(): R|ft>, kotlin/collections/Iterable>?>| - public abstract fun setIterable(Iterable: R|ft>, kotlin/collections/Iterable>?>|): R|kotlin/Unit| + public abstract fun setIterable(Iterable: R|ft>, kotlin/collections/Iterable>?>|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt b/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt index ce4877d3d34..fef9713a391 100644 --- a/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt +++ b/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt @@ -1,6 +1,6 @@ public abstract interface LoadIterator|> : R|kotlin/Any| { - public abstract fun getIterator(): R|ft>, kotlin/collections/Iterator>?>| + public abstract fun getIterator(): R|ft>, kotlin/collections/Iterator>?>| - public abstract fun setIterator(iterator: R|ft>, kotlin/collections/Iterator>?>|): R|kotlin/Unit| + public abstract fun setIterator(iterator: R|ft>, kotlin/collections/Iterator>?>|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/library/Max.fir.txt b/compiler/testData/loadJava/compiledJava/library/Max.fir.txt index 918dfde3875..5668af18df9 100644 --- a/compiler/testData/loadJava/compiledJava/library/Max.fir.txt +++ b/compiler/testData/loadJava/compiledJava/library/Max.fir.txt @@ -1,5 +1,5 @@ public open class Max : R|kotlin/Any| { - public open fun |, R|ft>, kotlin/Comparable>?>|> max(coll: R|ft>, kotlin/collections/Collection>?>|): R|ft| + public open fun |, R|ft>, kotlin/Comparable>?>|> max(coll: R|ft>, kotlin/collections/Collection>?>|): R|ft| public constructor(): R|test/Max| diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt index 7448edf8113..4004e2a7ae2 100644 --- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt +++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt @@ -1,10 +1,10 @@ public abstract interface LoadIterable|> : R|kotlin/Any| { - @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft>, kotlin/collections/MutableIterable>?>| + @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft>, kotlin/collections/MutableIterable>?>| - public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft>, kotlin/collections/MutableIterable>?>|): R|kotlin/Unit| + public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft>, kotlin/collections/MutableIterable>?>|): R|kotlin/Unit| - @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|ft>, kotlin/collections/Iterable>?>| + @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|ft>, kotlin/collections/Iterable>?>| - public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() Iterable: R|ft>, kotlin/collections/Iterable>?>|): R|kotlin/Unit| + public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() Iterable: R|ft>, kotlin/collections/Iterable>?>|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt index 028499e2204..f5d5dcea3e0 100644 --- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt +++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt @@ -1,6 +1,6 @@ public abstract interface LoadIterableWithConflict|> : R|kotlin/Any| { - @R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft>, kotlin/collections/Iterable>?>| + @R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft>, kotlin/collections/Iterable>?>| - public abstract fun setIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft>, kotlin/collections/Iterable>?>|): R|kotlin/Unit| + public abstract fun setIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft>, kotlin/collections/Iterable>?>|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt index 60474481549..896f46931e0 100644 --- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt +++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt @@ -1,10 +1,10 @@ public abstract interface LoadIterableWithNullability|> : R|kotlin/Any| { - @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|@EnhancedNullability kotlin/collections/MutableIterable>| + @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|@EnhancedNullability kotlin/collections/MutableIterable>| - public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|@EnhancedNullability kotlin/collections/MutableIterable>|): R|kotlin/Unit| + public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|@EnhancedNullability kotlin/collections/MutableIterable>|): R|kotlin/Unit| - @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|@EnhancedNullability kotlin/collections/Iterable>| + @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|@EnhancedNullability kotlin/collections/Iterable>| - public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|@EnhancedNullability kotlin/collections/Iterable>|): R|kotlin/Unit| + public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|@EnhancedNullability kotlin/collections/Iterable>|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.fir.txt index df9934dae7e..0c6d36d9d39 100644 --- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.fir.txt +++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.fir.txt @@ -1,22 +1,22 @@ public abstract interface LoadIterableWithPropagation : R|kotlin/Any| { public abstract interface LoadIterable|> : R|kotlin/Any| { - @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft>, kotlin/collections/MutableIterable>?>| + @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft>, kotlin/collections/MutableIterable>?>| - public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft>, kotlin/collections/MutableIterable>?>|): R|kotlin/Unit| + public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft>, kotlin/collections/MutableIterable>?>|): R|kotlin/Unit| - @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|ft>, kotlin/collections/Iterable>?>| + @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|ft>, kotlin/collections/Iterable>?>| - public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() Iterable: R|ft>, kotlin/collections/Iterable>?>|): R|kotlin/Unit| + public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() Iterable: R|ft>, kotlin/collections/Iterable>?>|): R|kotlin/Unit| } - public open class LoadIterableImpl|> : R|kotlin/Any|, R|test/LoadIterableWithPropagation.LoadIterable>| { - public open fun getIterable(): R|ft>, kotlin/collections/MutableIterable>?>| + public open class LoadIterableImpl|> : R|kotlin/Any|, R|test/LoadIterableWithPropagation.LoadIterable>| { + public open fun getIterable(): R|ft>, kotlin/collections/MutableIterable>?>| - public open fun setIterable(Iterable: R|ft>, kotlin/collections/MutableIterable>?>|): R|kotlin/Unit| + public open fun setIterable(Iterable: R|ft>, kotlin/collections/MutableIterable>?>|): R|kotlin/Unit| - public open fun getReadOnlyIterable(): R|ft>, kotlin/collections/Iterable>?>| + public open fun getReadOnlyIterable(): R|ft>, kotlin/collections/Iterable>?>| - public open fun setReadOnlyIterable(Iterable: R|ft>, kotlin/collections/Iterable>?>|): R|kotlin/Unit| + public open fun setReadOnlyIterable(Iterable: R|ft>, kotlin/collections/Iterable>?>|): R|kotlin/Unit| public constructor|>(): R|test/LoadIterableWithPropagation.LoadIterableImpl| diff --git a/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt b/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt index f2496b98ad2..514b1ea5991 100644 --- a/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt @@ -1,4 +1,4 @@ public abstract interface Comparator|> : R|kotlin/Any| { - public abstract fun compare(o1: R|ft|, o2: R|ft|): R|kotlin/Int| + public abstract fun compare(o1: R|ft|, o2: R|ft|): R|kotlin/Int| } diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt index c489c6b22c4..56f7e68a396 100644 --- a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt @@ -1,4 +1,4 @@ -public abstract interface GenericInterfaceParameterWithSelfBound>, test/GenericInterfaceParameterWithSelfBound>?>|> : R|kotlin/Any| { - public abstract fun method(t: R|ft|): R|ft| +public abstract interface GenericInterfaceParameterWithSelfBound>, test/GenericInterfaceParameterWithSelfBound>?>|> : R|kotlin/Any| { + public abstract fun method(t: R|ft|): R|ft| } diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt index 7415b636681..0234f232aa9 100644 --- a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt @@ -1,4 +1,4 @@ -public abstract interface GenericInterfaceParametersWithBounds>, kotlin/Comparable>?>|, R|ft|, B : R|ft>, kotlin/collections/List>?>|> : R|kotlin/Any| { - public abstract fun method(a: R|ft>, kotlin/Array>?>|, b: R|ft|): R|kotlin/Unit| +public abstract interface GenericInterfaceParametersWithBounds>, kotlin/Comparable>?>|, R|ft|, B : R|ft>, kotlin/collections/List>?>|> : R|kotlin/Any| { + public abstract fun method(a: R|ft>, kotlin/Array>?>|, b: R|ft|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt index af95c4e45ad..e7dccaa387e 100644 --- a/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt @@ -1,4 +1,4 @@ public abstract interface GenericMethodParameters : R|kotlin/Any| { - public abstract fun |, B : R|ft>, kotlin/collections/List>?>|> method(a: R|ft>, kotlin/Array>?>|, b: R|ft|): R|kotlin/Unit| + public abstract fun |, B : R|ft>, kotlin/collections/List>?>|> method(a: R|ft>, kotlin/Array>?>|, b: R|ft|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.fir.txt b/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.fir.txt index 0724a10f474..4220afa6cc9 100644 --- a/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.fir.txt @@ -6,7 +6,7 @@ public abstract interface SamSubinterfaceOfTwo : R|kotlin/Any| { } public abstract interface Super2|> : R|kotlin/Any| { - public abstract fun f(): R|ft| + public abstract fun f(): R|ft| } } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt index 964ebcc98c8..22dc1e4c141 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt @@ -1,5 +1,5 @@ public open class TypeParameterOfClass|> : R|kotlin/Any| { - public open fun foo(comparator: R|ft>, java/util/Comparator>?>|): R|kotlin/Unit| + public open fun foo(comparator: R|ft>, java/util/Comparator>?>|): R|kotlin/Unit| public constructor|>(): R|test/TypeParameterOfClass| diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt index 3151a223b20..dd420b15796 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt @@ -1,9 +1,9 @@ public open class TypeParameterOfMethod : R|kotlin/Any| { - public open static fun |> max(comparator: R|ft>, java/util/Comparator>?>|, value1: R|ft|, value2: R|ft|): R|ft| + public open static fun |> max(comparator: R|ft>, java/util/Comparator>?>|, value1: R|ft|, value2: R|ft|): R|ft| - public open static fun |> max2(comparator: R|ft>, java/util/Comparator>?>|, value1: R|ft|, value2: R|ft|): R|ft| + public open static fun |> max2(comparator: R|ft>, java/util/Comparator>?>|, value1: R|ft|, value2: R|ft|): R|ft| - public open static fun |, B : R|ft>, kotlin/collections/List>?>|> method(a: R|ft>, java/util/Comparator>?>|, b: R|ft|): R|kotlin/Unit| + public open static fun |, B : R|ft>, kotlin/collections/List>?>|> method(a: R|ft>, java/util/Comparator>?>|, b: R|ft|): R|kotlin/Unit| public constructor(): R|test/TypeParameterOfMethod| diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt index 9b094cfa2aa..dde7ffe5107 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt @@ -2,7 +2,7 @@ public open class TypeParameterOfOuterClass|> public constructor|>(): R|test/TypeParameterOfOuterClass| public open inner class Inner|> : R|kotlin/Any| { - public open fun foo(comparator: R|ft>, java/util/Comparator>?>|): R|kotlin/Unit| + public open fun foo(comparator: R|ft>, java/util/Comparator>?>|): R|kotlin/Unit| public test/TypeParameterOfOuterClass.constructor(): R|test/TypeParameterOfOuterClass.Inner| diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.fir.txt index 50e37a62a84..e21cec43e17 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.fir.txt @@ -6,7 +6,7 @@ public abstract interface InheritedSameAdaptersWithSubstitution : R|kotlin/Any| } public abstract interface Super2|> : R|kotlin/Any| { - public abstract fun foo(r: R|ft>, java/util/Comparator>?>|): R|kotlin/Unit| + public abstract fun foo(r: R|ft>, java/util/Comparator>?>|): R|kotlin/Unit| } public abstract interface Super2Substituted : R|test/InheritedSameAdaptersWithSubstitution.Super2>| { diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.fir.txt index 2e58c260a5a..97fcff24930 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.fir.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.fir.txt @@ -4,7 +4,7 @@ public abstract interface ArraysInSubtypes : R|kotlin/Any| { public abstract fun listOfArray(): R|ft>, kotlin/Array>?>>, kotlin/collections/List>, kotlin/Array>?>>?>| - public abstract fun objArray(): R|ft>, kotlin/Array>?>| + public abstract fun objArray(): R|ft>, kotlin/Array>?>| } public abstract interface Super : R|kotlin/Any| { diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.fir.txt index 486c68ebcc0..0b02a2e0b5b 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.fir.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.fir.txt @@ -1,6 +1,6 @@ public abstract interface MethodTypeParameterErased : R|kotlin/Any| { public abstract interface Bug|> : R|kotlin/Any| { - public abstract fun >, test/MethodTypeParameterErased.Bug>?>|> save(): R|ft| + public abstract fun >, test/MethodTypeParameterErased.Bug>?>|> save(): R|ft| } public open class SubBug : R|kotlin/Any|, R|test/MethodTypeParameterErased.Bug>| { diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.fir.txt index bf71c5bfd29..0e67bd8eb36 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.fir.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.fir.txt @@ -10,7 +10,7 @@ public open class RawSuperType : R|kotlin/Any| { } public abstract interface Super|> : R|kotlin/Any| { - public abstract fun foo(t: R|ft|): R|kotlin/Unit| + public abstract fun foo(t: R|ft|): R|kotlin/Unit| public abstract fun dummy(): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithBound.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithBound.fir.txt index 4f296dcd35a..5c6fe84f78b 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithBound.fir.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithBound.fir.txt @@ -14,7 +14,7 @@ public open class RawSuperTypeWithBound : R|kotlin/Any| { } public abstract interface Super|> : R|kotlin/Any| { - public abstract fun foo(t: R|ft|): R|kotlin/Unit| + public abstract fun foo(t: R|ft|): R|kotlin/Unit| public abstract fun dummy(): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBound.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBound.fir.txt index 2140cc5288b..a70eca8899d 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBound.fir.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBound.fir.txt @@ -11,8 +11,8 @@ public open class RawSuperTypeWithRecursiveBound : R|kotlin/Any| { public test/RawSuperTypeWithRecursiveBound.constructor(): R|test/RawSuperTypeWithRecursiveBound.Derived| } - public abstract interface Super>, test/RawSuperTypeWithRecursiveBound.Super>?>|> : R|kotlin/Any| { - public abstract fun foo(t: R|ft|): R|kotlin/Unit| + public abstract interface Super>, test/RawSuperTypeWithRecursiveBound.Super>?>|> : R|kotlin/Any| { + public abstract fun foo(t: R|ft|): R|kotlin/Unit| public abstract fun dummy(): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBoundMultipleParameters.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBoundMultipleParameters.fir.txt index 8d42d18d2c6..c9c32123250 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBoundMultipleParameters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBoundMultipleParameters.fir.txt @@ -11,8 +11,8 @@ public open class RawSuperTypeWithRecursiveBoundMultipleParameters : R|kotlin/An public test/RawSuperTypeWithRecursiveBoundMultipleParameters.constructor(): R|test/RawSuperTypeWithRecursiveBoundMultipleParameters.Derived| } - public abstract interface Super|, T : R|ft, ft>, test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super, ft>?>|> : R|kotlin/Any| { - public abstract fun foo(r: R|ft|, t: R|ft|): R|kotlin/Unit| + public abstract interface Super|, T : R|ft, ft>, test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super, ft>?>|> : R|kotlin/Any| { + public abstract fun foo(r: R|ft|, t: R|ft|): R|kotlin/Unit| public abstract fun dummy(): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.fir.txt index 5a48a642848..84b16118229 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.fir.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.fir.txt @@ -1,9 +1,9 @@ public abstract interface ReturnInnerSubclassOfSupersInner : R|kotlin/Any| { - public open class Sub|> : R|test/ReturnInnerSubclassOfSupersInner.Super>| { + public open class Sub|> : R|test/ReturnInnerSubclassOfSupersInner.Super>| { public constructor|>(): R|test/ReturnInnerSubclassOfSupersInner.Sub| - public/*package*/ open inner class Inner|> : R|test/ReturnInnerSubclassOfSupersInner.Super.Inner>| { - public/*package*/ open operator fun get(): R|ft>, test/ReturnInnerSubclassOfSupersInner.Sub>?>| + public/*package*/ open inner class Inner|> : R|test/ReturnInnerSubclassOfSupersInner.Super.Inner>| { + public/*package*/ open operator fun get(): R|ft>, test/ReturnInnerSubclassOfSupersInner.Sub>?>| public/*package*/ test/ReturnInnerSubclassOfSupersInner.Sub.constructor(): R|test/ReturnInnerSubclassOfSupersInner.Sub.Inner| @@ -13,7 +13,7 @@ public abstract interface ReturnInnerSubclassOfSupersInner : R|kotlin/Any| { public constructor|>(): R|test/ReturnInnerSubclassOfSupersInner.Super| public/*package*/ open inner class Inner|> : R|kotlin/Any| { - public/*package*/ open operator fun get(): R|ft>, test/ReturnInnerSubclassOfSupersInner.Super>?>| + public/*package*/ open operator fun get(): R|ft>, test/ReturnInnerSubclassOfSupersInner.Super>?>| public/*package*/ test/ReturnInnerSubclassOfSupersInner.Super.constructor(): R|test/ReturnInnerSubclassOfSupersInner.Super.Inner|