Change Signature: Match calls of different overloads generated due to @JvmOverloads annotation

#KT-9020 Fixed

idea/testData/refactoring/changeSignature/JvmOverloadedAddDefault1After.1.java

@@ -0,0 +1,17 @@
+class Usages {
+    void foo() {
+        Foo.foo();
+    }
+
+    void fooX() {
+        Foo.foo(2, 1);
+    }
+
+    void fooXY() {
+        Foo.foo(2, 1, 1.0);
+    }
+
+    void fooXYZ() {
+        Foo.foo(2, 1, 1.0, "1");
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedAddDefault1After.kt

@@ -0,0 +1,6 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun <caret>foo(n: Int = 2, x: Int = 0, y: Double = 0.0, z: String = "0") {
+
+}

idea/testData/refactoring/changeSignature/JvmOverloadedAddDefault1Before.1.java

@@ -0,0 +1,17 @@
+class Usages {
+    void foo() {
+        Foo.foo();
+    }
+
+    void fooX() {
+        Foo.foo(1);
+    }
+
+    void fooXY() {
+        Foo.foo(1, 1.0);
+    }
+
+    void fooXYZ() {
+        Foo.foo(1, 1.0, "1");
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedAddDefault1Before.kt

@@ -0,0 +1,6 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun <caret>foo(x: Int = 0, y: Double = 0.0, z: String = "0") {
+
+}

idea/testData/refactoring/changeSignature/JvmOverloadedAddDefault2After.1.java

@@ -0,0 +1,17 @@
+class Usages {
+    void foo() {
+        Foo.foo();
+    }
+
+    void fooX() {
+        Foo.foo(1);
+    }
+
+    void fooXY() {
+        Foo.foo(1, 2, 1.0);
+    }
+
+    void fooXYZ() {
+        Foo.foo(1, 2, 1.0, "1");
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedAddDefault2After.kt

@@ -0,0 +1,6 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun <caret>foo(x: Int = 0, n: Int = 2, y: Double = 0.0, z: String = "0") {
+
+}

idea/testData/refactoring/changeSignature/JvmOverloadedAddDefault2Before.1.java

@@ -0,0 +1,17 @@
+class Usages {
+    void foo() {
+        Foo.foo();
+    }
+
+    void fooX() {
+        Foo.foo(1);
+    }
+
+    void fooXY() {
+        Foo.foo(1, 1.0);
+    }
+
+    void fooXYZ() {
+        Foo.foo(1, 1.0, "1");
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedAddDefault2Before.kt

@@ -0,0 +1,6 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun <caret>foo(x: Int = 0, y: Double = 0.0, z: String = "0") {
+
+}

idea/testData/refactoring/changeSignature/JvmOverloadedAddDefault3After.1.java

@@ -0,0 +1,17 @@
+class Usages {
+    void foo() {
+        Foo.foo();
+    }
+
+    void fooX() {
+        Foo.foo(1);
+    }
+
+    void fooXY() {
+        Foo.foo(1, 1.0);
+    }
+
+    void fooXYZ() {
+        Foo.foo(1, 1.0, "1");
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedAddDefault3After.kt

@@ -0,0 +1,6 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun <caret>foo(x: Int = 0, y: Double = 0.0, z: String = "0", n: Int = 2) {
+
+}

idea/testData/refactoring/changeSignature/JvmOverloadedAddDefault3Before.1.java

@@ -0,0 +1,17 @@
+class Usages {
+    void foo() {
+        Foo.foo();
+    }
+
+    void fooX() {
+        Foo.foo(1);
+    }
+
+    void fooXY() {
+        Foo.foo(1, 1.0);
+    }
+
+    void fooXYZ() {
+        Foo.foo(1, 1.0, "1");
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedAddDefault3Before.kt

@@ -0,0 +1,6 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun <caret>foo(x: Int = 0, y: Double = 0.0, z: String = "0") {
+
+}

idea/testData/refactoring/changeSignature/JvmOverloadedAddNonDefault1After.1.java

@@ -0,0 +1,17 @@
+class Usages {
+    void foo() {
+        Foo.foo(2);
+    }
+
+    void fooX() {
+        Foo.foo(2, 1);
+    }
+
+    void fooXY() {
+        Foo.foo(2, 1, 1.0);
+    }
+
+    void fooXYZ() {
+        Foo.foo(2, 1, 1.0, "1");
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedAddNonDefault1After.kt

@@ -0,0 +1,6 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun <caret>foo(n: Int, x: Int = 0, y: Double = 0.0, z: String = "0") {
+
+}

idea/testData/refactoring/changeSignature/JvmOverloadedAddNonDefault1Before.1.java

@@ -0,0 +1,17 @@
+class Usages {
+    void foo() {
+        Foo.foo();
+    }
+
+    void fooX() {
+        Foo.foo(1);
+    }
+
+    void fooXY() {
+        Foo.foo(1, 1.0);
+    }
+
+    void fooXYZ() {
+        Foo.foo(1, 1.0, "1");
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedAddNonDefault1Before.kt

@@ -0,0 +1,6 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun <caret>foo(x: Int = 0, y: Double = 0.0, z: String = "0") {
+
+}

idea/testData/refactoring/changeSignature/JvmOverloadedAddNonDefault2After.1.java

@@ -0,0 +1,17 @@
+class Usages {
+    void foo() {
+        Foo.foo(2);
+    }
+
+    void fooX() {
+        Foo.foo(1, 2);
+    }
+
+    void fooXY() {
+        Foo.foo(1, 2, 1.0);
+    }
+
+    void fooXYZ() {
+        Foo.foo(1, 2, 1.0, "1");
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedAddNonDefault2After.kt

@@ -0,0 +1,6 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun <caret>foo(x: Int = 0, n: Int, y: Double = 0.0, z: String = "0") {
+
+}

idea/testData/refactoring/changeSignature/JvmOverloadedAddNonDefault2Before.1.java

@@ -0,0 +1,17 @@
+class Usages {
+    void foo() {
+        Foo.foo();
+    }
+
+    void fooX() {
+        Foo.foo(1);
+    }
+
+    void fooXY() {
+        Foo.foo(1, 1.0);
+    }
+
+    void fooXYZ() {
+        Foo.foo(1, 1.0, "1");
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedAddNonDefault2Before.kt

@@ -0,0 +1,6 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun <caret>foo(x: Int = 0, y: Double = 0.0, z: String = "0") {
+
+}

idea/testData/refactoring/changeSignature/JvmOverloadedAddNonDefault3After.1.java

@@ -0,0 +1,17 @@
+class Usages {
+    void foo() {
+        Foo.foo(2);
+    }
+
+    void fooX() {
+        Foo.foo(1, 2);
+    }
+
+    void fooXY() {
+        Foo.foo(1, 1.0, 2);
+    }
+
+    void fooXYZ() {
+        Foo.foo(1, 1.0, "1", 2);
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedAddNonDefault3After.kt

@@ -0,0 +1,6 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun <caret>foo(x: Int = 0, y: Double = 0.0, z: String = "0", n: Int) {
+
+}

idea/testData/refactoring/changeSignature/JvmOverloadedAddNonDefault3Before.1.java

@@ -0,0 +1,17 @@
+class Usages {
+    void foo() {
+        Foo.foo();
+    }
+
+    void fooX() {
+        Foo.foo(1);
+    }
+
+    void fooXY() {
+        Foo.foo(1, 1.0);
+    }
+
+    void fooXYZ() {
+        Foo.foo(1, 1.0, "1");
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedAddNonDefault3Before.kt

@@ -0,0 +1,6 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun <caret>foo(x: Int = 0, y: Double = 0.0, z: String = "0") {
+
+}

idea/testData/refactoring/changeSignature/JvmOverloadedConstructorSwapParamsAfter.1.java

@@ -0,0 +1,17 @@
+class Usages {
+    void foo() {
+        new A();
+    }
+
+    void fooX() {
+        new A(1);
+    }
+
+    void fooXY() {
+        new A(1, "0", 1.0);
+    }
+
+    void fooXYZ() {
+        new A(1, "1", 1.0);
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedConstructorSwapParamsAfter.kt

@@ -0,0 +1,5 @@
+public class A @JvmOverloads constructor(
+        public val x: Int = 0,
+        public val z: String = "0",
+        public val y: Double = 0.0
+)

idea/testData/refactoring/changeSignature/JvmOverloadedConstructorSwapParamsBefore.1.java

@@ -0,0 +1,17 @@
+class Usages {
+    void foo() {
+        new A();
+    }
+
+    void fooX() {
+        new A(1);
+    }
+
+    void fooXY() {
+        new A(1, 1.0);
+    }
+
+    void fooXYZ() {
+        new A(1, 1.0, "1");
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedConstructorSwapParamsBefore.kt

@@ -0,0 +1,5 @@
+public class A @JvmOverloads constructor<caret>(
+        public val x: Int = 0,
+        public val y: Double = 0.0,
+        public val z: String = "0"
+)

idea/testData/refactoring/changeSignature/JvmOverloadedRemoveDefault1After.1.java

@@ -0,0 +1,17 @@
+class Usages {
+    void foo() {
+        Foo.foo();
+    }
+
+    void fooX() {
+        Foo.foo();
+    }
+
+    void fooXY() {
+        Foo.foo(1.0);
+    }
+
+    void fooXYZ() {
+        Foo.foo(1.0, "1");
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedRemoveDefault1After.kt

@@ -0,0 +1,6 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun <caret>foo(y: Double = 0.0, z: String = "0") {
+
+}

idea/testData/refactoring/changeSignature/JvmOverloadedRemoveDefault1Before.1.java

@@ -0,0 +1,17 @@
+class Usages {
+    void foo() {
+        Foo.foo();
+    }
+
+    void fooX() {
+        Foo.foo(1);
+    }
+
+    void fooXY() {
+        Foo.foo(1, 1.0);
+    }
+
+    void fooXYZ() {
+        Foo.foo(1, 1.0, "1");
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedRemoveDefault1Before.kt

@@ -0,0 +1,6 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun <caret>foo(x: Int = 0, y: Double = 0.0, z: String = "0") {
+
+}

idea/testData/refactoring/changeSignature/JvmOverloadedRemoveDefault2After.1.java

@@ -0,0 +1,17 @@
+class Usages {
+    void foo() {
+        Foo.foo();
+    }
+
+    void fooX() {
+        Foo.foo(1);
+    }
+
+    void fooXY() {
+        Foo.foo(1);
+    }
+
+    void fooXYZ() {
+        Foo.foo(1, "1");
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedRemoveDefault2After.kt

@@ -0,0 +1,6 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun <caret>foo(x: Int = 0, z: String = "0") {
+
+}

idea/testData/refactoring/changeSignature/JvmOverloadedRemoveDefault2Before.1.java

@@ -0,0 +1,17 @@
+class Usages {
+    void foo() {
+        Foo.foo();
+    }
+
+    void fooX() {
+        Foo.foo(1);
+    }
+
+    void fooXY() {
+        Foo.foo(1, 1.0);
+    }
+
+    void fooXYZ() {
+        Foo.foo(1, 1.0, "1");
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedRemoveDefault2Before.kt

@@ -0,0 +1,6 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun <caret>foo(x: Int = 0, y: Double = 0.0, z: String = "0") {
+
+}

idea/testData/refactoring/changeSignature/JvmOverloadedRemoveDefault3After.1.java

@@ -0,0 +1,17 @@
+class Usages {
+    void foo() {
+        Foo.foo();
+    }
+
+    void fooX() {
+        Foo.foo(1);
+    }
+
+    void fooXY() {
+        Foo.foo(1, 1.0);
+    }
+
+    void fooXYZ() {
+        Foo.foo(1, 1.0);
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedRemoveDefault3After.kt

@@ -0,0 +1,6 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun <caret>foo(x: Int = 0, y: Double = 0.0) {
+
+}

idea/testData/refactoring/changeSignature/JvmOverloadedRemoveDefault3Before.1.java

@@ -0,0 +1,17 @@
+class Usages {
+    void foo() {
+        Foo.foo();
+    }
+
+    void fooX() {
+        Foo.foo(1);
+    }
+
+    void fooXY() {
+        Foo.foo(1, 1.0);
+    }
+
+    void fooXYZ() {
+        Foo.foo(1, 1.0, "1");
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedRemoveDefault3Before.kt

@@ -0,0 +1,6 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun <caret>foo(x: Int = 0, y: Double = 0.0, z: String = "0") {
+
+}

idea/testData/refactoring/changeSignature/JvmOverloadedRemoveNonDefault1After.1.java

@@ -0,0 +1,13 @@
+class Usages {
+    void foo() {
+        Foo.foo();
+    }
+
+    void fooY() {
+        Foo.foo(1.0);
+    }
+
+    void fooYZ() {
+        Foo.foo(1.0, "1");
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedRemoveNonDefault1After.kt

@@ -0,0 +1,6 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun <caret>foo(y: Double = 0.0, z: String = "0") {
+
+}

idea/testData/refactoring/changeSignature/JvmOverloadedRemoveNonDefault1Before.1.java

@@ -0,0 +1,13 @@
+class Usages {
+    void foo() {
+        Foo.foo(1);
+    }
+
+    void fooY() {
+        Foo.foo(1, 1.0);
+    }
+
+    void fooYZ() {
+        Foo.foo(1, 1.0, "1");
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedRemoveNonDefault1Before.kt

@@ -0,0 +1,6 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun <caret>foo(x: Int, y: Double = 0.0, z: String = "0") {
+
+}

idea/testData/refactoring/changeSignature/JvmOverloadedRemoveNonDefault2After.1.java

@@ -0,0 +1,13 @@
+class Usages {
+    void foo() {
+        Foo.foo();
+    }
+
+    void fooX() {
+        Foo.foo(1);
+    }
+
+    void fooXZ() {
+        Foo.foo(1, "1");
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedRemoveNonDefault2After.kt

@@ -0,0 +1,6 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun <caret>foo(x: Int = 0, z: String = "0") {
+
+}

idea/testData/refactoring/changeSignature/JvmOverloadedRemoveNonDefault2Before.1.java

@@ -0,0 +1,13 @@
+class Usages {
+    void foo() {
+        Foo.foo(1.0);
+    }
+
+    void fooX() {
+        Foo.foo(1, 1.0);
+    }
+
+    void fooXZ() {
+        Foo.foo(1, 1.0, "1");
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedRemoveNonDefault2Before.kt

@@ -0,0 +1,6 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun <caret>foo(x: Int = 0, y: Double, z: String = "0") {
+
+}

idea/testData/refactoring/changeSignature/JvmOverloadedRemoveNonDefault3After.1.java

@@ -0,0 +1,13 @@
+class Usages {
+    void foo() {
+        Foo.foo();
+    }
+
+    void fooX() {
+        Foo.foo(1);
+    }
+
+    void fooXY() {
+        Foo.foo(1, 1.0);
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedRemoveNonDefault3After.kt

@@ -0,0 +1,6 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun <caret>foo(x: Int = 0, y: Double = 0.0) {
+
+}

idea/testData/refactoring/changeSignature/JvmOverloadedRemoveNonDefault3Before.1.java

@@ -0,0 +1,13 @@
+class Usages {
+    void foo() {
+        Foo.foo("1");
+    }
+
+    void fooX() {
+        Foo.foo(1, "1");
+    }
+
+    void fooXY() {
+        Foo.foo(1, 1.0, "1");
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedRemoveNonDefault3Before.kt

@@ -0,0 +1,6 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun <caret>foo(x: Int = 0, y: Double = 0.0, z: String) {
+
+}

idea/testData/refactoring/changeSignature/JvmOverloadedSwapParams1After.1.java

@@ -0,0 +1,17 @@
+class Usages {
+    void foo() {
+        Foo.foo();
+    }
+
+    void fooX() {
+        Foo.foo(1);
+    }
+
+    void fooXY() {
+        Foo.foo(1, "0", 1.0);
+    }
+
+    void fooXYZ() {
+        Foo.foo(1, "1", 1.0);
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedSwapParams1After.kt

@@ -0,0 +1,10 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun foo(
+        x: Int = 0,
+        z: String = "0",
+        y: Double = 0.0
+) {
+
+}

idea/testData/refactoring/changeSignature/JvmOverloadedSwapParams1Before.1.java

@@ -0,0 +1,17 @@
+class Usages {
+    void foo() {
+        Foo.foo();
+    }
+
+    void fooX() {
+        Foo.foo(1);
+    }
+
+    void fooXY() {
+        Foo.foo(1, 1.0);
+    }
+
+    void fooXYZ() {
+        Foo.foo(1, 1.0, "1");
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedSwapParams1Before.kt

@@ -0,0 +1,10 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun <caret>foo(
+        x: Int = 0,
+        y: Double = 0.0,
+        z: String = "0"
+) {
+
+}

idea/testData/refactoring/changeSignature/JvmOverloadedSwapParams2After.1.java

@@ -0,0 +1,13 @@
+class Usages {
+    void foo() {
+        Foo.foo(1);
+    }
+
+    void fooY() {
+        Foo.foo("0", 1.0, 1);
+    }
+
+    void fooYZ() {
+        Foo.foo("1", 1.0, 1);
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedSwapParams2After.kt

@@ -0,0 +1,10 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun <caret>foo(
+        z: String = "0",
+        y: Double = 0.0,
+        x: Int
+) {
+
+}

idea/testData/refactoring/changeSignature/JvmOverloadedSwapParams2Before.1.java

@@ -0,0 +1,13 @@
+class Usages {
+    void foo() {
+        Foo.foo(1);
+    }
+
+    void fooY() {
+        Foo.foo(1, 1.0);
+    }
+
+    void fooYZ() {
+        Foo.foo(1, 1.0, "1");
+    }
+}

idea/testData/refactoring/changeSignature/JvmOverloadedSwapParams2Before.kt

@@ -0,0 +1,10 @@
+@file:JvmName("Foo")
+
+@JvmOverloads
+fun <caret>foo(
+        x: Int,
+        y: Double = 0.0,
+        z: String = "0"
+) {
+
+}