Rename: Fix renaming of function by label reference inside of lambda argument

#KT-7520 Fixed
This commit is contained in:
Alexey Sedunov
2017-02-17 16:43:11 +03:00
parent b1df91395a
commit 275cdbbea7
16 changed files with 136 additions and 1 deletions
@@ -0,0 +1,7 @@
fun <R> bar(f: () -> R) = f()
fun test() {
bar { return@bar false }
bar(fun(): Boolean { return@bar false })
}
@@ -0,0 +1,7 @@
fun <R> /*rename*/foo(f: () -> R) = f()
fun test() {
foo { return@foo false }
foo(fun(): Boolean { return@foo false })
}
@@ -0,0 +1,5 @@
{
"type": "MARKED_ELEMENT",
"mainFile": "test.kt",
"newName": "bar"
}
@@ -0,0 +1,5 @@
fun <R> bar(f: () -> R) = f()
fun test() {
bar(fun(): Boolean { return@bar false })
}
@@ -0,0 +1,5 @@
fun <R> foo(f: () -> R) = f()
fun test() {
foo(fun(): Boolean { return@/*rename*/foo false })
}
@@ -0,0 +1,5 @@
{
"type": "AUTO_DETECT",
"mainFile": "test.kt",
"newName": "bar"
}
@@ -0,0 +1,5 @@
fun <R> bar(f: () -> R) = f()
fun test() {
bar(fun(): Boolean { return@bar false })
}
@@ -0,0 +1,5 @@
fun <R> foo(f: () -> R) = f()
fun test() {
foo(fun(): Boolean { return@foo/*rename*/ false })
}
@@ -0,0 +1,5 @@
{
"type": "AUTO_DETECT",
"mainFile": "test.kt",
"newName": "bar"
}
@@ -0,0 +1,7 @@
fun <R> bar(f: () -> R) = f()
fun test() {
bar {
return@bar false
}
}
@@ -0,0 +1,7 @@
fun <R> foo(f: () -> R) = f()
fun test() {
foo {
return@/*rename*/foo false
}
}
@@ -0,0 +1,5 @@
{
"type": "AUTO_DETECT",
"mainFile": "test.kt",
"newName": "bar"
}