Rename: Identify elements with the same origin when checking import ambiguity

#KT-13284 Fixed
This commit is contained in:
Alexey Sedunov
2018-02-27 16:11:43 +03:00
parent 6c17bbe42c
commit 85b381db7c
12 changed files with 82 additions and 1 deletions
@@ -0,0 +1,12 @@
import foo.OverloadKt;
import static foo.OverloadKt.overload;
public class OverloadJava {
public void useOverload() {
OverloadKt.overloadNew(0, false);
OverloadKt.overloadNew(0, true);
OverloadKt.overloadNew(0, true, 2.0);
overload("123");
}
}
@@ -0,0 +1,4 @@
package foo
@JvmOverloads fun overloadNew(p1: Int, p2: Boolean, p3: Double = 1.0) {}
fun overload(s: String) {}
@@ -0,0 +1,10 @@
import static foo.OverloadKt.overload;
public class OverloadJava {
public void useOverload() {
overload(0, false);
overload(0, true);
overload(0, true, 2.0);
overload("123");
}
}
@@ -0,0 +1,4 @@
package foo
@JvmOverloads fun /*rename*/overload(p1: Int, p2: Boolean, p3: Double = 1.0) {}
fun overload(s: String) {}
@@ -0,0 +1,7 @@
{
"type": "MARKED_ELEMENT",
"mainFile": "foo/overload.kt",
"newName": "overloadNew",
"withRuntime": "true",
"overloadRenamer.onlyPrimaryElement": "true"
}
@@ -0,0 +1,9 @@
import static foo.OverloadKt.overloadNew;
public class OverloadJava {
public void useOverload() {
overloadNew(0, false);
overloadNew(0, true);
overloadNew(0, true, 2.0);
}
}
@@ -0,0 +1,3 @@
package foo
@JvmOverloads fun overloadNew(p1: Int, p2: Boolean, p3: Double = 1.0) {}
@@ -0,0 +1,9 @@
import static foo.OverloadKt.overload;
public class OverloadJava {
public void useOverload() {
overload(0, false);
overload(0, true);
overload(0, true, 2.0);
}
}
@@ -0,0 +1,3 @@
package foo
@JvmOverloads fun /*rename*/overload(p1: Int, p2: Boolean, p3: Double = 1.0) {}
@@ -0,0 +1,7 @@
{
"type": "MARKED_ELEMENT",
"mainFile": "foo/overload.kt",
"newName": "overloadNew",
"withRuntime": "true",
"overloadRenamer.onlyPrimaryElement": "true"
}