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

Renames and test output format improvement

Browse Source
This commit is contained in:
Valentin Kipyatkov
2020-04-13 10:21:51 +03:00
parent 33082d8661
commit 84a786dde3
47 changed files with 179 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/slicer/outflow/invokeExtensionLambda.results.txt
Vendored
+9 -9
View File
@@ -2,9 +2,9 @@
4 val v1 = f(<bold>p</bold>, { this })
11 fun f(<bold>receiver: String</bold>, lambda: String.() -> String): String {
12 return lambda.invoke(<bold>receiver</bold>)
12 [LAMBDA RECEIVER IN] return <bold>lambda</bold>.invoke(receiver)
11 [LAMBDA RECEIVER IN] fun f(receiver: String, <bold>lambda: String.() -> String</bold>): String {
4 [LAMBDA RECEIVER IN] val v1 = f(p, <bold>{ this }</bold>)
12 [LAMBDA RECEIVER] return <bold>lambda</bold>.invoke(receiver)
11 [LAMBDA RECEIVER] fun f(receiver: String, <bold>lambda: String.() -> String</bold>): String {
4 [LAMBDA RECEIVER] val v1 = f(p, <bold>{ this }</bold>)
4 val v1 = f(p, { <bold>this</bold> })
4 val v1 = f(p, <bold>{ this }</bold>)
4 [LAMBDA CALLS] val v1 = f(p, <bold>{ this }</bold>)
@@ -17,9 +17,9 @@
6 val v2 = g("a", "b", <bold>p</bold>, { p1, p2 -> p2 })
15 fun g(a: String, b: String, <bold>c: String</bold>, lambda: String.(String, String) -> String): String {
16 return lambda.invoke(a, b, <bold>c</bold>)
16 [LAMBDA ARGUMENT IN] return <bold>lambda</bold>.invoke(a, b, c)
15 [LAMBDA ARGUMENT IN] fun g(a: String, b: String, c: String, <bold>lambda: String.(String, String) -> String</bold>): String {
6 [LAMBDA ARGUMENT IN] val v2 = g("a", "b", p, <bold>{ p1, p2 -> p2 }</bold>)
16 [LAMBDA PARAMETER #1] return <bold>lambda</bold>.invoke(a, b, c)
15 [LAMBDA PARAMETER #1] fun g(a: String, b: String, c: String, <bold>lambda: String.(String, String) -> String</bold>): String {
6 [LAMBDA PARAMETER #1] val v2 = g("a", "b", p, <bold>{ p1, p2 -> p2 }</bold>)
6 val v2 = g("a", "b", p, { p1, <bold>p2</bold> -> p2 })
6 val v2 = g("a", "b", p, { p1, p2 -> <bold>p2</bold> })
6 val v2 = g("a", "b", p, <bold>{ p1, p2 -> p2 }</bold>)
@@ -33,9 +33,9 @@
8 val v3 = inlineF(<bold>p</bold>, { this })
19 (INLINE CALL inlineF) inline fun inlineF(<bold>receiver: String</bold>, lambda: String.() -> String): String {
20 (INLINE CALL inlineF) return lambda.invoke(<bold>receiver</bold>)
20 (INLINE CALL inlineF) [LAMBDA RECEIVER IN] return <bold>lambda</bold>.invoke(receiver)
19 (INLINE CALL inlineF) [LAMBDA RECEIVER IN] inline fun inlineF(receiver: String, <bold>lambda: String.() -> String</bold>): String {
8 [LAMBDA RECEIVER IN] val v3 = inlineF(p, <bold>{ this }</bold>)
20 (INLINE CALL inlineF) [LAMBDA RECEIVER] return <bold>lambda</bold>.invoke(receiver)
19 (INLINE CALL inlineF) [LAMBDA RECEIVER] inline fun inlineF(receiver: String, <bold>lambda: String.() -> String</bold>): String {
8 [LAMBDA RECEIVER] val v3 = inlineF(p, <bold>{ this }</bold>)
8 val v3 = inlineF(p, { <bold>this</bold> })
8 val v3 = inlineF(p, <bold>{ this }</bold>)
8 [LAMBDA CALLS] val v3 = inlineF(p, <bold>{ this }</bold>)
idea/testData/slicer/outflow/invokeExtensionLambda2.results.txt
Vendored
+6 -6
View File
@@ -2,12 +2,12 @@
4 val v1 = bar(<bold>p</bold>) { { this } }
7 (INLINE CALL bar) inline fun bar(<bold>x: String</bold>, lambda: () -> String.() -> String): String {
8 (INLINE CALL bar) return lambda()(<bold>x</bold>)
8 (INLINE CALL bar) [LAMBDA RECEIVER IN] return <bold>lambda()</bold>(x)
8 (INLINE CALL bar) [LAMBDA IN] [LAMBDA RECEIVER IN] return <bold>lambda</bold>()(x)
7 (INLINE CALL bar) [LAMBDA IN] [LAMBDA RECEIVER IN] inline fun bar(x: String, <bold>lambda: () -> String.() -> String</bold>): String {
4 [LAMBDA IN] [LAMBDA RECEIVER IN] val v1 = bar(p) <bold>{ { this } }</bold>
4 [LAMBDA RECEIVER IN] val v1 = bar(p) <bold>{ { this } }</bold>
4 [LAMBDA RECEIVER IN] val v1 = bar(p) { <bold>{ this }</bold> }
8 (INLINE CALL bar) [LAMBDA RECEIVER] return <bold>lambda()</bold>(x)
8 (INLINE CALL bar) [LAMBDA IN] [LAMBDA RECEIVER] return <bold>lambda</bold>()(x)
7 (INLINE CALL bar) [LAMBDA IN] [LAMBDA RECEIVER] inline fun bar(x: String, <bold>lambda: () -> String.() -> String</bold>): String {
4 [LAMBDA IN] [LAMBDA RECEIVER] val v1 = bar(p) <bold>{ { this } }</bold>
4 [LAMBDA RECEIVER] val v1 = bar(p) <bold>{ { this } }</bold>
4 [LAMBDA RECEIVER] val v1 = bar(p) { <bold>{ this }</bold> }
4 val v1 = bar(p) { { <bold>this</bold> } }
4 val v1 = bar(p) { <bold>{ this }</bold> }
4 [LAMBDA CALLS] val v1 = bar(p) { <bold>{ this }</bold> }
idea/testData/slicer/outflow/invokeExtensionLambda3.results.txt
Vendored
+4 -4
View File
@@ -2,10 +2,10 @@
4 val v = bar(<bold>p</bold>) { this }
7 fun <T, R> bar(<bold>receiver: T</bold>, block: T.() -> R): R {
9 return <bold>receiver</bold>.b()
8 [LAMBDA RECEIVER IN] val <bold>b = block</bold>
8 [LAMBDA RECEIVER IN] val b = <bold>block</bold>
7 [LAMBDA RECEIVER IN] fun <T, R> bar(receiver: T, <bold>block: T.() -> R</bold>): R {
4 [LAMBDA RECEIVER IN] val v = bar(p) <bold>{ this }</bold>
8 [LAMBDA RECEIVER] val <bold>b = block</bold>
8 [LAMBDA RECEIVER] val b = <bold>block</bold>
7 [LAMBDA RECEIVER] fun <T, R> bar(receiver: T, <bold>block: T.() -> R</bold>): R {
4 [LAMBDA RECEIVER] val v = bar(p) <bold>{ this }</bold>
4 val v = bar(p) { <bold>this</bold> }
4 val v = bar(p) <bold>{ this }</bold>
4 [LAMBDA CALLS] val v = bar(p) <bold>{ this }</bold>
idea/testData/slicer/outflow/invokeLambdaSecondParam.results.txt
Vendored
+2 -2
View File
@@ -2,8 +2,8 @@
4 val v = f({ p1, p2 -> p2 }, <bold>p</bold>)
7 fun f(lambda: (String, String) -> String, <bold>receiver: String</bold>): String {
8 return lambda("a", <bold>receiver</bold>)
7 [LAMBDA ARGUMENT IN] fun f(<bold>lambda: (String, String) -> String</bold>, receiver: String): String {
4 [LAMBDA ARGUMENT IN] val v = f(<bold>{ p1, p2 -> p2 }</bold>, p)
7 [LAMBDA PARAMETER #1] fun f(<bold>lambda: (String, String) -> String</bold>, receiver: String): String {
4 [LAMBDA PARAMETER #1] val v = f(<bold>{ p1, p2 -> p2 }</bold>, p)
4 val v = f({ p1, <bold>p2</bold> -> p2 }, p)
4 val v = f({ p1, p2 -> <bold>p2</bold> }, p)
4 val v = f(<bold>{ p1, p2 -> p2 }</bold>, p)
idea/testData/slicer/outflow/letResult.results.txt
Vendored
+8 -8
View File
@@ -2,8 +2,8 @@
4 val v1 = <bold>p</bold>.let { value -> bar(value) }
19 (INLINE CALL let) inline fun <T, R> <bold>T</bold>.let(block: (T) -> R): R {
20 (INLINE CALL let) return block(<bold>this</bold>)
19 (INLINE CALL let) [LAMBDA ARGUMENT IN] inline fun <T, R> T.let(<bold>block: (T) -> R</bold>): R {
4 [LAMBDA ARGUMENT IN] val v1 = p.let <bold>{ value -> bar(value) }</bold>
19 (INLINE CALL let) [LAMBDA PARAMETER #0] inline fun <T, R> T.let(<bold>block: (T) -> R</bold>): R {
4 [LAMBDA PARAMETER #0] val v1 = p.let <bold>{ value -> bar(value) }</bold>
4 val v1 = p.let { <bold>value</bold> -> bar(value) }
4 val v1 = p.let { value -> bar(<bold>value</bold>) }
16 fun bar(<bold>s: String</bold>) = s
@@ -19,8 +19,8 @@
6 val v2 = <bold>p</bold>.let { it }
19 (INLINE CALL let) inline fun <T, R> <bold>T</bold>.let(block: (T) -> R): R {
20 (INLINE CALL let) return block(<bold>this</bold>)
19 (INLINE CALL let) [LAMBDA ARGUMENT IN] inline fun <T, R> T.let(<bold>block: (T) -> R</bold>): R {
6 [LAMBDA ARGUMENT IN] val v2 = p.let <bold>{ it }</bold>
19 (INLINE CALL let) [LAMBDA PARAMETER #0] inline fun <T, R> T.let(<bold>block: (T) -> R</bold>): R {
6 [LAMBDA PARAMETER #0] val v2 = p.let <bold>{ it }</bold>
6 val v2 = p.let { <bold>it</bold> }
6 val v2 = p.let <bold>{ it }</bold>
6 [LAMBDA CALLS] val v2 = p.let <bold>{ it }</bold>
@@ -31,13 +31,13 @@
8 val v3 = <bold>p</bold>.let {
19 (INLINE CALL let) inline fun <T, R> <bold>T</bold>.let(block: (T) -> R): R {
20 (INLINE CALL let) return block(<bold>this</bold>)
19 (INLINE CALL let) [LAMBDA ARGUMENT IN] inline fun <T, R> T.let(<bold>block: (T) -> R</bold>): R {
8 [LAMBDA ARGUMENT IN] val v3 = p.let <bold>{</bold>
19 (INLINE CALL let) [LAMBDA PARAMETER #0] inline fun <T, R> T.let(<bold>block: (T) -> R</bold>): R {
8 [LAMBDA PARAMETER #0] val v3 = p.let <bold>{</bold>
13 val v4 = <bold>p</bold>.let(::zoo)
19 (INLINE CALL let) inline fun <T, R> <bold>T</bold>.let(block: (T) -> R): R {
20 (INLINE CALL let) return block(<bold>this</bold>)
19 (INLINE CALL let) [LAMBDA ARGUMENT IN] inline fun <T, R> T.let(<bold>block: (T) -> R</bold>): R {
13 [LAMBDA ARGUMENT IN] val v4 = p.let(<bold>::zoo</bold>)
19 (INLINE CALL let) [LAMBDA PARAMETER #0] inline fun <T, R> T.let(<bold>block: (T) -> R</bold>): R {
13 [LAMBDA PARAMETER #0] val v4 = p.let(<bold>::zoo</bold>)
17 fun zoo(<bold>s: String</bold>) = s
17 fun zoo(s: String) = <bold>s</bold>
17 fun <bold>zoo(s: String) = s</bold>
idea/testData/slicer/outflow/nonInlineLetResult.results.txt
Vendored
+4 -4
View File
@@ -2,8 +2,8 @@
4 val v1 = <bold>p</bold>.let { value -> bar(value) }
16 fun <T, R> <bold>T</bold>.let(block: (T) -> R): R {
17 return block(<bold>this</bold>)
16 [LAMBDA ARGUMENT IN] fun <T, R> T.let(<bold>block: (T) -> R</bold>): R {
4 [LAMBDA ARGUMENT IN] val v1 = p.let <bold>{ value -> bar(value) }</bold>
16 [LAMBDA PARAMETER #0] fun <T, R> T.let(<bold>block: (T) -> R</bold>): R {
4 [LAMBDA PARAMETER #0] val v1 = p.let <bold>{ value -> bar(value) }</bold>
4 val v1 = p.let { <bold>value</bold> -> bar(value) }
4 val v1 = p.let { value -> bar(<bold>value</bold>) }
14 fun bar(<bold>s: String</bold>) = s
@@ -21,12 +21,12 @@
6 val <bold>v2 = p.let { it }</bold>
8 val v3 = p.<bold>let {</bold>
8 val <bold>v3 = p.let {</bold>
6 [LAMBDA ARGUMENT IN] val v2 = p.let <bold>{ it }</bold>
6 [LAMBDA PARAMETER #0] val v2 = p.let <bold>{ it }</bold>
6 val v2 = p.let { <bold>it</bold> }
6 val v2 = p.let <bold>{ it }</bold>
6 [LAMBDA CALLS] val v2 = p.let <bold>{ it }</bold>
16 [LAMBDA CALLS] DUPLICATE: fun <T, R> T.let(<bold>block: (T) -> R</bold>): R {
8 [LAMBDA ARGUMENT IN] val v3 = p.let <bold>{</bold>
8 [LAMBDA PARAMETER #0] val v3 = p.let <bold>{</bold>
6 val v2 = <bold>p</bold>.let { it }
16 DUPLICATE: fun <T, R> <bold>T</bold>.let(block: (T) -> R): R {
8 val v3 = <bold>p</bold>.let {
idea/testData/slicer/outflow/nullableLambda.results.txt
Vendored
+4 -4
View File
@@ -2,10 +2,10 @@
4 val v = bar(<bold>p</bold>, true, { this })
7 fun bar(<bold>receiver: String</bold>, b: Boolean, lambda: (String.() -> String)?): String {
8 return if (b) lambda!!.invoke(<bold>receiver</bold>) else ""
8 [LAMBDA RECEIVER IN] return if (b) <bold>lambda!!</bold>.invoke(receiver) else ""
8 [LAMBDA RECEIVER IN] return if (b) <bold>lambda</bold>!!.invoke(receiver) else ""
7 [LAMBDA RECEIVER IN] fun bar(receiver: String, b: Boolean, <bold>lambda: (String.() -> String)?</bold>): String {
4 [LAMBDA RECEIVER IN] val v = bar(p, true, <bold>{ this }</bold>)
8 [LAMBDA RECEIVER] return if (b) <bold>lambda!!</bold>.invoke(receiver) else ""
8 [LAMBDA RECEIVER] return if (b) <bold>lambda</bold>!!.invoke(receiver) else ""
7 [LAMBDA RECEIVER] fun bar(receiver: String, b: Boolean, <bold>lambda: (String.() -> String)?</bold>): String {
4 [LAMBDA RECEIVER] val v = bar(p, true, <bold>{ this }</bold>)
4 val v = bar(p, true, { <bold>this</bold> })
4 val v = bar(p, true, <bold>{ this }</bold>)
4 [LAMBDA CALLS] val v = bar(p, true, <bold>{ this }</bold>)
idea/testData/slicer/outflow/withResult.results.txt
Vendored
+8 -8
View File
@@ -2,8 +2,8 @@
4 val v1 = with(<bold>p</bold>) { this }
16 (INLINE CALL with) inline fun <T, R> with(<bold>receiver: T</bold>, block: T.() -> R): R {
17 (INLINE CALL with) return <bold>receiver</bold>.block()
16 (INLINE CALL with) [LAMBDA RECEIVER IN] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
4 [LAMBDA RECEIVER IN] val v1 = with(p) <bold>{ this }</bold>
16 (INLINE CALL with) [LAMBDA RECEIVER] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
4 [LAMBDA RECEIVER] val v1 = with(p) <bold>{ this }</bold>
4 val v1 = with(p) { <bold>this</bold> }
4 val v1 = with(p) <bold>{ this }</bold>
4 [LAMBDA CALLS] val v1 = with(p) <bold>{ this }</bold>
@@ -14,8 +14,8 @@
6 val v2 = with(<bold>p</bold>) { bar(this) }
16 (INLINE CALL with) inline fun <T, R> with(<bold>receiver: T</bold>, block: T.() -> R): R {
17 (INLINE CALL with) return <bold>receiver</bold>.block()
16 (INLINE CALL with) [LAMBDA RECEIVER IN] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
6 [LAMBDA RECEIVER IN] val v2 = with(p) <bold>{ bar(this) }</bold>
16 (INLINE CALL with) [LAMBDA RECEIVER] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
6 [LAMBDA RECEIVER] val v2 = with(p) <bold>{ bar(this) }</bold>
6 val v2 = with(p) { bar(<bold>this</bold>) }
13 fun bar(<bold>s: String</bold>) = s
13 fun bar(s: String) = <bold>s</bold>
@@ -30,13 +30,13 @@
8 val v3 = with(<bold>p</bold>) { this@foo }
16 (INLINE CALL with) inline fun <T, R> with(<bold>receiver: T</bold>, block: T.() -> R): R {
17 (INLINE CALL with) return <bold>receiver</bold>.block()
16 (INLINE CALL with) [LAMBDA RECEIVER IN] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
8 [LAMBDA RECEIVER IN] val v3 = with(p) <bold>{ this@foo }</bold>
16 (INLINE CALL with) [LAMBDA RECEIVER] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
8 [LAMBDA RECEIVER] val v3 = with(p) <bold>{ this@foo }</bold>
10 val v4 = with(<bold>p</bold>, ::zoo)
16 (INLINE CALL with) inline fun <T, R> with(<bold>receiver: T</bold>, block: T.() -> R): R {
17 (INLINE CALL with) return <bold>receiver</bold>.block()
16 (INLINE CALL with) [LAMBDA RECEIVER IN] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
10 [LAMBDA RECEIVER IN] val v4 = with(p, <bold>::zoo</bold>)
16 (INLINE CALL with) [LAMBDA RECEIVER] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
10 [LAMBDA RECEIVER] val v4 = with(p, <bold>::zoo</bold>)
14 fun zoo(<bold>s: String</bold>) = s
14 fun zoo(s: String) = <bold>s</bold>
14 fun <bold>zoo(s: String) = s</bold>