Move: Support method moving

idea/testData/refactoring/move/kotlin/moveMethod/moveToClass/parameterAsReference/after/a/A.kt

@@ -0,0 +1,14 @@
+package a
+
+import b.B
+
+class A {
+
+    fun bar(b: B) {
+        b.foo()
+        val a = A().apply {
+            b.foo()
+            b.foo()
+        }
+    }
+}

idea/testData/refactoring/move/kotlin/moveMethod/moveToClass/parameterAsReference/after/b/B.kt

@@ -0,0 +1,13 @@
+package b
+
+import a.A
+
+class B (val a: A) {
+    fun baz(b: B) {
+        b.foo()
+    }
+
+    fun foo() {
+        val a1 = this.a
+    }
+}

idea/testData/refactoring/move/kotlin/moveMethod/moveToClass/parameterAsReference/after/usages/JavaUsage.java

@@ -0,0 +1,10 @@
+package usages;
+
+import a.A;
+import b.B;
+
+public class JavaUsage {
+    void javaUsage(A a, B b) {
+        b.foo();
+    }
+}

idea/testData/refactoring/move/kotlin/moveMethod/moveToClass/parameterAsReference/after/usages/kotlinUsage.kt

@@ -0,0 +1,6 @@
+import a.A
+import b.B
+
+fun kotlinUsage(a: A, b: B) {
+    b.foo()
+}

idea/testData/refactoring/move/kotlin/moveMethod/moveToClass/parameterAsReference/before/a/A.kt

@@ -0,0 +1,17 @@
+package a
+
+import b.B
+
+class A {
+    fun foo(b: B) {
+        val a1 = b.a
+    }
+
+    fun bar(b: B) {
+        foo(b)
+        val a = A().apply {
+            foo(b)
+            this@A.foo(b)
+        }
+    }
+}

idea/testData/refactoring/move/kotlin/moveMethod/moveToClass/parameterAsReference/before/b/B.kt

@@ -0,0 +1,9 @@
+package b
+
+import a.A
+
+class B (val a: A) {
+    fun baz(b: B) {
+        a.foo(b)
+    }
+}

idea/testData/refactoring/move/kotlin/moveMethod/moveToClass/parameterAsReference/before/usages/JavaUsage.java

@@ -0,0 +1,10 @@
+package usages;
+
+import a.A;
+import b.B;
+
+public class JavaUsage {
+    void javaUsage(A a, B b) {
+        a.foo(b);
+    }
+}

idea/testData/refactoring/move/kotlin/moveMethod/moveToClass/parameterAsReference/before/usages/kotlinUsage.kt

@@ -0,0 +1,6 @@
+import a.A
+import b.B
+
+fun kotlinUsage(a: A, b: B) {
+    a.foo(b)
+}

idea/testData/refactoring/move/kotlin/moveMethod/moveToClass/parameterAsReference/parameterAsReference.test

@@ -0,0 +1,6 @@
+{
+  "mainFile": "a/A.kt",
+  "type": "MOVE_KOTLIN_METHOD",
+  "methodToMove": "foo",
+  "methodParameter": "b"
+}

idea/testData/refactoring/move/kotlin/moveMethod/moveToClass/propertyAsReference/after/a/A.kt

@@ -0,0 +1,8 @@
+package a
+
+import b.B
+
+class A(val b: B) {
+
+    fun bar() {}
+}

idea/testData/refactoring/move/kotlin/moveMethod/moveToClass/propertyAsReference/after/b/B.kt

@@ -0,0 +1,14 @@
+package b
+
+import a.A
+
+class B (val a: A) {
+    fun baz() {
+        a.b.foo(a)
+    }
+
+    fun foo(a: A) {
+        val a1 = this.a
+        a.bar()
+    }
+}

idea/testData/refactoring/move/kotlin/moveMethod/moveToClass/propertyAsReference/after/usages/JavaUsage.java

@@ -0,0 +1,9 @@
+package usages;
+
+import a.A;
+
+public class JavaUsage {
+    void javaUsage(A a) {
+        a.getB().foo(a);
+    }
+}

idea/testData/refactoring/move/kotlin/moveMethod/moveToClass/propertyAsReference/after/usages/kotlinUsage.kt

@@ -0,0 +1,5 @@
+import a.A
+
+fun kotlinUsage(a: A) {
+    a.b.foo(a)
+}

idea/testData/refactoring/move/kotlin/moveMethod/moveToClass/propertyAsReference/before/a/A.kt

@@ -0,0 +1,12 @@
+package a
+
+import b.B
+
+class A(val b: B) {
+    fun foo() {
+        val a1 = b.a
+        bar()
+    }
+
+    fun bar() {}
+}

idea/testData/refactoring/move/kotlin/moveMethod/moveToClass/propertyAsReference/before/b/B.kt

@@ -0,0 +1,9 @@
+package b
+
+import a.A
+
+class B (val a: A) {
+    fun baz() {
+        a.foo()
+    }
+}

idea/testData/refactoring/move/kotlin/moveMethod/moveToClass/propertyAsReference/before/usages/JavaUsage.java

@@ -0,0 +1,9 @@
+package usages;
+
+import a.A;
+
+public class JavaUsage {
+    void javaUsage(A a) {
+        a.foo();
+    }
+}

idea/testData/refactoring/move/kotlin/moveMethod/moveToClass/propertyAsReference/before/usages/kotlinUsage.kt

@@ -0,0 +1,5 @@
+import a.A
+
+fun kotlinUsage(a: A) {
+    a.foo()
+}

idea/testData/refactoring/move/kotlin/moveMethod/moveToClass/propertyAsReference/propertyAsReference.test

@@ -0,0 +1,7 @@
+{
+  "mainFile": "a/A.kt",
+  "type": "MOVE_KOTLIN_METHOD",
+  "methodToMove": "foo",
+  "sourceProperty": "b",
+  "outerInstanceParameter": "a"
+}

idea/testData/refactoring/move/kotlin/moveMethod/moveToObject/after/a/A.kt

@@ -0,0 +1,8 @@
+package a
+
+import b.B
+
+class A(val b: B) {
+
+    fun bar() {}
+}

idea/testData/refactoring/move/kotlin/moveMethod/moveToObject/after/b/B.kt

@@ -0,0 +1,13 @@
+package b
+
+import a.A
+
+object B {
+    fun baz(a: A) {
+        B.foo(a)
+    }
+
+    fun foo(a: A) {
+        a.bar()
+    }
+}

idea/testData/refactoring/move/kotlin/moveMethod/moveToObject/after/usages/JavaUsage.java

@@ -0,0 +1,10 @@
+package usages;
+
+import a.A;
+import b.B;
+
+public class JavaUsage {
+    void javaUsage(A a) {
+        B.INSTANCE.foo(a);
+    }
+}

idea/testData/refactoring/move/kotlin/moveMethod/moveToObject/after/usages/kotlinUsage.kt

@@ -0,0 +1,6 @@
+import a.A
+import b.B
+
+fun kotlinUsage(a: A) {
+    B.foo(a)
+}

idea/testData/refactoring/move/kotlin/moveMethod/moveToObject/before/a/A.kt

@@ -0,0 +1,11 @@
+package a
+
+import b.B
+
+class A(val b: B) {
+    fun foo() {
+        bar()
+    }
+
+    fun bar() {}
+}

idea/testData/refactoring/move/kotlin/moveMethod/moveToObject/before/b/B.kt

@@ -0,0 +1,9 @@
+package b
+
+import a.A
+
+object B {
+    fun baz(a: A) {
+        a.foo()
+    }
+}

idea/testData/refactoring/move/kotlin/moveMethod/moveToObject/before/usages/JavaUsage.java

@@ -0,0 +1,10 @@
+package usages;
+
+import a.A;
+import b.B;
+
+public class JavaUsage {
+    void javaUsage(A a) {
+        a.foo();
+    }
+}

idea/testData/refactoring/move/kotlin/moveMethod/moveToObject/before/usages/kotlinUsage.kt

@@ -0,0 +1,5 @@
+import a.A
+
+fun kotlinUsage(a: A) {
+    a.foo()
+}

idea/testData/refactoring/move/kotlin/moveMethod/moveToObject/moveToObject.test

@@ -0,0 +1,7 @@
+{
+  "mainFile": "a/A.kt",
+  "type": "MOVE_KOTLIN_METHOD",
+  "methodToMove": "foo",
+  "targetObject": "b.B",
+  "outerInstanceParameter": "a"
+}