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

FIR: simplify rendering of dispatch & extension receivers

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-08-30 10:21:38 +03:00
parent dfacc2d68f
commit f2c77c45e9
81 changed files with 275 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/fir/multiModule/basic/m2_java_dep(m1-java)/user.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
FILE: user.kt
public final fun foo(hello: R|hello/Hello|): R|kotlin/String| {
^foo D|R|<local>/hello||.R|hello/Hello.msg|
^foo R|<local>/hello|.R|hello/Hello.msg|
}
idea/testData/fir/multiModule/basicWithAnnotatedJava/jvm/jvm.txt
Vendored
+2 -2
View File
@@ -5,8 +5,8 @@ FILE: jvm.kt
}
public final fun test(): R|kotlin/Unit| {
lval x: R|kotlin/String| = D|this@R|/Annotated||.R|/Annotated.foo|(String(123))
lval y: R|kotlin/String| = D|this@R|/Annotated||.R|/Annotated.foo|(Null(null))
lval x: R|kotlin/String| = this@R|/Annotated|.R|/Annotated.foo|(String(123))
lval y: R|kotlin/String| = this@R|/Annotated|.R|/Annotated.foo|(Null(null))
}
}
idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/jvm/jvm.txt
Vendored
+2 -2
View File
@@ -5,8 +5,8 @@ FILE: jvm.kt
}
public final fun test(): R|kotlin/Unit| {
lval x: R|kotlin/String| = D|this@R|/AnnotatedDerived||.R|/AnnotatedDerived.foo|(String(123))
lval y: R|kotlin/String| = D|this@R|/AnnotatedDerived||.R|/AnnotatedDerived.foo|(Null(null))
lval x: R|kotlin/String| = this@R|/AnnotatedDerived|.R|/AnnotatedDerived.foo|(String(123))
lval y: R|kotlin/String| = this@R|/AnnotatedDerived|.R|/AnnotatedDerived.foo|(Null(null))
}
}
idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/simpleFakeOverride.txt
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ FILE: simpleFakeOverride.kt
}
public final fun test(): R|kotlin/Unit| {
D|this@R|/A||.R|FakeOverride</A.foo: R|ft<Some, Some?>!|>|(R|/Some.Some|())
this@R|/A|.R|FakeOverride</A.foo: R|ft<Some, Some?>!|>|(R|/Some.Some|())
}
}
idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/jvm.txt
Vendored
+3 -3
View File
@@ -5,9 +5,9 @@ FILE: jvm.kt
}
public final fun test(): R|kotlin/Unit| {
lval res1: R|kotlin/Boolean| = D|this@R|/Some||.R|/Some.foo|(Int(1))
lval res2: R|kotlin/Boolean| = D|this@R|/Some||.R|/Some.foo|(D|Int(1)|.R|kotlin/Int.unaryMinus|())
lval res3: R|kotlin/Array<ft<kotlin/String, kotlin/String?>!>| = D|this@R|/Some||.R|/Some.bar|(R|kotlin/intArrayOf|(Int(0), Int(2), D|Int(2)|.R|kotlin/Int.unaryMinus|()))
lval res1: R|kotlin/Boolean| = this@R|/Some|.R|/Some.foo|(Int(1))
lval res2: R|kotlin/Boolean| = this@R|/Some|.R|/Some.foo|(Int(1).R|kotlin/Int.unaryMinus|())
lval res3: R|kotlin/Array<ft<kotlin/String, kotlin/String?>!>| = this@R|/Some|.R|/Some.bar|(R|kotlin/intArrayOf|(Int(0), Int(2), Int(2).R|kotlin/Int.unaryMinus|()))
}
}
idea/testData/fir/multiModule/fieldAccessFromDerived/jvm/Derived.txt
Vendored
+2 -2
View File
@@ -5,11 +5,11 @@ FILE: Derived.kt
}
public final fun getValue(): <ERROR TYPE REF: cycle> {
^getValue D|this@R|/Base||.R|/Base.value|
^getValue this@R|/Base|.R|/Base.value|
}
public final fun foo(): R|kotlin/Int| {
^foo D|this@R|/Base||.R|/Base.value|
^foo this@R|/Base|.R|/Base.value|
}
}
idea/testData/fir/multiModule/javaGetPrefixConflict/jvm/Test.txt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
FILE: Test.kt
public final fun test(): R|kotlin/Unit| {
lval jc: R|JavaClass| = R|/JavaClass.JavaClass|()
lval result: R|ft<kotlin/String, kotlin/String?>!| = D|R|<local>/jc||.R|/JavaClass.text|
lval result: R|ft<kotlin/String, kotlin/String?>!| = R|<local>/jc|.R|/JavaClass.text|
}
public final fun otherTest(jc: R|JavaClass|): R|kotlin/Unit| {
lval result: R|ft<kotlin/String, kotlin/String?>!| = D|R|<local>/jc||.R|/JavaClass.text|
lval result: R|ft<kotlin/String, kotlin/String?>!| = R|<local>/jc|.R|/JavaClass.text|
}
idea/testData/fir/multiModule/javaInheritsKotlinDerived/jvm/Test.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
FILE: Test.kt
public final fun test(): R|kotlin/Unit| {
lval jc: R|JavaClass| = R|/JavaClass.JavaClass|()
lval result: R|kotlin/String| = D|R|<local>/jc||.R|/Derived.some|
lval result: R|kotlin/String| = R|<local>/jc|.R|/Derived.some|
}
idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Test.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ FILE: Test.kt
}
public final fun test(): R|kotlin/Unit| {
D|this@R|/Inheritor||E|this@R|/Tester||.R|/Inheritor.foo|(String(abc), Int(456))
(this@R|/Inheritor|, this@R|/Tester|).R|/Inheritor.foo|(String(abc), Int(456))
}
}
idea/testData/fir/multiModule/javaSyntheticProperty/jvm/Test.txt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
FILE: Test.kt
public final val x: R|ft<kotlin/String, kotlin/String?>!| = D|R|/JavaClass.JavaClass|()|.R|/JavaClass.foo|
public final val x: R|ft<kotlin/String, kotlin/String?>!| = R|/JavaClass.JavaClass|().R|/JavaClass.foo|
public get(): R|ft<kotlin/String, kotlin/String?>!|
idea/testData/fir/multiModule/mppFakeOverrides/common/common.txt
Vendored
+1 -1
View File
@@ -23,7 +23,7 @@ FILE: common.kt
}
public open fun baz(arg: R|kotlin/CharSequence|): R|kotlin/String| {
^baz D|R|<local>/arg||.R|kotlin/Any.toString|()
^baz R|<local>/arg|.R|kotlin/Any.toString|()
}
}
idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.txt
Vendored
+3 -3
View File
@@ -22,9 +22,9 @@ FILE: jvm.kt
}
public final fun test(): R|kotlin/Unit| {
D|this@R|/A||.R|FakeOverride</A.foo: R|kotlin/Unit|>|(String())
D|this@R|/C||.R|/C.bar|(String())
D|this@R|/A||.R|FakeOverride</A.baz: R|kotlin/String|>|(String())
this@R|/A|.R|FakeOverride</A.foo: R|kotlin/Unit|>|(String())
this@R|/C|.R|/C.bar|(String())
this@R|/A|.R|FakeOverride</A.baz: R|kotlin/String|>|(String())
}
}
idea/testData/fir/multiModule/mppMemberType/jvm/jvm.txt
Vendored
+6 -6
View File
@@ -18,14 +18,14 @@ FILE: jvm.kt
}
public final fun useMember(): R|kotlin/Unit| {
D|this@R|/MyList||.R|/MyList.get|(Int(1))
D|this@R|/MyList||.R|/MyList.set|(Int(2), Int(3))
this@R|/MyList|.R|/MyList.get|(Int(1))
this@R|/MyList|.R|/MyList.set|(Int(2), Int(3))
}
}
public final fun useList(list: R|MyList|): R|kotlin/Unit| {
D|R|<local>/list||.R|/MyList.get|(Int(1))
D|R|<local>/list||.R|/MyList.set|(Int(2), Int(3))
R|<local>/list|.R|/MyList.get|(Int(1))
R|<local>/list|.R|/MyList.set|(Int(2), Int(3))
}
public final class DerivedWrapper : R|Wrapper| {
public constructor(): R|DerivedWrapper| {
@@ -33,8 +33,8 @@ FILE: jvm.kt
}
public final fun use(): R|kotlin/Unit| {
D|D|this@R|/Wrapper||.R|/Wrapper.list||.R|/MyList.get|(Int(1))
D|D|this@R|/Wrapper||.R|/Wrapper.list||.R|/MyList.set|(Int(2), Int(3))
this@R|/Wrapper|.R|/Wrapper.list|.R|/MyList.get|(Int(1))
this@R|/Wrapper|.R|/Wrapper.list|.R|/MyList.set|(Int(2), Int(3))
}
}
idea/testData/fir/multiModule/mppMembers/jvm/jvm.txt
Vendored
+4 -4
View File
@@ -17,8 +17,8 @@ FILE: jvm.kt
}
public final fun test(): R|kotlin/Unit| {
D|this@R|/A||.R|/A.foo|()
D|this@R|/A||.R|/A.bar|()
this@R|/A|.R|/A.foo|()
this@R|/A|.R|/A.bar|()
}
}
@@ -28,8 +28,8 @@ FILE: jvm.kt
}
public final fun test(): R|kotlin/Unit| {
D|this@R|/A||.R|/A.foo|()
D|this@R|/A||.R|/A.bar|()
this@R|/A|.R|/A.foo|()
this@R|/A|.R|/A.bar|()
}
}
idea/testData/fir/multiModule/mppSuperTypes/jvm/jvm.txt
Vendored
+6 -6
View File
@@ -28,9 +28,9 @@ FILE: jvm.kt
}
public final fun test(): R|kotlin/Unit| {
D|this@R|/A||.R|/A.foo|()
D|this@R|/X||.R|/X.bar|()
D|this@R|/Y||.R|/Y.baz|()
this@R|/A|.R|/A.foo|()
this@R|/X|.R|/X.bar|()
this@R|/Y|.R|/Y.baz|()
}
}
@@ -40,9 +40,9 @@ FILE: jvm.kt
}
public final fun test(): R|kotlin/Unit| {
D|this@R|/A||.R|/A.foo|()
D|this@R|/X||.R|/X.bar|()
D|this@R|/Y||.R|/Y.baz|()
this@R|/A|.R|/A.foo|()
this@R|/X|.R|/X.bar|()
this@R|/Y|.R|/Y.baz|()
}
}
idea/testData/fir/multiModule/overrideWithJava/jvm/B.txt
Vendored
+2 -2
View File
@@ -13,8 +13,8 @@ FILE: B.kt
}
public final fun test(): R|kotlin/Unit| {
D|this@R|/B||.R|/B.foo|()
D|this@R|/B||.R|/B.bar|()
this@R|/B|.R|/B.foo|()
this@R|/B|.R|/B.bar|()
}
}