azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR] Render outer type parameters differently

Browse Source
This commit is contained in:
Nikolay Lunyak
2023-07-27 11:51:48 +03:00
committed by Space Team
parent e4246e8f51
commit c2ad475153
37 changed files with 118 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledKotlin/annotations/types/ClassLiteralArgument.fir.k1.txt
Vendored
+1 -1
View File
@@ -27,7 +27,7 @@ public final class Generic<T> : R|kotlin/Any| {
public final class InnerGeneric<A, B> : R|kotlin/Any| {
public constructor<A, B>(): R|test/InnerGeneric<A, B>|
public final inner class Inner<in C, D : R|A|, A, B> : R|kotlin/Any| {
public final inner class Inner<in C, D : R|A|, Outer(A), Outer(B)> : R|kotlin/Any| {
public test/InnerGeneric<A, B>.constructor<in C, D : R|A|>(): R|test/InnerGeneric.Inner<C, D, A, B>|
}
compiler/testData/loadJava/compiledKotlin/annotations/types/ClassLiteralArgument.fir.k2.txt
Vendored
+1 -1
View File
@@ -27,7 +27,7 @@ public final class Generic<T> : R|kotlin/Any| {
public final class InnerGeneric<A, B> : R|kotlin/Any| {
public constructor<A, B>(): R|test/InnerGeneric<A, B>|
public final inner class Inner<in C, D : R|A|, A, B> : R|kotlin/Any| {
public final inner class Inner<in C, D : R|A|, Outer(A), Outer(B)> : R|kotlin/Any| {
public test/InnerGeneric<A, B>.constructor<in C, D : R|A|>(): R|test/InnerGeneric.Inner<C, D, A, B>|
}
compiler/testData/loadJava/compiledKotlin/class/InnerTypes.fir.txt
Vendored
+3 -3
View File
@@ -3,10 +3,10 @@ public final class Outer<E, F> : R|kotlin/Any| {
public constructor<E, F>(): R|test/Outer<E, F>|
public final inner class Inner<G, H, E, F> : R|kotlin/Any| {
public final inner class Inner<G, H, Outer(E), Outer(F)> : R|kotlin/Any| {
public test/Outer<E, F>.constructor<G, H>(): R|test/Outer.Inner<G, H, E, F>|
public final inner class Inner3<I, G, H, E, F> : R|kotlin/Any| {
public final inner class Inner3<I, Outer(G), Outer(H), Outer(E), Outer(F)> : R|kotlin/Any| {
public final fun foo(x: R|test/Outer.Inner<G, kotlin/Int, kotlin/String, F>|, y: R|test/Outer.Inner<E, kotlin/Double, E, F>|, z: R|test/Outer.Inner.Inner3<kotlin/Double, G, kotlin/Int, kotlin/String, F>|, w: R|test/Outer.Inner.Inner3<*, G, H, E, F>|): R|kotlin/Unit|
public test/Outer.Inner<G, H, E, F>.constructor<I>(): R|test/Outer.Inner.Inner3<I, G, H, E, F>|
@@ -15,7 +15,7 @@ public final class Outer<E, F> : R|kotlin/Any| {
}
public final inner class Inner2<E, F> : R|kotlin/Any| {
public final inner class Inner2<Outer(E), Outer(F)> : R|kotlin/Any| {
public test/Outer<E, F>.constructor(): R|test/Outer.Inner2<E, F>|
}
compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.fir.k1.txt
Vendored
+3 -3
View File
@@ -1,13 +1,13 @@
public final class A<TA> : R|kotlin/Any| {
public constructor<TA>(): R|test/A<TA>|
public final inner class B<TB, TA> : R|kotlin/Any| {
public final inner class B<TB, Outer(TA)> : R|kotlin/Any| {
public test/A<TA>.constructor<TB>(): R|test/A.B<TB, TA>|
public final inner class C<TC, TB, TA> : R|kotlin/Any| {
public final inner class C<TC, Outer(TB), Outer(TA)> : R|kotlin/Any| {
public test/A.B<TB, TA>.constructor<TC>(): R|test/A.B.C<TC, TB, TA>|
public final inner class D<TD, TC, TB, TA> : R|kotlin/Any| {
public final inner class D<TD, Outer(TC), Outer(TB), Outer(TA)> : R|kotlin/Any| {
public final fun bar(ta: R|TA|, tb: R|TB|, tc: R|TC|, td: R|TD|): R|test/A.B.C.D<TD, TC, TB, TA>|
public final fun <P1, P2, P3, P4> foo(p1: R|P1|, p2: R|P2|, p3: R|P3|, p4: R|P4|): R|kotlin/Nothing|
compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.fir.k2.txt
Vendored
+3 -3
View File
@@ -1,13 +1,13 @@
public final class A<TA> : R|kotlin/Any| {
public constructor<TA>(): R|test/A<TA>|
public final inner class B<TB, TA> : R|kotlin/Any| {
public final inner class B<TB, Outer(TA)> : R|kotlin/Any| {
public test/A<TA>.constructor<TB>(): R|test/A.B<TB, TA>|
public final inner class C<TC, TB, TA> : R|kotlin/Any| {
public final inner class C<TC, Outer(TB), Outer(TA)> : R|kotlin/Any| {
public test/A.B<TB, TA>.constructor<TC>(): R|test/A.B.C<TC, TB, TA>|
public final inner class D<TD, TC, TB, TA> : R|kotlin/Any| {
public final inner class D<TD, Outer(TC), Outer(TB), Outer(TA)> : R|kotlin/Any| {
public final fun <P1, P2, P3, P4> foo(p1: R|P1|, p2: R|P2|, p3: R|P3|, p4: R|P4|): R|kotlin/Nothing|
public final fun bar(ta: R|TA|, tb: R|TB|, tc: R|TC|, td: R|TD|): R|test/A.B.C.D<TD, TC, TB, TA>|
compiler/testData/loadJava/compiledKotlin/nestedClasses/innerClassReferencesOuterTP.fir.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
public final class InnerClassReferencesOuterTP<P> : R|kotlin/Any| {
public constructor<P>(): R|test/InnerClassReferencesOuterTP<P>|
public final inner class Inner<Q : R|P|, P> : R|kotlin/Any| {
public final inner class Inner<Q : R|P|, Outer(P)> : R|kotlin/Any| {
public test/InnerClassReferencesOuterTP<P>.constructor<Q : R|P|>(): R|test/InnerClassReferencesOuterTP.Inner<Q, P>|
}
compiler/testData/loadJava/compiledKotlin/nestedClasses/membersReferenceOuterTP.fir.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
public final class MembersReferenceOuterTP<P> : R|kotlin/Any| {
public constructor<P>(): R|test/MembersReferenceOuterTP<P>|
public final inner class Inner<P> : R|kotlin/Any| {
public final inner class Inner<Outer(P)> : R|kotlin/Any| {
public final fun <Q : R|P|> f(): R|kotlin/Unit|
public final fun g(p: R|P|): R|P|