diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt index 0d067140544..b388bdd3fe8 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt @@ -14,18 +14,18 @@ FILE: destructuring.kt public? get(): String public final fun component1(): { - ^component1 D|this@R|/Some||.R|/Some.first| + ^component1 this@R|/Some|.R|/Some.first| } public final fun component2(): { - ^component2 D|this@R|/Some||.R|/Some.second| + ^component2 this@R|/Some|.R|/Some.second| } public final fun component3(): { - ^component3 D|this@R|/Some||.R|/Some.third| + ^component3 this@R|/Some|.R|/Some.third| } - public final fun copy(first: Int = D|this@R|/Some||.R|/Some.first|, second: Double = D|this@R|/Some||.R|/Some.second|, third: String = D|this@R|/Some||.R|/Some.third|): R|Some| { + public final fun copy(first: Int = this@R|/Some|.R|/Some.first|, second: Double = this@R|/Some|.R|/Some.second|, third: String = this@R|/Some|.R|/Some.third|): R|Some| { } } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt index dfa9ae8f264..4cf12709064 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt @@ -36,14 +36,14 @@ FILE: for.kt public? get(): Int public final fun component1(): { - ^component1 D|this@R|/Some||.R|/Some.x| + ^component1 this@R|/Some|.R|/Some.x| } public final fun component2(): { - ^component2 D|this@R|/Some||.R|/Some.y| + ^component2 this@R|/Some|.R|/Some.y| } - public final fun copy(x: Int = D|this@R|/Some||.R|/Some.x|, y: Int = D|this@R|/Some||.R|/Some.y|): R|Some| { + public final fun copy(x: Int = this@R|/Some|.R|/Some.x|, y: Int = this@R|/Some|.R|/Some.y|): R|Some| { } } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt index 57c36128e49..e07574e4583 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt @@ -11,14 +11,14 @@ FILE: lambda.kt public? get(): Int public final fun component1(): { - ^component1 D|this@R|/Tuple||.R|/Tuple.x| + ^component1 this@R|/Tuple|.R|/Tuple.x| } public final fun component2(): { - ^component2 D|this@R|/Tuple||.R|/Tuple.y| + ^component2 this@R|/Tuple|.R|/Tuple.y| } - public final fun copy(x: Int = D|this@R|/Tuple||.R|/Tuple.x|, y: Int = D|this@R|/Tuple||.R|/Tuple.y|): R|Tuple| { + public final fun copy(x: Int = this@R|/Tuple|.R|/Tuple.x|, y: Int = this@R|/Tuple|.R|/Tuple.y|): R|Tuple| { } } diff --git a/compiler/fir/resolve/testData/resolve/copy.txt b/compiler/fir/resolve/testData/resolve/copy.txt index 6b0efa73ca7..d306225a7f0 100644 --- a/compiler/fir/resolve/testData/resolve/copy.txt +++ b/compiler/fir/resolve/testData/resolve/copy.txt @@ -11,20 +11,20 @@ FILE: copy.kt public get(): R|kotlin/String| public final fun component1(): R|kotlin/Int| { - ^component1 D|this@R|/Some||.R|/Some.x| + ^component1 this@R|/Some|.R|/Some.x| } public final fun component2(): R|kotlin/String| { - ^component2 D|this@R|/Some||.R|/Some.y| + ^component2 this@R|/Some|.R|/Some.y| } - public final fun copy(x: R|kotlin/Int| = D|this@R|/Some||.R|/Some.x|, y: R|kotlin/String| = D|this@R|/Some||.R|/Some.y|): R|Some| { + public final fun copy(x: R|kotlin/Int| = this@R|/Some|.R|/Some.x|, y: R|kotlin/String| = this@R|/Some|.R|/Some.y|): R|Some| { } } public final fun test(some: R|Some|): R|kotlin/Unit| { - lval other: R|Some| = D|R|/some||.R|/Some.copy|(y = String(123)) - lval another: R|Some| = D|R|/some||.R|/Some.copy|(x = Int(123)) - lval same: R|Some| = D|R|/some||.R|/Some.copy|() - lval different: R|Some| = D|R|/some||.R|/Some.copy|(Int(456), String(456)) + lval other: R|Some| = R|/some|.R|/Some.copy|(y = String(123)) + lval another: R|Some| = R|/some|.R|/Some.copy|(x = Int(123)) + lval same: R|Some| = R|/some|.R|/Some.copy|() + lval different: R|Some| = R|/some|.R|/Some.copy|(Int(456), String(456)) } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/access.txt b/compiler/fir/resolve/testData/resolve/expresssions/access.txt index 11142a4bdb2..48f29ca4a2f 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/access.txt +++ b/compiler/fir/resolve/testData/resolve/expresssions/access.txt @@ -8,11 +8,11 @@ FILE: access.kt public get(): R|kotlin/Int| public final fun abc(): R|kotlin/Int| { - ^abc D|this@R|/Foo||.R|/Foo.x| + ^abc this@R|/Foo|.R|/Foo.x| } public final fun cba(): R|kotlin/Int| { - ^cba D|this@R|/Foo||.R|/Foo.abc|() + ^cba this@R|/Foo|.R|/Foo.abc|() } } @@ -25,7 +25,7 @@ FILE: access.kt public get(): R|kotlin/String| public final fun R|Foo|.abc(): R|kotlin/Int| { - ^abc D|this@R|/Foo||.R|/Foo.x| + ^abc this@R|/Foo|.R|/Foo.x| } public final fun bar(): R|Bar| { @@ -37,16 +37,16 @@ FILE: access.kt } public final fun R|Foo|.check(): { - ^check D|this@R|/Foo||.R|/Foo.abc|().#(D|this@R|/Bar||.R|/Bar.bar|()) + ^check this@R|/Foo|.R|/Foo.abc|().#(this@R|/Bar|.R|/Bar.bar|()) } public final fun R|Foo|.check2(): R|kotlin/String| { - ^check2 D|String()|.R|kotlin/String.plus|(D|this@R|/Bar||.R|/Bar.bar|()) + ^check2 String().R|kotlin/String.plus|(this@R|/Bar|.R|/Bar.bar|()) } } public final fun R|Foo|.ext(): R|kotlin/Int| { - ^ext D|this@R|/Foo||.R|/Foo.x| + ^ext this@R|/Foo|.R|/Foo.x| } public final fun bar(): R|kotlin/Unit| { } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/companion.txt b/compiler/fir/resolve/testData/resolve/expresssions/companion.txt index 3a63510655d..27b77514e9a 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/companion.txt +++ b/compiler/fir/resolve/testData/resolve/expresssions/companion.txt @@ -18,7 +18,7 @@ FILE: companion.kt } public final fun bar(): R|kotlin/Unit| { - D|this@R|/A.Companion||.R|/A.Companion.foo|() + this@R|/A.Companion|.R|/A.Companion.foo|() } } @@ -42,10 +42,10 @@ FILE: companion.kt } public final fun test(): R|kotlin/Unit| { - D|Q|A||.R|/A.Companion.foo|() - D|Q|B||.R|/A.bar|() - D|Q|B||.R|/B.Companion.baz|() - lval x: R|kotlin/String| = D|Q|A||.R|/A.Companion.D| - lval y: R|kotlin/String| = D|Q|B||.R|/B.Companion.C| + Q|A|.R|/A.Companion.foo|() + Q|B|.R|/A.bar|() + Q|B|.R|/B.Companion.baz|() + lval x: R|kotlin/String| = Q|A|.R|/A.Companion.D| + lval y: R|kotlin/String| = Q|B|.R|/B.Companion.C| lval z: = Q|B|.# } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/companionExtension.txt b/compiler/fir/resolve/testData/resolve/expresssions/companionExtension.txt index 29ce9f03769..61d6dbe45de 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/companionExtension.txt +++ b/compiler/fir/resolve/testData/resolve/expresssions/companionExtension.txt @@ -15,7 +15,7 @@ FILE: companionExtension.kt } public final fun test(): R|kotlin/Unit| { - D|this@R|/My.Companion||E|this@R|/My||.R|/My.Companion.foo|() + (this@R|/My.Companion|, this@R|/My|).R|/My.Companion.foo|() } } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/constructor.txt b/compiler/fir/resolve/testData/resolve/expresssions/constructor.txt index 627d993f1a9..f058ed078a9 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/constructor.txt +++ b/compiler/fir/resolve/testData/resolve/expresssions/constructor.txt @@ -13,5 +13,5 @@ FILE: constructor.kt ^foo R|/C.C|() } public final fun bar(): R|C| { - ^bar D|R|/foo|()|.R|/C.create|() + ^bar R|/foo|().R|/C.create|() } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/dispatchReceiver.txt b/compiler/fir/resolve/testData/resolve/expresssions/dispatchReceiver.txt index a2d1a85363f..b8dcccf8d6e 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/dispatchReceiver.txt +++ b/compiler/fir/resolve/testData/resolve/expresssions/dispatchReceiver.txt @@ -13,7 +13,7 @@ FILE: dispatchReceiver.kt public set(value: R|Base|): R|kotlin/Unit| public final fun check(): R|kotlin/Unit| { - ^check D|D|this@R|/My||.R|/My.delegate||.R|/Base.check|() + ^check this@R|/My|.R|/My.delegate|.R|/Base.check|() } } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/importedReceiver.txt b/compiler/fir/resolve/testData/resolve/expresssions/importedReceiver.txt index 596bc9828c5..474de0c8a06 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/importedReceiver.txt +++ b/compiler/fir/resolve/testData/resolve/expresssions/importedReceiver.txt @@ -24,12 +24,12 @@ FILE: importedReceiver.kt } public final fun test(): R|kotlin/Unit| { - E|Int(42)|.R|/foo|() - E|String()|.R|/foo|() - D|this@R|/My||E|Int(42)|.R|/My.bar|() - D|this@R|/My||E|String()|.R|/My.bar|() - D|this@R|/My||.R|/My.baz|() - D|this@R|/My||E|Boolean(true)|.R|/My.gau|() - D|this@R|/Your||.R|FakeOverride|() + Int(42).R|/foo|() + String().R|/foo|() + (this@R|/My|, Int(42)).R|/My.bar|() + (this@R|/My|, String()).R|/My.bar|() + this@R|/My|.R|/My.baz|() + (this@R|/My|, Boolean(true)).R|/My.gau|() + this@R|/Your|.R|FakeOverride|() Boolean(false).#() } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver.txt b/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver.txt index b03cf755382..0f65fc45544 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver.txt +++ b/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver.txt @@ -14,7 +14,7 @@ FILE: explicitReceiver.kt } public final fun bar(): R|Foo| { - ^bar D|D|this@R|/Foo||.R|/Foo.x||.R|/Foo.invoke|() + ^bar this@R|/Foo|.R|/Foo.x|.R|/Foo.invoke|() } } @@ -34,7 +34,7 @@ FILE: explicitReceiver.kt } public final fun baz(): R|kotlin/Unit| { - D|this@R|/Bar||.R|/Bar.x|() + this@R|/Bar|.R|/Bar.x|() } } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver2.txt b/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver2.txt index 840a61feef8..a6c75772294 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver2.txt +++ b/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver2.txt @@ -24,7 +24,7 @@ FILE: explicitReceiver2.kt public get(): R|Bar| public final fun bar(): R|Foo| { - ^bar D|D|this@R|/Foo||.R|/Foo.x||.R|/Bar.invoke|() + ^bar this@R|/Foo|.R|/Foo.x|.R|/Bar.invoke|() } } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/invoke/extension.txt b/compiler/fir/resolve/testData/resolve/expresssions/invoke/extension.txt index 8a5f3f992d2..ca0560cdcff 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/invoke/extension.txt +++ b/compiler/fir/resolve/testData/resolve/expresssions/invoke/extension.txt @@ -14,7 +14,7 @@ FILE: extension.kt public get(): R|kotlin/Int| public final fun foo(): R|Foo| { - ^foo D|this@R|/Foo||E|D|this@R|/Foo||.R|/Foo.x||.R|/Foo.invoke|() + ^foo (this@R|/Foo|, this@R|/Foo|.R|/Foo.x|).R|/Foo.invoke|() } } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/invoke/implicitTypeOrder.txt b/compiler/fir/resolve/testData/resolve/expresssions/invoke/implicitTypeOrder.txt index 2eccbbc2172..122a093634f 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/invoke/implicitTypeOrder.txt +++ b/compiler/fir/resolve/testData/resolve/expresssions/invoke/implicitTypeOrder.txt @@ -5,7 +5,7 @@ FILE: implicitTypeOrder.kt } public final fun bar(): R|A| { - ^bar D|R|/foo||.R|/A.invoke|() + ^bar R|/foo|.R|/A.invoke|() } public final fun invoke(): R|A| { diff --git a/compiler/fir/resolve/testData/resolve/expresssions/invoke/propertyFromParameter.txt b/compiler/fir/resolve/testData/resolve/expresssions/invoke/propertyFromParameter.txt index fb0c496717b..6b3f2ecc410 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/invoke/propertyFromParameter.txt +++ b/compiler/fir/resolve/testData/resolve/expresssions/invoke/propertyFromParameter.txt @@ -4,7 +4,7 @@ FILE: propertyFromParameter.kt super() } - public final val name: R|kotlin/String| = D|R|/name||.R|FakeOverride|() + public final val name: R|kotlin/String| = R|/name|.R|FakeOverride|() public get(): R|kotlin/String| } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/invoke/simple.txt b/compiler/fir/resolve/testData/resolve/expresssions/invoke/simple.txt index b3951449ebe..66e16836aa6 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/invoke/simple.txt +++ b/compiler/fir/resolve/testData/resolve/expresssions/invoke/simple.txt @@ -10,5 +10,5 @@ FILE: simple.kt } public final fun test(s: R|Simple|): R|kotlin/Unit| { - lval result: R|kotlin/String| = D|R|/s||.R|/Simple.invoke|() + lval result: R|kotlin/String| = R|/s|.R|/Simple.invoke|() } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/localExtension.txt b/compiler/fir/resolve/testData/resolve/expresssions/localExtension.txt index 4a0c9040ed5..8c25e323e66 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/localExtension.txt +++ b/compiler/fir/resolve/testData/resolve/expresssions/localExtension.txt @@ -8,7 +8,7 @@ FILE: localExtension.kt local final fun R|Foo|.bar(): R|kotlin/Unit| { } - E|this@R|/Foo||.R|/bar|() + this@R|/Foo|.R|/bar|() } } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/memberExtension.txt b/compiler/fir/resolve/testData/resolve/expresssions/memberExtension.txt index 5a2ba297e4f..c6b56b6b65f 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/memberExtension.txt +++ b/compiler/fir/resolve/testData/resolve/expresssions/memberExtension.txt @@ -5,7 +5,7 @@ FILE: memberExtension.kt } public final fun bar(arg: R|Bar|): R|kotlin/Unit| { - E|R|/arg||.R|/foo|() + R|/arg|.R|/foo|() } } @@ -20,7 +20,7 @@ FILE: memberExtension.kt } public final fun bar(arg: R|Foo|): R|kotlin/Unit| { - D|this@R|/Bar||E|R|/arg||.R|/Bar.foo|() + (this@R|/Bar|, R|/arg|).R|/Bar.foo|() } } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/objects.txt b/compiler/fir/resolve/testData/resolve/expresssions/objects.txt index 4262d48774f..850e089eafe 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/objects.txt +++ b/compiler/fir/resolve/testData/resolve/expresssions/objects.txt @@ -13,5 +13,5 @@ FILE: objects.kt ^use Q|A| } public final fun bar(): R|A| { - ^bar D|Q|A||.R|/A.foo|() + ^bar Q|A|.R|/A.foo|() } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/outerObject.txt b/compiler/fir/resolve/testData/resolve/expresssions/outerObject.txt index 8a07462c128..90a58eb9711 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/outerObject.txt +++ b/compiler/fir/resolve/testData/resolve/expresssions/outerObject.txt @@ -15,11 +15,11 @@ FILE: outerObject.kt super() } - public final val y: R|kotlin/Int| = D|this@R|/Outer||.R|/Outer.x| + public final val y: R|kotlin/Int| = this@R|/Outer|.R|/Outer.x| public get(): R|kotlin/Int| public final fun test(): R|kotlin/Unit| { - D|this@R|/Outer||E|this@R|/Outer.Nested||.R|/Outer.foo|() + (this@R|/Outer|, this@R|/Outer.Nested|).R|/Outer.foo|() } } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/qualifiedExpressions.txt b/compiler/fir/resolve/testData/resolve/expresssions/qualifiedExpressions.txt index 548b1d64681..d853eb13249 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/qualifiedExpressions.txt +++ b/compiler/fir/resolve/testData/resolve/expresssions/qualifiedExpressions.txt @@ -47,11 +47,11 @@ FILE: qualifiedExpressions.kt public get(): R|kotlin/Int| public final fun main(): R|kotlin/Unit| { Q|a/b|.R|a/b/foo|() - D|Q|a/b/C||.R|a/b/C.Companion.foo|() - D|Q|a/b/C.D||.R|a/b/C.D.foo|() + Q|a/b/C|.R|a/b/C.Companion.foo|() + Q|a/b/C.D|.R|a/b/C.D.foo|() lval x: R|kotlin/Int| = Q|a/b|.R|a/b/f| - D|Q|a/b/C||.R|a/b/C.Companion.foo|() - D|R|a/b/C.C|()|.R|a/b/C.foo|() + Q|a/b/C|.R|a/b/C.Companion.foo|() + R|a/b/C.C|().R|a/b/C.foo|() lval e: R|a/b/E| = Q|a/b/E.entry| lval e1: R|a/b/E| = Q|a/b/E.entry| } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/receiverConsistency.txt b/compiler/fir/resolve/testData/resolve/expresssions/receiverConsistency.txt index 64a9de9e8c0..59c45cc154d 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/receiverConsistency.txt +++ b/compiler/fir/resolve/testData/resolve/expresssions/receiverConsistency.txt @@ -27,7 +27,7 @@ FILE: receiverConsistency.kt public final fun test(): R|kotlin/Unit| { lval c: R|C| = R|/C.C|() R|/foo|() - D|R|/c||.R|/C.bar|() + R|/c|.R|/C.bar|() lval err: R|C| = R|/C.C|() R|/err|.#() } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/sameReceiver.txt b/compiler/fir/resolve/testData/resolve/expresssions/sameReceiver.txt index 38ce34d4a50..3b22effbf03 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/sameReceiver.txt +++ b/compiler/fir/resolve/testData/resolve/expresssions/sameReceiver.txt @@ -8,7 +8,7 @@ FILE: sameReceiver.kt } public final fun test(): R|kotlin/Unit| { - D|this@R|/Foo||E|this@R|/Foo||.R|/Foo.bar|() + (this@R|/Foo|, this@R|/Foo|).R|/Foo.bar|() } } diff --git a/compiler/fir/resolve/testData/resolve/extension.txt b/compiler/fir/resolve/testData/resolve/extension.txt index 86d33a913f6..a03298319c8 100644 --- a/compiler/fir/resolve/testData/resolve/extension.txt +++ b/compiler/fir/resolve/testData/resolve/extension.txt @@ -2,7 +2,7 @@ FILE: extension.kt public final fun R|kotlin/String|.foo(): R|kotlin/Unit| { } public final fun R|kotlin/String|.bar(): R|kotlin/Unit| { - E|this@R|/bar||.R|/foo|() + this@R|/bar|.R|/foo|() } public final class My : R|kotlin/Any| { public constructor(): R|My| { @@ -10,7 +10,7 @@ FILE: extension.kt } public final fun bar(): R|kotlin/Unit| { - E|this@R|/My||.R|/foo|() + this@R|/My|.R|/foo|() } } diff --git a/compiler/fir/resolve/testData/resolve/fib.txt b/compiler/fir/resolve/testData/resolve/fib.txt index 5479b1bdd9c..be7cde8c29f 100644 --- a/compiler/fir/resolve/testData/resolve/fib.txt +++ b/compiler/fir/resolve/testData/resolve/fib.txt @@ -10,10 +10,10 @@ FILE: fib.kt lvar current: R|kotlin/Int| = Int(1) lvar prev: R|kotlin/Int| = Int(1) - lval : R|kotlin/ranges/IntRange| = D|Int(2)|.R|kotlin/Int.rangeTo|(R|/n|) - lval : R|kotlin/collections/IntIterator| = D|R|/||.R|kotlin/ranges/IntProgression.iterator|() - while(D|R|/||.R|FakeOverride|()) { - lval i: R|kotlin/Int| = D|R|/||.R|kotlin/collections/IntIterator.next|() + lval : R|kotlin/ranges/IntRange| = Int(2).R|kotlin/Int.rangeTo|(R|/n|) + lval : R|kotlin/collections/IntIterator| = R|/|.R|kotlin/ranges/IntProgression.iterator|() + while(R|/|.R|FakeOverride|()) { + lval i: R|kotlin/Int| = R|/|.R|kotlin/collections/IntIterator.next|() lval temp: R|kotlin/Int| = R|/current| R|/current| += R|/prev| R|/prev| = R|/temp| diff --git a/compiler/fir/resolve/testData/resolve/fromBuilder/enums.txt b/compiler/fir/resolve/testData/resolve/fromBuilder/enums.txt index 284887f2cea..d7a0f69c67e 100644 --- a/compiler/fir/resolve/testData/resolve/fromBuilder/enums.txt +++ b/compiler/fir/resolve/testData/resolve/fromBuilder/enums.txt @@ -70,7 +70,7 @@ FILE: enums.kt } - public final val g: R|kotlin/Double| = D|D|D|this@R|/Planet.Companion||.R|/Planet.Companion.G||.R|kotlin/Double.times|(R|/m|)|.R|kotlin/Double.div|(D|R|/r||.R|kotlin/Double.times|(R|/r|)) + public final val g: R|kotlin/Double| = this@R|/Planet.Companion|.R|/Planet.Companion.G|.R|kotlin/Double.times|(R|/m|).R|kotlin/Double.div|(R|/r|.R|kotlin/Double.times|(R|/r|)) public get(): R|kotlin/Double| public abstract fun sayHello(): R|kotlin/Unit| diff --git a/compiler/fir/resolve/testData/resolve/fromBuilder/noPrimaryConstructor.txt b/compiler/fir/resolve/testData/resolve/fromBuilder/noPrimaryConstructor.txt index 0c78d207cc8..20a04461b55 100644 --- a/compiler/fir/resolve/testData/resolve/fromBuilder/noPrimaryConstructor.txt +++ b/compiler/fir/resolve/testData/resolve/fromBuilder/noPrimaryConstructor.txt @@ -5,7 +5,7 @@ FILE: noPrimaryConstructor.kt public constructor(x: R|kotlin/String|): R|NoPrimary| { super() - D|this@R|/NoPrimary||.R|/NoPrimary.x| = R|/x| + this@R|/NoPrimary|.R|/NoPrimary.x| = R|/x| } public constructor(): R|NoPrimary| { diff --git a/compiler/fir/resolve/testData/resolve/fromBuilder/simpleClass.txt b/compiler/fir/resolve/testData/resolve/fromBuilder/simpleClass.txt index 356340f905a..27934611dea 100644 --- a/compiler/fir/resolve/testData/resolve/fromBuilder/simpleClass.txt +++ b/compiler/fir/resolve/testData/resolve/fromBuilder/simpleClass.txt @@ -15,7 +15,7 @@ FILE: simpleClass.kt private get(): R|kotlin/Int| public final override fun foo(x: R|kotlin/Int|, y: R|kotlin/String|): R|kotlin/String| { - ^foo D|D|R|/y||.R|kotlin/String.plus|(R|/x|)|.R|kotlin/String.plus|(D|this@R|/SomeClass||.R|/SomeClass.baz|) + ^foo R|/y|.R|kotlin/String.plus|(R|/x|).R|kotlin/String.plus|(this@R|/SomeClass|.R|/SomeClass.baz|) } public final override var bar: R|kotlin/Boolean| diff --git a/compiler/fir/resolve/testData/resolve/functionTypes.txt b/compiler/fir/resolve/testData/resolve/functionTypes.txt index 920546e10d4..3f2ecccc3a7 100644 --- a/compiler/fir/resolve/testData/resolve/functionTypes.txt +++ b/compiler/fir/resolve/testData/resolve/functionTypes.txt @@ -1,6 +1,6 @@ FILE: functionTypes.kt public final fun simpleRun(f: R|kotlin/Function1|): R|kotlin/Unit| { - ^simpleRun D|R|/f||.R|FakeOverride|(^simpleRun Unit) + ^simpleRun R|/f|.R|FakeOverride|(^simpleRun Unit) } public final fun R|kotlin/collections/List|.simpleMap(f: R|kotlin/Function1|): R|R| { } diff --git a/compiler/fir/resolve/testData/resolve/localObject.txt b/compiler/fir/resolve/testData/resolve/localObject.txt index 70892f47516..8b46686c66b 100644 --- a/compiler/fir/resolve/testData/resolve/localObject.txt +++ b/compiler/fir/resolve/testData/resolve/localObject.txt @@ -1,6 +1,6 @@ FILE: localObject.kt public final fun run(block: R|kotlin/Function0|): R|T| { - ^run D|R|/block||.R|FakeOverride|() + ^run R|/block|.R|FakeOverride|() } public abstract interface Foo : R|kotlin/Any| { public abstract fun foo(): R|kotlin/Int| @@ -14,7 +14,7 @@ FILE: localObject.kt } public final override fun foo(): R|kotlin/Int| { - ^foo D|R|/x||.R|kotlin/Int.plus|(Int(1)) + ^foo R|/x|.R|kotlin/Int.plus|(Int(1)) } } @@ -40,12 +40,12 @@ FILE: localObject.kt } public final override fun foo(): R|kotlin/Int| { - ^foo D|D|this@R|/TestProperty||.R|/TestProperty.intConst||.R|kotlin/Int.plus|(Int(1)) + ^foo this@R|/TestProperty|.R|/TestProperty.intConst|.R|kotlin/Int.plus|(Int(1)) } } - D|this@R|/TestProperty||.F|/TestProperty.x| = R|/value| + this@R|/TestProperty|.F|/TestProperty.x| = R|/value| } public final val y: R|kotlin/Int| @@ -56,7 +56,7 @@ FILE: localObject.kt } public final override fun foo(): R|kotlin/Int| { - ^foo D|D|this@R|/TestProperty||.R|/TestProperty.intConst||.R|kotlin/Int.plus|(Int(1)) + ^foo this@R|/TestProperty|.R|/TestProperty.intConst|.R|kotlin/Int.plus|(Int(1)) } } @@ -71,7 +71,7 @@ FILE: localObject.kt } public final override fun foo(): R|kotlin/Int| { - ^foo D|D|this@R|/TestProperty||.R|/TestProperty.x||.R|kotlin/Int.plus|(Int(1)) + ^foo this@R|/TestProperty|.R|/TestProperty.x|.R|kotlin/Int.plus|(Int(1)) } } diff --git a/compiler/fir/resolve/testData/resolve/multifile/importFromObject.txt b/compiler/fir/resolve/testData/resolve/multifile/importFromObject.txt index cbc342b16aa..a0f9b2f6ec6 100644 --- a/compiler/fir/resolve/testData/resolve/multifile/importFromObject.txt +++ b/compiler/fir/resolve/testData/resolve/multifile/importFromObject.txt @@ -1,4 +1,4 @@ FILE: importFromObject.kt public final fun bar(): R|kotlin/Unit| { - D|this@R|a/A||.R|a/A.foo|() + this@R|a/A|.R|a/A.foo|() } diff --git a/compiler/fir/resolve/testData/resolve/nested/inner.txt b/compiler/fir/resolve/testData/resolve/nested/inner.txt index 9abe46c7a5a..d4e4e9db0d8 100644 --- a/compiler/fir/resolve/testData/resolve/nested/inner.txt +++ b/compiler/fir/resolve/testData/resolve/nested/inner.txt @@ -5,13 +5,13 @@ FILE: inner.kt } public final fun foo(): R|kotlin/Unit| { - D|this@R|/Owner||.R|/Owner.bar|() - D|this@R|/Owner||.R|/Owner.bar|() + this@R|/Owner|.R|/Owner.bar|() + this@R|/Owner|.R|/Owner.bar|() } public final fun bar(): R|kotlin/Unit| { lval i: R|Owner.Inner| = R|/Owner.Inner.Inner|() - D|R|/i||.R|/Owner.Inner.baz|() + R|/i|.R|/Owner.Inner.baz|() } public final fun err(): R|kotlin/Unit| { @@ -23,15 +23,15 @@ FILE: inner.kt } public final fun baz(): R|kotlin/Unit| { - D|this@R|/Owner.Inner||.R|/Owner.Inner.gau|() - D|this@R|/Owner.Inner||.R|/Owner.Inner.gau|() + this@R|/Owner.Inner|.R|/Owner.Inner.gau|() + this@R|/Owner.Inner|.R|/Owner.Inner.gau|() } public final fun gau(): R|kotlin/Unit| { lval o: R|Owner| = R|/Owner.Owner|() - D|R|/o||.R|/Owner.foo|() - D|this@R|/Owner||.R|/Owner.foo|() - D|this@R|/Owner||.R|/Owner.foo|() + R|/o|.R|/Owner.foo|() + this@R|/Owner|.R|/Owner.foo|() + this@R|/Owner|.R|/Owner.foo|() this@R|/Owner.Inner|.#() } @@ -40,9 +40,9 @@ FILE: inner.kt } public final fun test(): R|kotlin/Unit| { lval o: R|Owner| = R|/Owner.Owner|() - D|R|/o||.R|/Owner.foo|() + R|/o|.R|/Owner.foo|() lval err: = Q|Owner|.#() R|/err|.#() - lval i: R|Owner.Inner| = D|R|/o||.R|/Owner.Inner.Inner|() - D|R|/i||.R|/Owner.Inner.gau|() + lval i: R|Owner.Inner| = R|/o|.R|/Owner.Inner.Inner|() + R|/i|.R|/Owner.Inner.gau|() } diff --git a/compiler/fir/resolve/testData/resolve/nested/simple.txt b/compiler/fir/resolve/testData/resolve/nested/simple.txt index c11ce7a2437..c924000a5b4 100644 --- a/compiler/fir/resolve/testData/resolve/nested/simple.txt +++ b/compiler/fir/resolve/testData/resolve/nested/simple.txt @@ -5,13 +5,13 @@ FILE: simple.kt } public final fun foo(): R|kotlin/Unit| { - D|this@R|/Owner||.R|/Owner.bar|() - D|this@R|/Owner||.R|/Owner.bar|() + this@R|/Owner|.R|/Owner.bar|() + this@R|/Owner|.R|/Owner.bar|() } public final fun bar(): R|kotlin/Unit| { lval n: R|Owner.Nested| = R|/Owner.Nested.Nested|() - D|R|/n||.R|/Owner.Nested.baz|() + R|/n|.R|/Owner.Nested.baz|() } public final class Nested : R|kotlin/Any| { @@ -20,13 +20,13 @@ FILE: simple.kt } public final fun baz(): R|kotlin/Unit| { - D|this@R|/Owner.Nested||.R|/Owner.Nested.gau|() - D|this@R|/Owner.Nested||.R|/Owner.Nested.gau|() + this@R|/Owner.Nested|.R|/Owner.Nested.gau|() + this@R|/Owner.Nested|.R|/Owner.Nested.gau|() } public final fun gau(): R|kotlin/Unit| { lval o: R|Owner| = R|/Owner.Owner|() - D|R|/o||.R|/Owner.foo|() + R|/o|.R|/Owner.foo|() } public final fun err(): R|kotlin/Unit| { @@ -39,7 +39,7 @@ FILE: simple.kt } public final fun test(): R|kotlin/Unit| { lval o: R|Owner| = R|/Owner.Owner|() - D|R|/o||.R|/Owner.foo|() + R|/o|.R|/Owner.foo|() lval n: = Q|Owner|.#() R|/n|.#() } diff --git a/compiler/fir/resolve/testData/resolve/overrides/generics.txt b/compiler/fir/resolve/testData/resolve/overrides/generics.txt index 620bbea9f95..9f07dc62857 100644 --- a/compiler/fir/resolve/testData/resolve/overrides/generics.txt +++ b/compiler/fir/resolve/testData/resolve/overrides/generics.txt @@ -19,5 +19,5 @@ FILE: generics.kt } public final fun f(list: R|kotlin/collections/List|): R|kotlin/Unit| { - D|R|/C.C|()|.R|/Base.f|(R|/list|) + R|/C.C|().R|/Base.f|(R|/list|) } diff --git a/compiler/fir/resolve/testData/resolve/overrides/simple.txt b/compiler/fir/resolve/testData/resolve/overrides/simple.txt index 1b4722d429f..96d586f583e 100644 --- a/compiler/fir/resolve/testData/resolve/overrides/simple.txt +++ b/compiler/fir/resolve/testData/resolve/overrides/simple.txt @@ -35,8 +35,8 @@ FILE: simple.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|() #() } diff --git a/compiler/fir/resolve/testData/resolve/overrides/simpleFakeOverride.txt b/compiler/fir/resolve/testData/resolve/overrides/simpleFakeOverride.txt index 20cc93ec16c..52f0f83eecc 100644 --- a/compiler/fir/resolve/testData/resolve/overrides/simpleFakeOverride.txt +++ b/compiler/fir/resolve/testData/resolve/overrides/simpleFakeOverride.txt @@ -21,7 +21,7 @@ FILE: simpleFakeOverride.kt } public final fun test(): R|kotlin/Unit| { - D|this@R|/A||.R|FakeOverride|(R|/Some.Some|()) + this@R|/A|.R|FakeOverride|(R|/Some.Some|()) } } diff --git a/compiler/fir/resolve/testData/resolve/overrides/three.txt b/compiler/fir/resolve/testData/resolve/overrides/three.txt index 802ff9b4835..5994fc2d1a0 100644 --- a/compiler/fir/resolve/testData/resolve/overrides/three.txt +++ b/compiler/fir/resolve/testData/resolve/overrides/three.txt @@ -19,8 +19,8 @@ FILE: three.kt } public final fun bar(): R|kotlin/Unit| { - D|this@R|/A||.R|/A.foo|() - D|this@R|/Y||.R|/Y.baz|() + this@R|/A|.R|/A.foo|() + this@R|/Y|.R|/Y.baz|() } } @@ -30,9 +30,9 @@ FILE: three.kt } public final fun test(): R|kotlin/Unit| { - D|this@R|/A||.R|/A.foo|() - D|this@R|/B||.R|/B.bar|() - D|this@R|/Y||.R|/Y.baz|() + this@R|/A|.R|/A.foo|() + this@R|/B|.R|/B.bar|() + this@R|/Y|.R|/Y.baz|() } } diff --git a/compiler/fir/resolve/testData/resolve/references/superMember.txt b/compiler/fir/resolve/testData/resolve/references/superMember.txt index 4dfcccf8740..e90907cbdc2 100644 --- a/compiler/fir/resolve/testData/resolve/references/superMember.txt +++ b/compiler/fir/resolve/testData/resolve/references/superMember.txt @@ -14,7 +14,7 @@ FILE: superMember.kt } public final fun bar(): R|kotlin/Unit| { - D|this@R|/A||.R|/A.foo|() + this@R|/A|.R|/A.foo|() } } diff --git a/compiler/fir/resolve/testData/resolve/simpleClass.txt b/compiler/fir/resolve/testData/resolve/simpleClass.txt index c06c7f627cc..de4de8d30a4 100644 --- a/compiler/fir/resolve/testData/resolve/simpleClass.txt +++ b/compiler/fir/resolve/testData/resolve/simpleClass.txt @@ -15,7 +15,7 @@ FILE: simpleClass.kt private get(): R|kotlin/Int| public final override fun foo(x: R|kotlin/Int|, y: R|kotlin/String|): R|kotlin/String| { - ^foo D|D|R|/y||.R|kotlin/String.plus|(R|/x|)|.R|kotlin/String.plus|(D|this@R|/SomeClass||.R|/SomeClass.baz|) + ^foo R|/y|.R|kotlin/String.plus|(R|/x|).R|kotlin/String.plus|(this@R|/SomeClass|.R|/SomeClass.baz|) } public final override var bar: R|kotlin/Boolean| diff --git a/compiler/fir/resolve/testData/resolve/stdlib/arrayFirstOrNull.txt b/compiler/fir/resolve/testData/resolve/stdlib/arrayFirstOrNull.txt index 9a2085d00c1..16bb8964abd 100644 --- a/compiler/fir/resolve/testData/resolve/stdlib/arrayFirstOrNull.txt +++ b/compiler/fir/resolve/testData/resolve/stdlib/arrayFirstOrNull.txt @@ -5,15 +5,15 @@ FILE: arrayFirstOrNull.kt } public final fun goo(g: R|G|): R|kotlin/Unit| { - lval x: R|G?| = E|D|R|/g||.R|/G.a||.R|/firstOrNullX|() + lval x: R|G?| = R|/g|.R|/G.a|.R|/firstOrNullX|() } public final fun R|kotlin/Array|.firstOrNullX(): R|T?| { ^firstOrNullX when () { - E|this@R|/firstOrNullX||.R|kotlin/collections/isEmpty|() -> { + this@R|/firstOrNullX|.R|kotlin/collections/isEmpty|() -> { Null(null) } else -> { - D|this@R|/firstOrNullX||.R|FakeOverride|(Int(0)) + this@R|/firstOrNullX|.R|FakeOverride|(Int(0)) } } diff --git a/compiler/fir/resolve/testData/resolve/stdlib/backingField.txt b/compiler/fir/resolve/testData/resolve/stdlib/backingField.txt index 72efe85fd7b..f946915c4b9 100644 --- a/compiler/fir/resolve/testData/resolve/stdlib/backingField.txt +++ b/compiler/fir/resolve/testData/resolve/stdlib/backingField.txt @@ -1,7 +1,7 @@ FILE: backingField.kt public final var myProperty: R|kotlin/collections/List| = R|kotlin/collections/listOf|(Int(1), Int(2), Int(3)) public get(): R|kotlin/collections/List| { - ^ E|F|/myProperty||.R|kotlin/collections/plus|(F|/myProperty|) + ^ F|/myProperty|.R|kotlin/collections/plus|(F|/myProperty|) } public set(param: R|kotlin/collections/List|): R|kotlin/Unit| { F|/myProperty| = R|/param| diff --git a/compiler/fir/resolve/testData/resolve/stdlib/companionLoad.txt b/compiler/fir/resolve/testData/resolve/stdlib/companionLoad.txt index 4e264213766..db2cd3e4611 100644 --- a/compiler/fir/resolve/testData/resolve/stdlib/companionLoad.txt +++ b/compiler/fir/resolve/testData/resolve/stdlib/companionLoad.txt @@ -1,4 +1,4 @@ FILE: companionLoad.kt public final fun main(): R|kotlin/Unit| { - lval y: R|kotlin/Int| = D|Q|kotlin/Int||.R|kotlin/Int.Companion.MAX_VALUE| + lval y: R|kotlin/Int| = Q|kotlin/Int|.R|kotlin/Int.Companion.MAX_VALUE| } diff --git a/compiler/fir/resolve/testData/resolve/stdlib/components.txt b/compiler/fir/resolve/testData/resolve/stdlib/components.txt index 1bf851f00a7..6eb588ea118 100644 --- a/compiler/fir/resolve/testData/resolve/stdlib/components.txt +++ b/compiler/fir/resolve/testData/resolve/stdlib/components.txt @@ -11,32 +11,32 @@ FILE: components.kt public get(): R|kotlin/String| public final fun component1(): R|kotlin/Int| { - ^component1 D|this@R|/D||.R|/D.x| + ^component1 this@R|/D|.R|/D.x| } public final fun component2(): R|kotlin/String| { - ^component2 D|this@R|/D||.R|/D.y| + ^component2 this@R|/D|.R|/D.y| } - public final fun copy(x: R|kotlin/Int| = D|this@R|/D||.R|/D.x|, y: R|kotlin/String| = D|this@R|/D||.R|/D.y|): R|D| { + public final fun copy(x: R|kotlin/Int| = this@R|/D|.R|/D.x|, y: R|kotlin/String| = this@R|/D|.R|/D.y|): R|D| { } } public final fun foo(list: R|kotlin/collections/List|): R|kotlin/Unit| { lval : R|kotlin/collections/List| = R|/list| - lval : R|kotlin/collections/Iterator| = D|R|/||.R|FakeOverride|>|() - while(D|R|/||.R|FakeOverride|()) { - lval : R|D| = D|R|/||.R|FakeOverride|() - lval x: R|kotlin/Int| = D|R|/||.R|/D.component1|() - lval y: R|kotlin/String| = D|R|/||.R|/D.component2|() + lval : R|kotlin/collections/Iterator| = R|/|.R|FakeOverride|>|() + while(R|/|.R|FakeOverride|()) { + lval : R|D| = R|/|.R|FakeOverride|() + lval x: R|kotlin/Int| = R|/|.R|/D.component1|() + lval y: R|kotlin/String| = R|/|.R|/D.component2|() } - lval : R|D| = E|R|/list||.R|kotlin/collections/first|() - lval x: R|kotlin/Int| = D|R|/||.R|/D.component1|() - lval y: R|kotlin/String| = D|R|/||.R|/D.component2|() - E|R|/list||.R|kotlin/collections/forEach|( = forEach@fun (: R|D|): R|kotlin/Unit| { - lval x: R|kotlin/Int| = D|R|/||.R|/D.component1|() - lval y: R|kotlin/String| = D|R|/||.R|/D.component2|() + lval : R|D| = R|/list|.R|kotlin/collections/first|() + lval x: R|kotlin/Int| = R|/|.R|/D.component1|() + lval y: R|kotlin/String| = R|/|.R|/D.component2|() + R|/list|.R|kotlin/collections/forEach|( = forEach@fun (: R|D|): R|kotlin/Unit| { + lval x: R|kotlin/Int| = R|/|.R|/D.component1|() + lval y: R|kotlin/String| = R|/|.R|/D.component2|() R|kotlin/io/println|(R|/x|) R|kotlin/io/println|(R|/y|) } diff --git a/compiler/fir/resolve/testData/resolve/stdlib/factoryFunctionOverloads.txt b/compiler/fir/resolve/testData/resolve/stdlib/factoryFunctionOverloads.txt index f03c78d4d6e..b6b9defbd83 100644 --- a/compiler/fir/resolve/testData/resolve/stdlib/factoryFunctionOverloads.txt +++ b/compiler/fir/resolve/testData/resolve/stdlib/factoryFunctionOverloads.txt @@ -18,7 +18,7 @@ FILE: factoryFunctionOverloads.kt , R|/flag|) } public final fun A(c: R|C|, flag: R|kotlin/Boolean| = Boolean(true)): R|A| { - ^A R|/A.A|(D|R|/c||.R|/C.b|, R|/flag|) + ^A R|/A.A|(R|/c|.R|/C.b|, R|/flag|) } public final class A : R|kotlin/Any| { public constructor(b: R|B|, flag: R|kotlin/Boolean| = Boolean(true)): R|A| { diff --git a/compiler/fir/resolve/testData/resolve/stdlib/hashSet.txt b/compiler/fir/resolve/testData/resolve/stdlib/hashSet.txt index 5ca4e88e77c..1a5a93b2ff4 100644 --- a/compiler/fir/resolve/testData/resolve/stdlib/hashSet.txt +++ b/compiler/fir/resolve/testData/resolve/stdlib/hashSet.txt @@ -18,7 +18,7 @@ FILE: hashSet.kt public final fun foo(): R|kotlin/Unit| { lvar c: R|kotlin/collections/MutableSet?| = Null(null) R|/c| = R|java/util/HashSet.HashSet|() - E|when (lval : R|kotlin/collections/MutableSet?| = R|/c|) { + when (lval : R|kotlin/collections/MutableSet?| = R|/c|) { ==($subj$, Null(null)) -> { throw R|kotlin/KotlinNullPointerException.KotlinNullPointerException|() } @@ -26,5 +26,5 @@ FILE: hashSet.kt R|/|! } } - |.R|/d| = R|/produce|() + .R|/d| = R|/produce|() } diff --git a/compiler/fir/resolve/testData/resolve/stdlib/implicitReceiverOrder.txt b/compiler/fir/resolve/testData/resolve/stdlib/implicitReceiverOrder.txt index bc22bed1413..774e3590818 100644 --- a/compiler/fir/resolve/testData/resolve/stdlib/implicitReceiverOrder.txt +++ b/compiler/fir/resolve/testData/resolve/stdlib/implicitReceiverOrder.txt @@ -30,16 +30,16 @@ FILE: implicitReceiverOrder.kt public final fun test(a: R|A|, b: R|B|): R|kotlin/Unit| { R|kotlin/with|(R|/b|, = with@fun R|B|.(it: R|B|): R|kotlin/Unit| { R|kotlin/with|(R|/a|, = with@fun R|A|.(it: R|A|): R|kotlin/Unit| { - D|this@R|/A||.R|/A.foo|() - D|this@R|/B||E|this@R|special/anonymous||.R|/B.bar|() + this@R|/A|.R|/A.foo|() + (this@R|/B|, this@R|special/anonymous|).R|/B.bar|() } ) } ) R|kotlin/with|(R|/a|, = with@fun R|A|.(it: R|A|): R|kotlin/Unit| { R|kotlin/with|(R|/b|, = with@fun R|B|.(it: R|B|): R|kotlin/Unit| { - D|this@R|/B||.R|/B.foo|() - D|this@R|/A||E|this@R|special/anonymous||.R|/A.bar|() + this@R|/B|.R|/B.foo|() + (this@R|/A|, this@R|special/anonymous|).R|/A.bar|() } ) } diff --git a/compiler/fir/resolve/testData/resolve/stdlib/mapList.txt b/compiler/fir/resolve/testData/resolve/stdlib/mapList.txt index 52d0a8c3cd3..ad241979be8 100644 --- a/compiler/fir/resolve/testData/resolve/stdlib/mapList.txt +++ b/compiler/fir/resolve/testData/resolve/stdlib/mapList.txt @@ -1,13 +1,13 @@ FILE: mapList.kt public final fun main(): R|kotlin/Unit| { lval x: R|kotlin/collections/List| = R|kotlin/collections/emptyList|() - lval u: R|kotlin/collections/List| = E|R|/x||.R|kotlin/collections/map|( = map@fun (it: R|kotlin/Int|): R|kotlin/Int| { - D|R|/it||.R|kotlin/Int.plus|(R|/it|) + lval u: R|kotlin/collections/List| = R|/x|.R|kotlin/collections/map|( = map@fun (it: R|kotlin/Int|): R|kotlin/Int| { + R|/it|.R|kotlin/Int.plus|(R|/it|) } ) - E|R|/u||.R|/applyX||>( = applyX@fun R|kotlin/collections/List|.(it: R|kotlin/collections/List|): R|kotlin/Unit| { - D|this@R|special/anonymous||.R|FakeOverride|(Int(1)) - D|this@R|kotlin/collections/List||.R|FakeOverride|(Int(1)) + R|/u|.R|/applyX||>( = applyX@fun R|kotlin/collections/List|.(it: R|kotlin/collections/List|): R|kotlin/Unit| { + this@R|special/anonymous|.R|FakeOverride|(Int(1)) + this@R|kotlin/collections/List|.R|FakeOverride|(Int(1)) } ) } diff --git a/compiler/fir/resolve/testData/resolve/stdlib/multipleImplicitReceivers.txt b/compiler/fir/resolve/testData/resolve/stdlib/multipleImplicitReceivers.txt index 8b425903faf..1f14bd9b082 100644 --- a/compiler/fir/resolve/testData/resolve/stdlib/multipleImplicitReceivers.txt +++ b/compiler/fir/resolve/testData/resolve/stdlib/multipleImplicitReceivers.txt @@ -27,9 +27,9 @@ FILE: multipleImplicitReceivers.kt public final fun test(fooImpl: R|IFoo|, invokeImpl: R|IInvoke|): R|kotlin/Unit| { R|kotlin/with|(Q|A|, = with@fun R|A|.(it: R|A|): R|kotlin/Unit| { R|kotlin/with|(R|/fooImpl|, = with@fun R|IFoo|.(it: R|IFoo|): R|kotlin/Unit| { - D|this@R|/IFoo||E|this@R|special/anonymous||.R|/IFoo.foo| + (this@R|/IFoo|, this@R|special/anonymous|).R|/IFoo.foo| R|kotlin/with|(R|/invokeImpl|, = with@fun R|IInvoke|.(it: R|IInvoke|): R|kotlin/Unit| { - D|this@R|/IInvoke||E|D|this@R|/IFoo||E|this@R|special/anonymous||.R|/IFoo.foo||.R|/IInvoke.invoke|() + (this@R|/IInvoke|, (this@R|/IFoo|, this@R|special/anonymous|).R|/IFoo.foo|).R|/IInvoke.invoke|() } ) } diff --git a/compiler/fir/resolve/testData/resolve/stdlib/problems.txt b/compiler/fir/resolve/testData/resolve/stdlib/problems.txt index f675c2f2399..fd2c3137998 100644 --- a/compiler/fir/resolve/testData/resolve/stdlib/problems.txt +++ b/compiler/fir/resolve/testData/resolve/stdlib/problems.txt @@ -53,7 +53,7 @@ FILE: problems.kt } } - public final val xx: = D|R|/Derived.Derived|()|.R|/Base.x|.#(Int(1)) + public final val xx: = R|/Derived.Derived|().R|/Base.x|.#(Int(1)) public get(): public final val t: R|kotlin/Nothing| = throw #(String()) public get(): R|kotlin/Nothing| diff --git a/compiler/fir/resolve/testData/resolve/stdlib/recursiveBug.txt b/compiler/fir/resolve/testData/resolve/stdlib/recursiveBug.txt index ad8a2bc72c5..51428cebd19 100644 --- a/compiler/fir/resolve/testData/resolve/stdlib/recursiveBug.txt +++ b/compiler/fir/resolve/testData/resolve/stdlib/recursiveBug.txt @@ -4,20 +4,20 @@ FILE: recursiveBug.kt super() } - public final val result: R|kotlin/String| = E|this@R|/Foo||.R|kotlin/run|( = run@fun R|Foo|.(it: R|Foo|): R|kotlin/String| { - D|R|/name||.R|FakeOverride|() + public final val result: R|kotlin/String| = this@R|/Foo|.R|kotlin/run|( = run@fun R|Foo|.(it: R|Foo|): R|kotlin/String| { + R|/name|.R|FakeOverride|() } ) public get(): R|kotlin/String| - public final val name: R|kotlin/Int| = D|D|this@R|/Foo||.R|/Foo.result||.R|kotlin/String.length| + public final val name: R|kotlin/Int| = this@R|/Foo|.R|/Foo.result|.R|kotlin/String.length| public get(): R|kotlin/Int| } public final fun bar(name: R|kotlin/Function0|): R|kotlin/Unit| { lval result: R|kotlin/String| = R|kotlin/run|( = run@fun (): R|kotlin/String| { - D|R|/name||.R|FakeOverride|() + R|/name|.R|FakeOverride|() } ) - lval name: R|kotlin/Int| = D|R|/result||.R|kotlin/String.length| + lval name: R|kotlin/Int| = R|/result|.R|kotlin/String.length| } diff --git a/compiler/fir/resolve/testData/resolve/stdlib/reflectionClass.txt b/compiler/fir/resolve/testData/resolve/stdlib/reflectionClass.txt index f6c66f59ab7..5e05b619819 100644 --- a/compiler/fir/resolve/testData/resolve/stdlib/reflectionClass.txt +++ b/compiler/fir/resolve/testData/resolve/stdlib/reflectionClass.txt @@ -1,5 +1,5 @@ FILE: reflectionClass.kt - public final val javaClass: R|java/lang/Class| = E|(Q|kotlin/String|)|.R|kotlin/jvm/java| + public final val javaClass: R|java/lang/Class| = (Q|kotlin/String|).R|kotlin/jvm/java| public get(): R|java/lang/Class| public final val kotlinClass: R|kotlin/reflect/KClass| = (Q|kotlin/String|) public get(): R|kotlin/reflect/KClass| diff --git a/compiler/fir/resolve/testData/resolve/stdlib/simpleDelegateProvider.txt b/compiler/fir/resolve/testData/resolve/stdlib/simpleDelegateProvider.txt index b6442f381db..387bb855750 100644 --- a/compiler/fir/resolve/testData/resolve/stdlib/simpleDelegateProvider.txt +++ b/compiler/fir/resolve/testData/resolve/stdlib/simpleDelegateProvider.txt @@ -8,7 +8,7 @@ FILE: simpleDelegateProvider.kt public get(): R|kotlin/String| public final operator fun getValue(thisRef: R|kotlin/Any?|, property: R|kotlin/Any?|): R|kotlin/String| { - ^getValue D|this@R|/Delegate||.R|/Delegate.value| + ^getValue this@R|/Delegate|.R|/Delegate.value| } } @@ -21,11 +21,11 @@ FILE: simpleDelegateProvider.kt public get(): R|kotlin/String| public final operator fun provideDelegate(thisRef: R|kotlin/Any?|, property: R|kotlin/Any?|): R|Delegate| { - ^provideDelegate R|/Delegate.Delegate|(D|this@R|/DelegateProvider||.R|/DelegateProvider.value|) + ^provideDelegate R|/Delegate.Delegate|(this@R|/DelegateProvider|.R|/DelegateProvider.value|) } } - public final val testTopLevel: R|kotlin/String|by D|R|/DelegateProvider.DelegateProvider|(String(OK))|.R|/DelegateProvider.provideDelegate|(Null(null), ::R|/testTopLevel|) + public final val testTopLevel: R|kotlin/String|by R|/DelegateProvider.DelegateProvider|(String(OK)).R|/DelegateProvider.provideDelegate|(Null(null), ::R|/testTopLevel|) public get(): R|kotlin/String| { - ^ D|D|/testTopLevel||.R|/Delegate.getValue|(Null(null), ::R|/testTopLevel|) + ^ D|/testTopLevel|.R|/Delegate.getValue|(Null(null), ::R|/testTopLevel|) } diff --git a/compiler/fir/resolve/testData/resolve/stdlib/simpleLazy.txt b/compiler/fir/resolve/testData/resolve/stdlib/simpleLazy.txt index ddd71d156e0..c1d5a15e543 100644 --- a/compiler/fir/resolve/testData/resolve/stdlib/simpleLazy.txt +++ b/compiler/fir/resolve/testData/resolve/stdlib/simpleLazy.txt @@ -4,13 +4,13 @@ FILE: simpleLazy.kt } ) public get(): R|kotlin/String| { - ^ E|D|/x||.R|kotlin/getValue|(Null(null), ::R|/x|) + ^ D|/x|.R|kotlin/getValue|(Null(null), ::R|/x|) } public final fun foo(): R|kotlin/Unit| { - D|R|/x||.R|kotlin/String.length| + R|/x|.R|kotlin/String.length| lval y: R|kotlin/String|by R|kotlin/lazy|( = lazy@fun (): R|kotlin/String| { String(Bye) } ) - D|R|/y||.R|kotlin/String.length| + R|/y|.R|kotlin/String.length| } diff --git a/compiler/fir/resolve/testData/resolve/stdlib/topLevelResolve.txt b/compiler/fir/resolve/testData/resolve/stdlib/topLevelResolve.txt index 237377b8396..0c2c94dd854 100644 --- a/compiler/fir/resolve/testData/resolve/stdlib/topLevelResolve.txt +++ b/compiler/fir/resolve/testData/resolve/stdlib/topLevelResolve.txt @@ -1,43 +1,43 @@ FILE: topLevelResolve.kt public final fun testPlus(): R|kotlin/Unit| { - lval x: R|kotlin/Int| = D|Int(1)|.R|kotlin/Int.plus|(Int(2)) - lval y: R|kotlin/Double| = D|Double(3.0)|.R|kotlin/Double.plus|(Double(4.0)) - lval z: R|kotlin/Double| = D|Int(5)|.R|kotlin/Int.plus|(Double(6.0)) - lval w: R|kotlin/Double| = D|Double(7.0)|.R|kotlin/Double.plus|(Int(8)) - lval c: R|kotlin/Char| = D|Char(a)|.R|kotlin/Char.plus|(Int(1)) - lval s: R|kotlin/String| = D|String(.)|.R|kotlin/String.plus|(String(..)) - lval ss: R|kotlin/String| = D|String()|.R|kotlin/String.plus|(Int(1)) - lval list: R|kotlin/collections/List| = E|R|kotlin/collections/listOf|(Int(1), Int(2), Int(3))|.R|kotlin/collections/plus|(Int(4)) - lval listAndList: R|kotlin/collections/List| = E|R|kotlin/collections/listOf|(Int(4), Int(5), Int(6))|.R|kotlin/collections/plus|(R|kotlin/collections/listOf|(Int(7), Int(8))) - lval mutableList: R|kotlin/collections/List| = E|R|kotlin/collections/mutableListOf|(Int(9), Int(10))|.R|kotlin/collections/plus|(R|kotlin/collections/listOf|(Int(11), Int(12), Int(13))) - lval setAndList: R|kotlin/collections/Set| = E|R|kotlin/collections/setOf|(Int(0))|.R|kotlin/collections/plus|(R|kotlin/collections/listOf|(Int(1), Int(2))) - lval stringAndList: R|kotlin/String| = D|String()|.R|kotlin/String.plus|(R|kotlin/collections/emptyList|()) - lval map: R|kotlin/collections/Map| = E|R|kotlin/collections/mapOf|(E|String()|.R|kotlin/to|(Int(1)), E|String(.)|.R|kotlin/to|(Int(2)))|.R|kotlin/collections/plus|(E|String(..)|.R|kotlin/to|(Int(3))) - lval mapAndMap: R|kotlin/collections/Map| = E|R|kotlin/collections/mapOf|(E|String(-)|.R|kotlin/to|(Int(4)))|.R|kotlin/collections/plus|(R|kotlin/collections/mapOf|(E|String(_)|.R|kotlin/to|(Int(5)))) + lval x: R|kotlin/Int| = Int(1).R|kotlin/Int.plus|(Int(2)) + lval y: R|kotlin/Double| = Double(3.0).R|kotlin/Double.plus|(Double(4.0)) + lval z: R|kotlin/Double| = Int(5).R|kotlin/Int.plus|(Double(6.0)) + lval w: R|kotlin/Double| = Double(7.0).R|kotlin/Double.plus|(Int(8)) + lval c: R|kotlin/Char| = Char(a).R|kotlin/Char.plus|(Int(1)) + lval s: R|kotlin/String| = String(.).R|kotlin/String.plus|(String(..)) + lval ss: R|kotlin/String| = String().R|kotlin/String.plus|(Int(1)) + lval list: R|kotlin/collections/List| = R|kotlin/collections/listOf|(Int(1), Int(2), Int(3)).R|kotlin/collections/plus|(Int(4)) + lval listAndList: R|kotlin/collections/List| = R|kotlin/collections/listOf|(Int(4), Int(5), Int(6)).R|kotlin/collections/plus|(R|kotlin/collections/listOf|(Int(7), Int(8))) + lval mutableList: R|kotlin/collections/List| = R|kotlin/collections/mutableListOf|(Int(9), Int(10)).R|kotlin/collections/plus|(R|kotlin/collections/listOf|(Int(11), Int(12), Int(13))) + lval setAndList: R|kotlin/collections/Set| = R|kotlin/collections/setOf|(Int(0)).R|kotlin/collections/plus|(R|kotlin/collections/listOf|(Int(1), Int(2))) + lval stringAndList: R|kotlin/String| = String().R|kotlin/String.plus|(R|kotlin/collections/emptyList|()) + lval map: R|kotlin/collections/Map| = R|kotlin/collections/mapOf|(String().R|kotlin/to|(Int(1)), String(.).R|kotlin/to|(Int(2))).R|kotlin/collections/plus|(String(..).R|kotlin/to|(Int(3))) + lval mapAndMap: R|kotlin/collections/Map| = R|kotlin/collections/mapOf|(String(-).R|kotlin/to|(Int(4))).R|kotlin/collections/plus|(R|kotlin/collections/mapOf|(String(_).R|kotlin/to|(Int(5)))) } public final fun id(arg: R|T|): R|T| { ^id R|/arg| } public final fun testMap(): R|kotlin/Unit| { - lval first: R|kotlin/collections/List| = E|R|kotlin/collections/listOf|(Int(1), Int(2), Int(3))|.R|kotlin/collections/map|( = map@fun (it: R|kotlin/Int|): R|kotlin/Int| { - D|R|/it||.R|kotlin/Int.times|(Int(2)) + lval first: R|kotlin/collections/List| = R|kotlin/collections/listOf|(Int(1), Int(2), Int(3)).R|kotlin/collections/map|( = map@fun (it: R|kotlin/Int|): R|kotlin/Int| { + R|/it|.R|kotlin/Int.times|(Int(2)) } ) - lval second: R|kotlin/collections/List| = E|R|kotlin/intArrayOf|(Int(4), Int(5), Int(6))|.R|kotlin/collections/map|( = map@fun (it: R|kotlin/Int|): R|kotlin/Int| { - D|R|/it||.R|kotlin/Int.times|(Int(2)) + lval second: R|kotlin/collections/List| = R|kotlin/intArrayOf|(Int(4), Int(5), Int(6)).R|kotlin/collections/map|( = map@fun (it: R|kotlin/Int|): R|kotlin/Int| { + R|/it|.R|kotlin/Int.times|(Int(2)) } ) - lval withId: R|kotlin/collections/List| = E|R|kotlin/collections/listOf|(Int(1), Int(2), Int(3))|.R|kotlin/collections/map|( = map@fun (it: R|kotlin/Int|): R|kotlin/Int| { + lval withId: R|kotlin/collections/List| = R|kotlin/collections/listOf|(Int(1), Int(2), Int(3)).R|kotlin/collections/map|( = map@fun (it: R|kotlin/Int|): R|kotlin/Int| { R|/id|(R|/it|) } ) - lval stringToInt: R|kotlin/collections/List| = E|R|kotlin/collections/listOf|(String(alpha), String(omega))|.R|kotlin/collections/map|( = map@fun (it: R|kotlin/String|): R|kotlin/Int| { - D|R|/it||.R|kotlin/String.length| + lval stringToInt: R|kotlin/collections/List| = R|kotlin/collections/listOf|(String(alpha), String(omega)).R|kotlin/collections/map|( = map@fun (it: R|kotlin/String|): R|kotlin/Int| { + R|/it|.R|kotlin/String.length| } ) lval viaWith: R|kotlin/collections/List| = R|kotlin/with||, R|kotlin/collections/List|>(R|kotlin/collections/listOf|(Int(42)), = with@fun R|kotlin/collections/List|.(it: R|kotlin/collections/List|): R|kotlin/collections/List| { - E|this@R|special/anonymous||.R|kotlin/collections/map|( = map@fun (it: R|kotlin/Int|): R|kotlin/Int| { - D|R|/it||.R|kotlin/Int.times|(R|/it|) + this@R|special/anonymous|.R|kotlin/collections/map|( = map@fun (it: R|kotlin/Int|): R|kotlin/Int| { + R|/it|.R|kotlin/Int.times|(R|/it|) } ) } @@ -45,12 +45,12 @@ FILE: topLevelResolve.kt } public final fun testWith(): R|kotlin/Unit| { lval length: R|kotlin/Int| = R|kotlin/with|(String(), = with@fun R|kotlin/String|.(it: R|kotlin/String|): R|kotlin/Int| { - D|this@R|kotlin/String||.R|kotlin/String.length| + this@R|kotlin/String|.R|kotlin/String.length| } ) lval indices: R|kotlin/ranges/IntRange| = R|kotlin/with|(String(), = with@fun R|kotlin/String|.(it: R|kotlin/String|): R|kotlin/ranges/IntRange| { - E|this@R|special/anonymous||.R|kotlin/text/indices| + this@R|special/anonymous|.R|kotlin/text/indices| } ) - lval indicesNoWith: R|kotlin/ranges/IntRange| = E|String()|.R|kotlin/text/indices| + lval indicesNoWith: R|kotlin/ranges/IntRange| = String().R|kotlin/text/indices| } diff --git a/compiler/fir/resolve/testData/resolve/stdlib/typeAliasDeserialization.txt b/compiler/fir/resolve/testData/resolve/stdlib/typeAliasDeserialization.txt index 92a93bfa3ad..ea126c1c809 100644 --- a/compiler/fir/resolve/testData/resolve/stdlib/typeAliasDeserialization.txt +++ b/compiler/fir/resolve/testData/resolve/stdlib/typeAliasDeserialization.txt @@ -1,5 +1,5 @@ FILE: typeAliasDeserialization.kt public final fun main(): R|kotlin/Unit| { lval a: R|java/util/LinkedHashSet| = R|java/util/LinkedHashSet.LinkedHashSet|() - D|R|/a||.R|FakeOverride|(String()) + R|/a|.R|FakeOverride|(String()) } diff --git a/compiler/fir/resolve/testData/resolve/stdlib/unaryOperators.txt b/compiler/fir/resolve/testData/resolve/stdlib/unaryOperators.txt index e232a2c2089..0d24e5dd7d4 100644 --- a/compiler/fir/resolve/testData/resolve/stdlib/unaryOperators.txt +++ b/compiler/fir/resolve/testData/resolve/stdlib/unaryOperators.txt @@ -12,10 +12,10 @@ FILE: unaryOperators.kt public final fun foo(u: R|U|): R|kotlin/Unit| { lval b: R|kotlin/Boolean| = Boolean(false) lval i: R|kotlin/Int| = Int(10) - lval x: R|kotlin/Int| = D|R|/i||.R|kotlin/Int.unaryMinus|() - lval y: R|kotlin/Boolean| = D|R|/b||.R|kotlin/Boolean.not|() - lval z: R|kotlin/Double| = D|Double(1.0)|.R|kotlin/Double.unaryMinus|() - lval w: R|kotlin/Int| = D|R|/i||.R|kotlin/Int.unaryPlus|() - lval g: R|kotlin/Boolean| = D|D|R|/u||.R|/U.contains|(String())|.R|kotlin/Boolean.not|() + lval x: R|kotlin/Int| = R|/i|.R|kotlin/Int.unaryMinus|() + lval y: R|kotlin/Boolean| = R|/b|.R|kotlin/Boolean.not|() + lval z: R|kotlin/Double| = Double(1.0).R|kotlin/Double.unaryMinus|() + lval w: R|kotlin/Int| = R|/i|.R|kotlin/Int.unaryPlus|() + lval g: R|kotlin/Boolean| = R|/u|.R|/U.contains|(String()).R|kotlin/Boolean.not|() lval f: R|kotlin/Boolean| = (String() !is R|kotlin/Boolean|) } diff --git a/compiler/fir/resolve/testData/resolve/typeAliasWithTypeArguments.txt b/compiler/fir/resolve/testData/resolve/typeAliasWithTypeArguments.txt index 9e4feb6a3fd..0e9bae266bf 100644 --- a/compiler/fir/resolve/testData/resolve/typeAliasWithTypeArguments.txt +++ b/compiler/fir/resolve/testData/resolve/typeAliasWithTypeArguments.txt @@ -22,31 +22,31 @@ FILE: typeAliasWithTypeArguments.kt public final typealias Inv2 = R|Inv| public final typealias Inv3 = R|Inv| public final fun testBase(inv: R|Inv|): R|kotlin/Unit| { - D|R|/inv||.R|FakeOverride|() - D|R|/inv||.R|FakeOverride|() + R|/inv|.R|FakeOverride|() + R|/inv|.R|FakeOverride|() } public final fun test_0(inv: R|Inv0|): R|kotlin/Unit| { - D|D|R|/inv||.R|FakeOverride|()|.R|/A.foo|() - D|D|R|/inv||.R|FakeOverride|()|.R|/B.bar|() + R|/inv|.R|FakeOverride|().R|/A.foo|() + R|/inv|.R|FakeOverride|().R|/B.bar|() } public final fun test_1(inv: R|Inv1|): R|kotlin/Unit| { - D|D|R|/inv||.R|FakeOverride|()|.R|/A.foo|() - D|D|R|/inv||.R|FakeOverride|()|.R|/B.bar|() + R|/inv|.R|FakeOverride|().R|/A.foo|() + R|/inv|.R|FakeOverride|().R|/B.bar|() } public final fun test_2(inv: R|Inv2|): R|kotlin/Unit| { - D|D|R|/inv||.R|FakeOverride|()|.R|/A.foo|() - D|D|R|/inv||.R|FakeOverride|()|.R|/B.bar|() + R|/inv|.R|FakeOverride|().R|/A.foo|() + R|/inv|.R|FakeOverride|().R|/B.bar|() } public final fun test_3(inv: R|Inv3|): R|kotlin/Unit| { - D|D|R|/inv||.R|FakeOverride|()|.R|/A.foo|() - D|R|/inv||.R|FakeOverride|().#() - D|D|R|/inv||.R|FakeOverride|()|.R|/C.baz|() + R|/inv|.R|FakeOverride|().R|/A.foo|() + R|/inv|.R|FakeOverride|().#() + R|/inv|.R|FakeOverride|().R|/C.baz|() } public final typealias Inv02 = R|Inv, C1>| public final fun test_4(inv: R|Inv02|): R|kotlin/Unit| { - D|D|D|R|/inv||.R|FakeOverride|>|()|.R|FakeOverride|()|.R|/A.foo|() - D|D|D|R|/inv||.R|FakeOverride|>|()|.R|FakeOverride|()|.R|/B.bar|() - D|D|R|/inv||.R|FakeOverride|()|.R|/C.baz|() + R|/inv|.R|FakeOverride|>|().R|FakeOverride|().R|/A.foo|() + R|/inv|.R|FakeOverride|>|().R|FakeOverride|().R|/B.bar|() + R|/inv|.R|FakeOverride|().R|/C.baz|() } public abstract interface In : R|kotlin/Any| { public abstract fun take(x: R|T|): R|kotlin/Unit| @@ -66,20 +66,20 @@ FILE: typeAliasWithTypeArguments.kt public final typealias Out1 = R|Out| public final typealias Invariant1 = R|Invariant| public final fun test_5(a: R|A|, in1: R|In1|, in2: R|In1|, in3: R|In1|): R|kotlin/Unit| { - D|R|/in1||.R|FakeOverride|(R|/a|) - D|R|/in2||.R|FakeOverride|(R|/a|) - D|R|/in3||.R|FakeOverride|(R|/a|) + R|/in1|.R|FakeOverride|(R|/a|) + R|/in2|.R|FakeOverride|(R|/a|) + R|/in3|.R|FakeOverride|(R|/a|) } public final fun test_6(a: R|A|, out1: R|Out1|, out2: R|Out1|, out3: R|Out1|): R|kotlin/Unit| { - D|D|R|/out1||.R|FakeOverride|()|.R|/A.foo|() - D|D|R|/out2||.R|FakeOverride|()|.R|/A.foo|() - D|D|R|/out3||.R|FakeOverride|()|.R|/A.foo|() + R|/out1|.R|FakeOverride|().R|/A.foo|() + R|/out2|.R|FakeOverride|().R|/A.foo|() + R|/out3|.R|FakeOverride|().R|/A.foo|() } public final fun test_7(a: R|A|, inv1: R|Invariant1|, inv2: R|Invariant1|, inv3: R|Invariant1|): R|kotlin/Unit| { - D|D|R|/inv1||.R|FakeOverride|()|.R|/A.foo|() - D|D|R|/inv2||.R|FakeOverride|()|.R|/A.foo|() - D|D|R|/inv3||.R|FakeOverride|()|.R|/A.foo|() - D|R|/inv1||.R|FakeOverride|(R|/a|) - D|R|/inv2||.R|FakeOverride|(R|/a|) - D|R|/inv3||.R|FakeOverride|(R|/a|) + R|/inv1|.R|FakeOverride|().R|/A.foo|() + R|/inv2|.R|FakeOverride|().R|/A.foo|() + R|/inv3|.R|FakeOverride|().R|/A.foo|() + R|/inv1|.R|FakeOverride|(R|/a|) + R|/inv2|.R|FakeOverride|(R|/a|) + R|/inv3|.R|FakeOverride|(R|/a|) } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt index bf0e277a20c..57f57078dff 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt @@ -826,27 +826,34 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() { val explicitReceiver = qualifiedAccess.explicitReceiver val dispatchReceiver = qualifiedAccess.dispatchReceiver val extensionReceiver = qualifiedAccess.extensionReceiver - if (dispatchReceiver !is FirNoReceiverExpression) { - print("D|") - dispatchReceiver.accept(this) - print("|") - } - if (extensionReceiver !is FirNoReceiverExpression) { - print("E|") - extensionReceiver.accept(this) - print("|") - } - if (explicitReceiver != null) { - if (explicitReceiver !== dispatchReceiver && explicitReceiver !== extensionReceiver) { + var hasSomeReceiver = true + when { + dispatchReceiver !is FirNoReceiverExpression && extensionReceiver !is FirNoReceiverExpression -> { + print("(") + dispatchReceiver.accept(this) + print(", ") + extensionReceiver.accept(this) + print(")") + } + dispatchReceiver !is FirNoReceiverExpression -> { + dispatchReceiver.accept(this) + } + extensionReceiver !is FirNoReceiverExpression -> { + extensionReceiver.accept(this) + } + explicitReceiver != null -> { explicitReceiver.accept(this) } + else -> { + hasSomeReceiver = false + } + } + if (hasSomeReceiver) { if (qualifiedAccess.safe) { print("?.") } else { print(".") } - } else if (dispatchReceiver !is FirNoReceiverExpression || extensionReceiver !is FirNoReceiverExpression) { - print(".") } } diff --git a/idea/testData/fir/lazyResolve/elvis/main.txt b/idea/testData/fir/lazyResolve/elvis/main.txt index 64212966878..bb0c8c49249 100644 --- a/idea/testData/fir/lazyResolve/elvis/main.txt +++ b/idea/testData/fir/lazyResolve/elvis/main.txt @@ -8,7 +8,7 @@ FILE: main.kt public get(): R|kotlin/String?| public final fun foo(): R|kotlin/String| { - ^foo when (lval : R|kotlin/String?| = R|elvis/WithElvis.value|) { + ^foo when (lval : R|kotlin/String?| = this@R|elvis/WithElvis|.R|elvis/WithElvis.value|) { ==($subj$, Null(null)) -> { String() } diff --git a/idea/testData/fir/lazyResolve/elvis/results.txt b/idea/testData/fir/lazyResolve/elvis/results.txt index abf2205fd79..20cd3459082 100644 --- a/idea/testData/fir/lazyResolve/elvis/results.txt +++ b/idea/testData/fir/lazyResolve/elvis/results.txt @@ -1 +1 @@ -D|this@R|elvis/WithElvis||.R|elvis/WithElvis.value| \ No newline at end of file +this@R|elvis/WithElvis|.R|elvis/WithElvis.value| \ No newline at end of file diff --git a/idea/testData/fir/lazyResolve/inInit/main.txt b/idea/testData/fir/lazyResolve/inInit/main.txt index a3a52af2eeb..9f24859368e 100644 --- a/idea/testData/fir/lazyResolve/inInit/main.txt +++ b/idea/testData/fir/lazyResolve/inInit/main.txt @@ -8,7 +8,7 @@ FILE: main.kt public get(): R|kotlin/Int| init { - R|/Foo.x| = Int(42) + this@R|/Foo|.R|/Foo.x| = Int(42) } } diff --git a/idea/testData/fir/lazyResolve/inInit/results.txt b/idea/testData/fir/lazyResolve/inInit/results.txt index 19cb1e2fa9f..8c81a2ab205 100644 --- a/idea/testData/fir/lazyResolve/inInit/results.txt +++ b/idea/testData/fir/lazyResolve/inInit/results.txt @@ -1 +1 @@ -D|this@R|/Foo||.R|/Foo.x| = Int(42) \ No newline at end of file +this@R|/Foo|.R|/Foo.x| = Int(42) \ No newline at end of file diff --git a/idea/testData/fir/lazyResolve/inSecondary/main.txt b/idea/testData/fir/lazyResolve/inSecondary/main.txt index 9d24fbe632d..ee49c877180 100644 --- a/idea/testData/fir/lazyResolve/inSecondary/main.txt +++ b/idea/testData/fir/lazyResolve/inSecondary/main.txt @@ -5,7 +5,7 @@ FILE: main.kt public constructor(): R|Foo| { super() - R|/Foo.x| = Int(42) + this@R|/Foo|.R|/Foo.x| = Int(42) } } diff --git a/idea/testData/fir/lazyResolve/inSecondary/results.txt b/idea/testData/fir/lazyResolve/inSecondary/results.txt index 19cb1e2fa9f..8c81a2ab205 100644 --- a/idea/testData/fir/lazyResolve/inSecondary/results.txt +++ b/idea/testData/fir/lazyResolve/inSecondary/results.txt @@ -1 +1 @@ -D|this@R|/Foo||.R|/Foo.x| = Int(42) \ No newline at end of file +this@R|/Foo|.R|/Foo.x| = Int(42) \ No newline at end of file diff --git a/idea/testData/fir/lazyResolve/simple/main.txt b/idea/testData/fir/lazyResolve/simple/main.txt index 1d42d148b18..bb71e2d4252 100644 --- a/idea/testData/fir/lazyResolve/simple/main.txt +++ b/idea/testData/fir/lazyResolve/simple/main.txt @@ -8,5 +8,5 @@ FILE: main.kt lval y: = Double(2.0) } public final fun bar(x: R|kotlin/Int|, y: R|kotlin/Int|): R|kotlin/Int| { - ^bar D|R|/x||.R|kotlin/Int.plus|(R|/y|) + ^bar R|/x|.R|kotlin/Int.plus|(R|/y|) } diff --git a/idea/testData/fir/multiModule/basic/m2_java_dep(m1-java)/user.txt b/idea/testData/fir/multiModule/basic/m2_java_dep(m1-java)/user.txt index 99b42a15e7b..f2029ad2d37 100644 --- a/idea/testData/fir/multiModule/basic/m2_java_dep(m1-java)/user.txt +++ b/idea/testData/fir/multiModule/basic/m2_java_dep(m1-java)/user.txt @@ -1,4 +1,4 @@ FILE: user.kt public final fun foo(hello: R|hello/Hello|): R|kotlin/String| { - ^foo D|R|/hello||.R|hello/Hello.msg| + ^foo R|/hello|.R|hello/Hello.msg| } diff --git a/idea/testData/fir/multiModule/basicWithAnnotatedJava/jvm/jvm.txt b/idea/testData/fir/multiModule/basicWithAnnotatedJava/jvm/jvm.txt index c9565640dd9..6a169f145a8 100644 --- a/idea/testData/fir/multiModule/basicWithAnnotatedJava/jvm/jvm.txt +++ b/idea/testData/fir/multiModule/basicWithAnnotatedJava/jvm/jvm.txt @@ -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)) } } diff --git a/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/jvm/jvm.txt b/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/jvm/jvm.txt index 408f1eb0ea2..c118b360aba 100644 --- a/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/jvm/jvm.txt +++ b/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/jvm/jvm.txt @@ -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)) } } diff --git a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/simpleFakeOverride.txt b/idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/simpleFakeOverride.txt index 4aebf3a1446..9cfdab77635 100644 --- a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/simpleFakeOverride.txt +++ b/idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/simpleFakeOverride.txt @@ -11,7 +11,7 @@ FILE: simpleFakeOverride.kt } public final fun test(): R|kotlin/Unit| { - D|this@R|/A||.R|FakeOverride!|>|(R|/Some.Some|()) + this@R|/A|.R|FakeOverride!|>|(R|/Some.Some|()) } } diff --git a/idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/jvm.txt b/idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/jvm.txt index 077112f994a..ad50fc587ea 100644 --- a/idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/jvm.txt +++ b/idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/jvm.txt @@ -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!>| = 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!>| = this@R|/Some|.R|/Some.bar|(R|kotlin/intArrayOf|(Int(0), Int(2), Int(2).R|kotlin/Int.unaryMinus|())) } } diff --git a/idea/testData/fir/multiModule/fieldAccessFromDerived/jvm/Derived.txt b/idea/testData/fir/multiModule/fieldAccessFromDerived/jvm/Derived.txt index af5efd4fb2d..f78d20aadad 100644 --- a/idea/testData/fir/multiModule/fieldAccessFromDerived/jvm/Derived.txt +++ b/idea/testData/fir/multiModule/fieldAccessFromDerived/jvm/Derived.txt @@ -5,11 +5,11 @@ FILE: Derived.kt } public final fun getValue(): { - ^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| } } diff --git a/idea/testData/fir/multiModule/javaGetPrefixConflict/jvm/Test.txt b/idea/testData/fir/multiModule/javaGetPrefixConflict/jvm/Test.txt index 3e33aab0af8..3ed448a15ad 100644 --- a/idea/testData/fir/multiModule/javaGetPrefixConflict/jvm/Test.txt +++ b/idea/testData/fir/multiModule/javaGetPrefixConflict/jvm/Test.txt @@ -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!| = D|R|/jc||.R|/JavaClass.text| + lval result: R|ft!| = R|/jc|.R|/JavaClass.text| } public final fun otherTest(jc: R|JavaClass|): R|kotlin/Unit| { - lval result: R|ft!| = D|R|/jc||.R|/JavaClass.text| + lval result: R|ft!| = R|/jc|.R|/JavaClass.text| } diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinDerived/jvm/Test.txt b/idea/testData/fir/multiModule/javaInheritsKotlinDerived/jvm/Test.txt index 825481cbd4c..33d09290429 100644 --- a/idea/testData/fir/multiModule/javaInheritsKotlinDerived/jvm/Test.txt +++ b/idea/testData/fir/multiModule/javaInheritsKotlinDerived/jvm/Test.txt @@ -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|/jc||.R|/Derived.some| + lval result: R|kotlin/String| = R|/jc|.R|/Derived.some| } diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Test.txt b/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Test.txt index 120f2209129..3d4c9e2e924 100644 --- a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Test.txt +++ b/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Test.txt @@ -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)) } } diff --git a/idea/testData/fir/multiModule/javaSyntheticProperty/jvm/Test.txt b/idea/testData/fir/multiModule/javaSyntheticProperty/jvm/Test.txt index 263e27193a6..a1567b6ddae 100644 --- a/idea/testData/fir/multiModule/javaSyntheticProperty/jvm/Test.txt +++ b/idea/testData/fir/multiModule/javaSyntheticProperty/jvm/Test.txt @@ -1,3 +1,3 @@ FILE: Test.kt - public final val x: R|ft!| = D|R|/JavaClass.JavaClass|()|.R|/JavaClass.foo| + public final val x: R|ft!| = R|/JavaClass.JavaClass|().R|/JavaClass.foo| public get(): R|ft!| diff --git a/idea/testData/fir/multiModule/mppFakeOverrides/common/common.txt b/idea/testData/fir/multiModule/mppFakeOverrides/common/common.txt index 7db3620a1e4..33d7e987aa5 100644 --- a/idea/testData/fir/multiModule/mppFakeOverrides/common/common.txt +++ b/idea/testData/fir/multiModule/mppFakeOverrides/common/common.txt @@ -23,7 +23,7 @@ FILE: common.kt } public open fun baz(arg: R|kotlin/CharSequence|): R|kotlin/String| { - ^baz D|R|/arg||.R|kotlin/Any.toString|() + ^baz R|/arg|.R|kotlin/Any.toString|() } } diff --git a/idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.txt b/idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.txt index 7d4c9081a08..12dc2f5e299 100644 --- a/idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.txt +++ b/idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.txt @@ -22,9 +22,9 @@ FILE: jvm.kt } public final fun test(): R|kotlin/Unit| { - D|this@R|/A||.R|FakeOverride|(String()) - D|this@R|/C||.R|/C.bar|(String()) - D|this@R|/A||.R|FakeOverride|(String()) + this@R|/A|.R|FakeOverride|(String()) + this@R|/C|.R|/C.bar|(String()) + this@R|/A|.R|FakeOverride|(String()) } } diff --git a/idea/testData/fir/multiModule/mppMemberType/jvm/jvm.txt b/idea/testData/fir/multiModule/mppMemberType/jvm/jvm.txt index a9696fd98f5..ded01b12b66 100644 --- a/idea/testData/fir/multiModule/mppMemberType/jvm/jvm.txt +++ b/idea/testData/fir/multiModule/mppMemberType/jvm/jvm.txt @@ -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|/list||.R|/MyList.get|(Int(1)) - D|R|/list||.R|/MyList.set|(Int(2), Int(3)) + R|/list|.R|/MyList.get|(Int(1)) + R|/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)) } } diff --git a/idea/testData/fir/multiModule/mppMembers/jvm/jvm.txt b/idea/testData/fir/multiModule/mppMembers/jvm/jvm.txt index 9a069090de8..0d03c35919d 100644 --- a/idea/testData/fir/multiModule/mppMembers/jvm/jvm.txt +++ b/idea/testData/fir/multiModule/mppMembers/jvm/jvm.txt @@ -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|() } } diff --git a/idea/testData/fir/multiModule/mppSuperTypes/jvm/jvm.txt b/idea/testData/fir/multiModule/mppSuperTypes/jvm/jvm.txt index 1653f4fb4d0..abf2ff1a0e8 100644 --- a/idea/testData/fir/multiModule/mppSuperTypes/jvm/jvm.txt +++ b/idea/testData/fir/multiModule/mppSuperTypes/jvm/jvm.txt @@ -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|() } } diff --git a/idea/testData/fir/multiModule/overrideWithJava/jvm/B.txt b/idea/testData/fir/multiModule/overrideWithJava/jvm/B.txt index 0f8ca747819..e8a8936c63f 100644 --- a/idea/testData/fir/multiModule/overrideWithJava/jvm/B.txt +++ b/idea/testData/fir/multiModule/overrideWithJava/jvm/B.txt @@ -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|() } }