Extract Function: Allow to extract local variables which are used outside of extracted fragment

This commit is contained in:
Alexey Sedunov
2014-07-03 18:55:11 +04:00
parent 540e8b8b46
commit d95f6383b7
35 changed files with 439 additions and 93 deletions
@@ -0,0 +1,5 @@
// SIBLING:
fun foo() {
<selection>val a = 10</selection>
println(a)
}
@@ -0,0 +1,10 @@
// SIBLING:
fun foo() {
val a = i()
println(a)
}
fun i(): Int {
val a = 10
return a
}
@@ -0,0 +1,10 @@
// SIBLING:
fun foo() {
<selection>val a: Int
val b = 10
val c: Int
</selection>
a = 1
c = 2
println(a + b + c)
}
@@ -0,0 +1,17 @@
// SIBLING:
fun foo() {
val a: Int
val b = i()
val c: Int
a = 1
c = 2
println(a + b + c)
}
fun i(): Int {
val a: Int
val b = 10
val c: Int
return b
}
@@ -0,0 +1,9 @@
// SIBLING:
fun foo() {
<selection>val a: Int
val b = 10
val c: Int = 1
</selection>
a = 2
println(a + b)
}
@@ -0,0 +1,15 @@
// SIBLING:
fun foo() {
val a: Int
val b = i()
a = 2
println(a + b)
}
fun i(): Int {
val a: Int
val b = 10
val c: Int = 1
return b
}
@@ -0,0 +1,6 @@
// SIBLING:
fun foo() {
<selection>val a: Int
a = 10</selection>
println(a)
}
@@ -0,0 +1,11 @@
// SIBLING:
fun foo() {
val a: Int = i()
println(a)
}
fun i(): Int {
val a: Int
a = 10
return a
}
@@ -0,0 +1,11 @@
// SIBLING:
fun main(args: Array<String>) {
<selection>val a = 1</selection>
val t = object: T {
override fun foo(n: Int) = n + a
}
}
trait T {
fun foo(n: Int): Int
}
@@ -0,0 +1,16 @@
// SIBLING:
fun main(args: Array<String>) {
val a = i()
val t = object: T {
override fun foo(n: Int) = n + a
}
}
fun i(): Int {
val a = 1
return a
}
trait T {
fun foo(n: Int): Int
}
@@ -0,0 +1,9 @@
// SIBLING:
fun main(args: Array<String>) {
<selection>val a = 1</selection>
lambda {
a
}
}
fun lambda(f: () -> Unit) {}
@@ -0,0 +1,14 @@
// SIBLING:
fun main(args: Array<String>) {
val a = i()
lambda {
a
}
}
fun i(): Int {
val a = 1
return a
}
fun lambda(f: () -> Unit) {}
@@ -0,0 +1,5 @@
// SIBLING:
fun main(args: Array<String>) {
<selection>val a = 1</selection>
fun foo() = a
}
@@ -0,0 +1,10 @@
// SIBLING:
fun main(args: Array<String>) {
val a = i()
fun foo() = a
}
fun i(): Int {
val a = 1
return a
}