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 |> : R|kotlin/Any|, R|kotlin/collections/MutableIterable |>(): 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/Enum >, kotlin/Enum |
+public final class ClassWithTypePRefSelf >, kotlin/Enum >, kotlin/Enum |
}
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 >, test/ClassWithTypePRefSelfAndClass |
+public final class ClassWithTypePRefSelfAndClass >, test/ClassWithTypePRefSelfAndClass >, 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 |> : R|kotlin/Any| {
public constructor |>(): R|test/InnerClassReferencesOuterTP |
- public open inner class Inner .constructor .constructor |, Q :
public test/InnerClassesInGeneric .constructor(): R|test/InnerClassesInGeneric.Inner |
}
- public open inner class Inner2 |, Q : R|ft |, Q : R|ft .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|test/MethodReferencesOuterClassTP |
public final inner class Inner |> : R|kotlin/Any| {
- public final fun .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 |>(): 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 |>(cl: R|ft |>(cl: R|ft |>(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 |>(): 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|, P : R|ft
|>(): R|test/InnerClassReferencesOuterTP.Inner
|
+ public open inner class Inner
|, P : R|ft
|>(): 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
>| {
- public open operator fun iterator(): R|ft
>| {
+ public open operator fun iterator(): R|ft
|> f(): R|kotlin/Unit|
+ public final fun
|> f(): R|kotlin/Unit|
public test/MethodReferencesOuterClassTP
|> f(): R|kotlin/Unit|
+ public final fun
|> f(): R|kotlin/Unit|
public constructor