Move: Update test data for tests with conflicts
Check refactoring result for the case when conflicts are ignored. Fix move destination when moving to another source root
This commit is contained in:
+3
-3
@@ -1,9 +1,9 @@
|
||||
public class A {
|
||||
public static class X {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public class B {
|
||||
|
||||
private static class X {
|
||||
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -1,3 +1,3 @@
|
||||
fun bar(s: String) {
|
||||
val t: A.X = A.X()
|
||||
val t: B.X = B.X()
|
||||
}
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
import A.*
|
||||
|
||||
fun bar(s: String) {
|
||||
val t: X = X()
|
||||
val t: B.X = B.X()
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
import A.X as XX
|
||||
import B.X as XX
|
||||
|
||||
fun bar(s: String) {
|
||||
val t: XX = XX()
|
||||
|
||||
Reference in New Issue
Block a user