Change Signature: Support conversion between extension and non-extension functions

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        _DefaultPackage.foo(X(0), "1", 2);
+    }
+}

idea/testData/refactoring/changeSignature/AddNewReceiverAfter.kt

@@ -0,0 +1,9 @@
+fun X.foo(s: String, k: Int): Boolean {
+    return s.length() - k > 0
+}
+
+class X(val k: Int)
+
+fun test() {
+    X(0).foo("1", 2)
+}

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        _DefaultPackage.foo("1", 2);
+    }
+}

idea/testData/refactoring/changeSignature/AddNewReceiverBefore.kt

@@ -0,0 +1,9 @@
+fun <caret>foo(s: String, k: Int): Boolean {
+    return s.length() - k > 0
+}
+
+class X(val k: Int)
+
+fun test() {
+    foo("1", 2)
+}

idea/testData/refactoring/changeSignature/AddNewReceiverConflictBefore.kt

@@ -0,0 +1,13 @@
+fun length(): Int = 1
+
+fun <caret>foo(k: Int): Boolean {
+    return length() - k > 0
+}
+
+class X(val k: Int) {
+    fun length() = 2
+}
+
+fun test() {
+    foo(2)
+}

idea/testData/refactoring/changeSignature/AddNewReceiverConflictMessages.txt

@@ -0,0 +1 @@
+Function length will no longer be accessible after signature change

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        new A(3).foo(X(0), "1", 2);
+    }
+}

idea/testData/refactoring/changeSignature/AddNewReceiverForMemberAfter.kt

@@ -0,0 +1,19 @@
+class A(val k: Int) {
+    fun X.foo(s: String, n: Int): Boolean {
+        return s.length() * this@A.k - n.inc() + this@A.k > 0
+    }
+
+    fun test() {
+        X(0).foo("1", 2)
+    }
+}
+
+class X(val k: Int)
+
+fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
+
+fun test() {
+    with(A(3)) {
+        X(0).foo("1", 2)
+    }
+}

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        new A(3).foo("1", 2);
+    }
+}

idea/testData/refactoring/changeSignature/AddNewReceiverForMemberBefore.kt

@@ -0,0 +1,19 @@
+class A(val k: Int) {
+    fun <caret>foo(s: String, n: Int): Boolean {
+        return s.length() * this.k - n.inc() + k > 0
+    }
+
+    fun test() {
+        foo("1", 2)
+    }
+}
+
+class X(val k: Int)
+
+fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
+
+fun test() {
+    with(A(3)) {
+        foo("1", 2)
+    }
+}

idea/testData/refactoring/changeSignature/AddNewReceiverForMemberConflictBefore.kt

@@ -0,0 +1,20 @@
+class A(val k: Int) {
+    fun <caret>foo(s: String, n: Int): Boolean {
+        return s.length()*this.k - n.inc() + k > 0
+    }
+
+    fun test() {
+        foo("1", 2)
+    }
+}
+
+class X(val k: Int)
+
+fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
+
+fun test() {
+    A(3).foo("1", 2)
+    with(A(3)) {
+        foo("1", 2)
+    }
+}

idea/testData/refactoring/changeSignature/AddNewReceiverForMemberConflictMessages.txt

@@ -0,0 +1 @@
+Explicit receiver is already present in call element: A(3).foo("1", 2)

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

@@ -0,0 +1,18 @@
+interface J<A> extends T<A> {
+    @Override
+    <B> int foofoofoo(U<A> a, B b);
+}
+
+abstract class J1<X> implements J<U<X>> {
+    @Override
+    public <C> int foofoofoo(U<U<X>> xu, C c) {
+        throw new UnsupportedOperationException();
+    }
+}
+
+abstract class J2 extends J1<String> {
+    @Override
+    public <C> int foofoofoo(U<U<String>> xu, C c) {
+        throw new UnsupportedOperationException();
+    }
+}

idea/testData/refactoring/changeSignature/AddReceiverToGenericsWithOverridesAfter.kt

@@ -0,0 +1,17 @@
+class U<A>
+
+trait T<A> {
+    fun U<A>.foofoofoo<B>(b: B): Int
+}
+
+abstract class T1<X> : T<U<X>> {
+    override fun <B> U<U<X>>.foofoofoo(b: B): Int {
+        throw UnsupportedOperationException()
+    }
+}
+
+abstract class T2 : T1<String>() {
+    override fun <C> U<U<String>>.foofoofoo(b: C): Int {
+        throw UnsupportedOperationException()
+    }
+}

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

@@ -0,0 +1,18 @@
+interface J<A> extends T<A> {
+    @Override
+    <B> int foofoofoo(A a, B b);
+}
+
+abstract class J1<X> implements J<U<X>> {
+    @Override
+    public <C> int foofoofoo(U<X> xu, C c) {
+        throw new UnsupportedOperationException();
+    }
+}
+
+abstract class J2 extends J1<String> {
+    @Override
+    public <C> int foofoofoo(U<String> xu, C c) {
+        throw new UnsupportedOperationException();
+    }
+}

idea/testData/refactoring/changeSignature/AddReceiverToGenericsWithOverridesBefore.kt

@@ -0,0 +1,17 @@
+class U<A>
+
+trait T<A> {
+    fun <caret>foofoofoo<B>(a: A, b: B): Int
+}
+
+abstract class T1<X> : T<U<X>> {
+    override fun <B> foofoofoo(a: U<X>, b: B): Int {
+        throw UnsupportedOperationException()
+    }
+}
+
+abstract class T2 : T1<String>() {
+    override fun <C> foofoofoo(a: U<String>, b: C): Int {
+        throw UnsupportedOperationException()
+    }
+}

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        _DefaultPackage.foo("1", new X(0), 2);
+    }
+}

idea/testData/refactoring/changeSignature/ChangeReceiverAfter.kt

@@ -0,0 +1,9 @@
+fun String.foo(x: X, k: Int): Boolean {
+    return x.k + length() - k > 0
+}
+
+class X(val k: Int)
+
+fun test() {
+    "1".foo(X(0), 2)
+}

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        _DefaultPackage.foo(new X(0), "1", 2);
+    }
+}

idea/testData/refactoring/changeSignature/ChangeReceiverBefore.kt

@@ -0,0 +1,9 @@
+fun X.<caret>foo(s: String, k: Int): Boolean {
+    return this.k + s.length() - k > 0
+}
+
+class X(val k: Int)
+
+fun test() {
+    X(0).foo("1", 2)
+}

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        new A(3).foo("1", new X(0), 2);
+    }
+}

idea/testData/refactoring/changeSignature/ChangeReceiverForMemberAfter.kt

@@ -0,0 +1,19 @@
+class A(val k: Int) {
+    fun String.foo(x: X, k: Int): Boolean {
+        return x.k + length() - k + this@A.k/2 > 0
+    }
+
+    fun test() {
+        "1".foo(X(0), 2)
+    }
+}
+
+class X(val k: Int)
+
+fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
+
+fun test() {
+    with(A(3)) {
+        "1".foo(X(0), 2)
+    }
+}

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        new A(3).foo(new X(0), "1", 2);
+    }
+}

idea/testData/refactoring/changeSignature/ChangeReceiverForMemberBefore.kt

@@ -0,0 +1,19 @@
+class A(val k: Int) {
+    fun X.<caret>foo(s: String, k: Int): Boolean {
+        return this.k + s.length() - k + this@A.k/2 > 0
+    }
+
+    fun test() {
+        X(0).foo("1", 2)
+    }
+}
+
+class X(val k: Int)
+
+fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
+
+fun test() {
+    with(A(3)) {
+        X(0).foo("1", 2)
+    }
+}

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        _DefaultPackage.foo(new X(0), "1", 2);
+    }
+}

idea/testData/refactoring/changeSignature/ConvertParameterToReceiver1After.kt

@@ -0,0 +1,9 @@
+fun X.foo(s: String, k: Int): Boolean {
+    return this.k + s.length() - k > 0
+}
+
+class X(val k: Int)
+
+fun test() {
+    X(0).foo("1", 2)
+}

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        _DefaultPackage.foo(new X(0), "1", 2);
+    }
+}

idea/testData/refactoring/changeSignature/ConvertParameterToReceiver1Before.kt

@@ -0,0 +1,9 @@
+fun <caret>foo(x: X, s: String, k: Int): Boolean {
+    return x.k + s.length() - k > 0
+}
+
+class X(val k: Int)
+
+fun test() {
+    foo(X(0), "1", 2)
+}

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        _DefaultPackage.foo(new X(0), "1", 2);
+    }
+}

idea/testData/refactoring/changeSignature/ConvertParameterToReceiver2After.kt

@@ -0,0 +1,9 @@
+fun X.foo(s: String, k: Int): Boolean {
+    return this.k + s.length() - k > 0
+}
+
+class X(val k: Int)
+
+fun test() {
+    X(0).foo("1", 2)
+}

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        _DefaultPackage.foo("1", new X(0), 2);
+    }
+}

idea/testData/refactoring/changeSignature/ConvertParameterToReceiver2Before.kt

@@ -0,0 +1,9 @@
+fun <caret>foo(s: String, x: X, k: Int): Boolean {
+    return x.k + s.length() - k > 0
+}
+
+class X(val k: Int)
+
+fun test() {
+    foo("1", X(0), 2)
+}

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        new A(3).foo(new X(0), "1", 2);
+    }
+}

idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMember1After.kt

@@ -0,0 +1,19 @@
+class A(val k: Int) {
+    fun X.foo(s: String, k: Int): Boolean {
+        return this.k + s.length() - k + this@A.k/2 > 0
+    }
+
+    fun test() {
+        X(0).foo("1", 2)
+    }
+}
+
+class X(val k: Int)
+
+fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
+
+fun test() {
+    with(A(3)) {
+        X(0).foo("1", 2)
+    }
+}

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        new A(3).foo(new X(0), "1", 2);
+    }
+}

idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMember1Before.kt

@@ -0,0 +1,19 @@
+class A(val k: Int) {
+    fun <caret>foo(x: X, s: String, k: Int): Boolean {
+        return x.k + s.length() - k + this.k/2 > 0
+    }
+
+    fun test() {
+        foo(X(0), "1", 2)
+    }
+}
+
+class X(val k: Int)
+
+fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
+
+fun test() {
+    with(A(3)) {
+        foo(X(0), "1", 2)
+    }
+}

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        new A(3).foo(new X(0), "1", 2);
+    }
+}

idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMember2After.kt

@@ -0,0 +1,19 @@
+class A(val k: Int) {
+    fun X.foo(s: String, k: Int): Boolean {
+        return this.k + s.length() - k + this@A.k/2 > 0
+    }
+
+    fun test() {
+        X(0).foo("1", 2)
+    }
+}
+
+class X(val k: Int)
+
+fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
+
+fun test() {
+    with(A(3)) {
+        X(0).foo("1", 2)
+    }
+}

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        new A(3).foo("1", new X(0), 2);
+    }
+}

idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMember2Before.kt

@@ -0,0 +1,19 @@
+class A(val k: Int) {
+    fun <caret>foo(s: String, x: X, k: Int): Boolean {
+        return x.k + s.length() - k + this.k/2 > 0
+    }
+
+    fun test() {
+        foo("1", X(0), 2)
+    }
+}
+
+class X(val k: Int)
+
+fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
+
+fun test() {
+    with(A(3)) {
+        foo("1", X(0), 2)
+    }
+}

idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMemberConflictBefore.kt

@@ -0,0 +1,20 @@
+class A(val k: Int) {
+    fun <caret>foo(x: X, s: String, k: Int): Boolean {
+        return x.k + s.length() - k + this.k/2 > 0
+    }
+
+    fun test() {
+        foo(X(0), "1", 2)
+    }
+}
+
+class X(val k: Int)
+
+fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
+
+fun test() {
+    A(3).foo(X(0), "1", 2)
+    with(A(3)) {
+        foo(X(0), "1", 2)
+    }
+}

idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMemberConflictMessages.txt

@@ -0,0 +1 @@
+Explicit receiver is already present in call element: A(3).foo(X(0), "1", 2)

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        _DefaultPackage.foo(new X(0), "1", 2);
+    }
+}

idea/testData/refactoring/changeSignature/ConvertReceiverToParameter1After.kt

@@ -0,0 +1,14 @@
+fun <caret>foo(x: X, s: String, k: Int): Boolean {
+    return x.k + s.length() - k > 0
+}
+
+class X(val k: Int)
+
+fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
+
+fun test() {
+    foo(X(0), "1", 2)
+    with(X(0)) {
+        foo(this, "1", 2)
+    }
+}

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        _DefaultPackage.foo(new X(0), "1", 2);
+    }
+}

idea/testData/refactoring/changeSignature/ConvertReceiverToParameter1Before.kt

@@ -0,0 +1,14 @@
+fun X.<caret>foo(s: String, k: Int): Boolean {
+    return this.k + s.length() - k > 0
+}
+
+class X(val k: Int)
+
+fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
+
+fun test() {
+    X(0).foo("1", 2)
+    with(X(0)) {
+        foo("1", 2)
+    }
+}

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        _DefaultPackage.foo("1", new X(0), 2);
+    }
+}

idea/testData/refactoring/changeSignature/ConvertReceiverToParameter2After.kt

@@ -0,0 +1,14 @@
+fun <caret>foo(s: String, x: X, k: Int): Boolean {
+    return x.k + s.length() - k > 0
+}
+
+class X(val k: Int)
+
+fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
+
+fun test() {
+    foo("1", X(0), 2)
+    with(X(0)) {
+        foo("1", this, 2)
+    }
+}

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        _DefaultPackage.foo(new X(0), "1", 2);
+    }
+}

idea/testData/refactoring/changeSignature/ConvertReceiverToParameter2Before.kt

@@ -0,0 +1,14 @@
+fun X.<caret>foo(s: String, k: Int): Boolean {
+    return this.k + s.length() - k > 0
+}
+
+class X(val k: Int)
+
+fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
+
+fun test() {
+    X(0).foo("1", 2)
+    with(X(0)) {
+        foo("1", 2)
+    }
+}

idea/testData/refactoring/changeSignature/ConvertReceiverToParameterAndChangeNameAfter.kt

@@ -0,0 +1,5 @@
+class X(val k: Int)
+
+fun foo(abc: X, n: Int): Boolean {
+    return abc.k > n
+}

idea/testData/refactoring/changeSignature/ConvertReceiverToParameterAndChangeNameBefore.kt

@@ -0,0 +1,5 @@
+class X(val k: Int)
+
+fun X.<caret>foo(n: Int): Boolean {
+    return this.k > n
+}

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        new A(3).foo(new X(0), "1", 2);
+    }
+}

idea/testData/refactoring/changeSignature/ConvertReceiverToParameterForMember1After.kt

@@ -0,0 +1,19 @@
+class A(val k: Int) {
+    fun foo(x: X, s: String, k: Int): Boolean {
+        return x.k + s.length() - k + this.k/2 > 0
+    }
+
+    fun test() {
+        foo(X(0), "1", 2)
+    }
+}
+
+class X(val k: Int)
+
+fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
+
+fun test() {
+    with(A(3)) {
+        foo(X(0), "1", 2)
+    }
+}

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        new A(3).foo(new X(0), "1", 2);
+    }
+}

idea/testData/refactoring/changeSignature/ConvertReceiverToParameterForMember1Before.kt

@@ -0,0 +1,19 @@
+class A(val k: Int) {
+    fun X.<caret>foo(s: String, k: Int): Boolean {
+        return this.k + s.length() - k + this@A.k/2 > 0
+    }
+
+    fun test() {
+        X(0).foo("1", 2)
+    }
+}
+
+class X(val k: Int)
+
+fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
+
+fun test() {
+    with(A(3)) {
+        X(0).foo("1", 2)
+    }
+}

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        new A(3).foo("1", new X(0), 2);
+    }
+}

idea/testData/refactoring/changeSignature/ConvertReceiverToParameterForMember2After.kt

@@ -0,0 +1,19 @@
+class A(val k: Int) {
+    fun foo(s: String, x: X, k: Int): Boolean {
+        return x.k + s.length() - k + this.k/2 > 0
+    }
+
+    fun test() {
+        foo("1", X(0), 2)
+    }
+}
+
+class X(val k: Int)
+
+fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
+
+fun test() {
+    with(A(3)) {
+        foo("1", X(0), 2)
+    }
+}

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        new A(3).foo(new X(0), "1", 2);
+    }
+}

idea/testData/refactoring/changeSignature/ConvertReceiverToParameterForMember2Before.kt

@@ -0,0 +1,19 @@
+class A(val k: Int) {
+    fun X.<caret>foo(s: String, k: Int): Boolean {
+        return this.k + s.length() - k + this@A.k/2 > 0
+    }
+
+    fun test() {
+        X(0).foo("1", 2)
+    }
+}
+
+class X(val k: Int)
+
+fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
+
+fun test() {
+    with(A(3)) {
+        X(0).foo("1", 2)
+    }
+}

idea/testData/refactoring/changeSignature/ConvertReceiverToParameterWithNameClashAfter.kt

@@ -0,0 +1,7 @@
+val x1: Int
+
+class X(val x: Int)
+
+fun foo(x2: X, x: Int): Boolean {
+    return x2.x + x > x1
+}

idea/testData/refactoring/changeSignature/ConvertReceiverToParameterWithNameClashBefore.kt

@@ -0,0 +1,7 @@
+val x1: Int
+
+class X(val x: Int)
+
+fun X.<caret>foo(x: Int): Boolean {
+    return this.x + x > x1
+}

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        _DefaultPackage.foo("1", 2);
+    }
+}

idea/testData/refactoring/changeSignature/RemoveReceiverAfter.kt

@@ -0,0 +1,14 @@
+fun foo(s: String, k: Int): Boolean {
+    return this.k + s.length() - k > 0
+}
+
+class X(val k: Int)
+
+fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
+
+fun test() {
+    with(X(0)) {
+        foo("1", 2)
+    }
+    foo("1", 2)
+}

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        _DefaultPackage.foo(new X(0), "1", 2);
+    }
+}

idea/testData/refactoring/changeSignature/RemoveReceiverBefore.kt

@@ -0,0 +1,14 @@
+fun X.<caret>foo(s: String, k: Int): Boolean {
+    return this.k + s.length() - k > 0
+}
+
+class X(val k: Int)
+
+fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
+
+fun test() {
+    with(X(0)) {
+        foo("1", 2)
+    }
+    X(0).foo("1", 2)
+}

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        new A(3).foo(1, "2");
+    }
+}

idea/testData/refactoring/changeSignature/RemoveReceiverForMemberAfter.kt

@@ -0,0 +1,19 @@
+class A(val k: Int) {
+    fun foo(s: String, n: Int): Boolean {
+        return s.length() * this.k - n.inc() + this@A.k > 0
+    }
+
+    fun test() {
+        foo("1", 2)
+    }
+}
+
+class X(val k: Int)
+
+fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
+
+fun test() {
+    with(A(3)) {
+        foo("1", 2)
+    }
+}

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

@@ -0,0 +1,5 @@
+class J {
+    void test() {
+        new A(3).foo(new X(0), 1, "2");
+    }
+}

idea/testData/refactoring/changeSignature/RemoveReceiverForMemberBefore.kt

@@ -0,0 +1,19 @@
+class A(val k: Int) {
+    fun X.<caret>foo(s: String, n: Int): Boolean {
+        return s.length() * this.k - n.inc() + this@A.k > 0
+    }
+
+    fun test() {
+        X(0).foo("1", 2)
+    }
+}
+
+class X(val k: Int)
+
+fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
+
+fun test() {
+    with(A(3)) {
+        X(0).foo("1", 2)
+    }
+}