Improved logic of finding conflicts for refactoring actions

This commit is contained in:
Stanislav Erokhin
2015-08-25 20:02:28 +03:00
parent 9a435e332f
commit aaebe70342
8 changed files with 25 additions and 24 deletions
@@ -14,7 +14,7 @@ class A(val a: Int) {
fun test() {
val t = with(A(1)) {
val a = A(2)
foo(this.a + a.a)
val a1 = A(2)
foo(a + a1.a)
}
}
@@ -8,13 +8,13 @@ class A(val a: Int) {
}
fun test() {
val a2 = A(1)
val a = A(1)
val a3 = A(2)
a2.foo(a2.a + a3.a)
a.foo(a.a + a3.a)
with(A(1)) {
val a2 = A(2)
foo(this.a + a2.a)
val a1 = A(2)
foo(a + a1.a)
val a = A(2)
this.foo(this.a + a.a)
this.foo(this.a + a1.a)
}
}
@@ -8,13 +8,13 @@ class A(val a: Int) {
}
fun test() {
val a2 = A(1)
val a = A(1)
val a3 = A(2)
a2.foo(a2.a + a3.a)
a.foo(a.a + a3.a)
with(A(1)) {
val a2 = A(2)
foo(this.a + a2.a)
val a1 = A(2)
foo(a + a1.a)
val a = A(2)
this.foo(this.a + a.a)
this.foo(this.a + a1.a)
}
}