Intentions: Move class member to companion object

#KT-9697 In Progress

idea/testData/multiFileIntentions/moveToCompanion/moveFunction/after/test.kt

@@ -0,0 +1,62 @@
+package test
+
+inline fun <T, R> with(receiver: T, block: T.() -> R): R = receiver.block()
+
+class A {
+    class X {
+
+    }
+
+    inner class OuterY
+
+    fun outerFoo(n: Int) {}
+
+    val outerBar = 1
+
+    companion object {
+        class Y
+
+        fun foo(n: Int) {}
+
+        val bar = 1
+
+        fun Int.extFoo(n: Int) {}
+
+        val Int.extBar: Int get() = 1
+        fun test(a: A, n: Int) {
+            X()
+
+            Y()
+            foo(bar)
+            1.extFoo(1.extBar)
+
+            a.OuterY()
+            a.outerFoo(a.outerBar)
+
+            a.OuterY()
+            a.outerFoo(a.outerBar)
+
+            O.Y()
+            O.foo(O.bar)
+
+            with (O) {
+                Y()
+                foo(bar)
+                1.extFoo(1.extBar)
+            }
+        }
+    }
+
+    object O {
+        class Y
+
+        fun foo(n: Int) {}
+
+        val bar = 1
+
+        fun Int.extFoo(n: Int) {}
+
+        val Int.extBar: Int get() = 1
+    }
+
+}

idea/testData/multiFileIntentions/moveToCompanion/moveFunction/after/test2/usages.java

@@ -0,0 +1,9 @@
+package test2;
+
+import test.A;
+
+class Test {
+    void foo() {
+        A.Companion.test(new A(), 1);
+    }
+}

idea/testData/multiFileIntentions/moveToCompanion/moveFunction/after/usages.kt

@@ -0,0 +1,7 @@
+package test2
+
+import test.A
+
+fun foo() {
+    A.test(A(), 1)
+}

idea/testData/multiFileIntentions/moveToCompanion/moveFunction/before/test.kt

@@ -0,0 +1,62 @@
+package test
+
+inline fun <T, R> with(receiver: T, block: T.() -> R): R = receiver.block()
+
+class A {
+    class X {
+
+    }
+
+    inner class OuterY
+
+    fun outerFoo(n: Int) {}
+
+    val outerBar = 1
+
+    companion object {
+        class Y
+
+        fun foo(n: Int) {}
+
+        val bar = 1
+
+        fun Int.extFoo(n: Int) {}
+
+        val Int.extBar: Int get() = 1
+    }
+
+    object O {
+        class Y
+
+        fun foo(n: Int) {}
+
+        val bar = 1
+
+        fun Int.extFoo(n: Int) {}
+
+        val Int.extBar: Int get() = 1
+    }
+
+    fun <caret>test(n: Int) {
+        X()
+
+        Y()
+        foo(bar)
+        1.extFoo(1.extBar)
+
+        OuterY()
+        outerFoo(outerBar)
+
+        this.OuterY()
+        this.outerFoo(this@A.outerBar)
+
+        O.Y()
+        O.foo(O.bar)
+
+        with (O) {
+            Y()
+            foo(bar)
+            1.extFoo(1.extBar)
+        }
+    }
+}

idea/testData/multiFileIntentions/moveToCompanion/moveFunction/before/test2/usages.java

@@ -0,0 +1,9 @@
+package test2;
+
+import test.A;
+
+class Test {
+    void foo() {
+        new A().test(1);
+    }
+}

idea/testData/multiFileIntentions/moveToCompanion/moveFunction/before/usages.kt

@@ -0,0 +1,7 @@
+package test2
+
+import test.A
+
+fun foo() {
+    A().test(1)
+}

idea/testData/multiFileIntentions/moveToCompanion/moveFunction/moveFunction.test

@@ -0,0 +1,4 @@
+{
+  "mainFile": "test.kt",
+  "intentionClass": "org.jetbrains.kotlin.idea.intentions.MoveMemberToCompanionObjectIntention"
+}

idea/testData/multiFileIntentions/moveToCompanion/moveInnerClass/after/test.kt

@@ -0,0 +1,65 @@
+package test
+
+inline fun <T, R> with(receiver: T, block: T.() -> R): R = receiver.block()
+
+class A {
+    class X {
+
+    }
+
+    inner class OuterY
+
+    fun outerFoo(n: Int) {}
+
+    val outerBar = 1
+
+    companion object {
+        class Y
+
+        fun foo(n: Int) {}
+
+        val bar = 1
+
+        fun Int.extFoo(n: Int) {}
+
+        val Int.extBar: Int get() = 1
+
+        class B(private val a: A) {
+            fun test() {
+                X()
+
+                Y()
+                foo(bar)
+                1.extFoo(1.extBar)
+
+                a.OuterY()
+                a.outerFoo(a.outerBar)
+
+                a.OuterY()
+                a.outerFoo(a.outerBar)
+
+                O.Y()
+                O.foo(O.bar)
+
+                with (O) {
+                    Y()
+                    foo(bar)
+                    1.extFoo(1.extBar)
+                }
+            }
+        }
+    }
+
+    object O {
+        class Y
+
+        fun foo(n: Int) {}
+
+        val bar = 1
+
+        fun Int.extFoo(n: Int) {}
+
+        val Int.extBar: Int get() = 1
+    }
+
+}

idea/testData/multiFileIntentions/moveToCompanion/moveInnerClass/after/test2/usages.java

@@ -0,0 +1,9 @@
+package test2;
+
+import test.A;
+
+class Test {
+    A.Companion.B foo() {
+        return new A.Companion.B(new A());
+    }
+}

idea/testData/multiFileIntentions/moveToCompanion/moveInnerClass/after/test2/usages2.java

@@ -0,0 +1,10 @@
+package test2;
+
+import test.A;
+import test.A.Companion.B;
+
+class Test {
+    B foo() {
+        return new B(new A());
+    }
+}

idea/testData/multiFileIntentions/moveToCompanion/moveInnerClass/after/usages.kt

@@ -0,0 +1,7 @@
+package test2
+
+import test.A
+
+fun foo(): A.Companion.B {
+    return A.Companion.B(A())
+}

idea/testData/multiFileIntentions/moveToCompanion/moveInnerClass/after/usages2.kt

@@ -0,0 +1,8 @@
+package test2
+
+import test.A
+import test.A.Companion.B
+
+fun foo2(): B {
+    return B(A())
+}

idea/testData/multiFileIntentions/moveToCompanion/moveInnerClass/before/test.kt

@@ -0,0 +1,64 @@
+package test
+
+inline fun <T, R> with(receiver: T, block: T.() -> R): R = receiver.block()
+
+class A {
+    class X {
+
+    }
+
+    inner class OuterY
+
+    fun outerFoo(n: Int) {}
+
+    val outerBar = 1
+
+    companion object {
+        class Y
+
+        fun foo(n: Int) {}
+
+        val bar = 1
+
+        fun Int.extFoo(n: Int) {}
+
+        val Int.extBar: Int get() = 1
+    }
+
+    object O {
+        class Y
+
+        fun foo(n: Int) {}
+
+        val bar = 1
+
+        fun Int.extFoo(n: Int) {}
+
+        val Int.extBar: Int get() = 1
+    }
+
+    inner class <caret>B {
+        fun test() {
+            X()
+
+            Y()
+            foo(bar)
+            1.extFoo(1.extBar)
+
+            OuterY()
+            outerFoo(outerBar)
+
+            this@A.OuterY()
+            this@A.outerFoo(this@A.outerBar)
+
+            O.Y()
+            O.foo(O.bar)
+
+            with (O) {
+                Y()
+                foo(bar)
+                1.extFoo(1.extBar)
+            }
+        }
+    }
+}

idea/testData/multiFileIntentions/moveToCompanion/moveInnerClass/before/test2/usages.java

@@ -0,0 +1,9 @@
+package test2;
+
+import test.A;
+
+class Test {
+    A.B foo() {
+        return new A().new B();
+    }
+}

idea/testData/multiFileIntentions/moveToCompanion/moveInnerClass/before/test2/usages2.java

@@ -0,0 +1,10 @@
+package test2;
+
+import test.A;
+import test.A.B;
+
+class Test {
+    B foo() {
+        return new A().new B();
+    }
+}

idea/testData/multiFileIntentions/moveToCompanion/moveInnerClass/before/usages.kt

@@ -0,0 +1,7 @@
+package test2
+
+import test.A
+
+fun foo(): A.B {
+    return A().B()
+}

idea/testData/multiFileIntentions/moveToCompanion/moveInnerClass/before/usages2.kt

@@ -0,0 +1,8 @@
+package test2
+
+import test.A
+import test.A.B
+
+fun foo2(): B {
+    return A().B()
+}

idea/testData/multiFileIntentions/moveToCompanion/moveInnerClass/moveInnerClass.test

@@ -0,0 +1,4 @@
+{
+  "mainFile": "test.kt",
+  "intentionClass": "org.jetbrains.kotlin.idea.intentions.MoveMemberToCompanionObjectIntention"
+}

idea/testData/multiFileIntentions/moveToCompanion/moveNonInnerClass/after/test.kt

@@ -0,0 +1,53 @@
+package test
+
+inline fun <T, R> with(receiver: T, block: T.() -> R): R = receiver.block()
+
+class A {
+    class X {
+
+    }
+
+    companion object {
+        class Y
+
+        fun foo(n: Int) {}
+
+        val bar = 1
+
+        fun Int.extFoo(n: Int) {}
+
+        val Int.extBar: Int get() = 1
+
+        class B {
+            fun test() {
+                X()
+
+                Y()
+                foo(bar)
+                1.extFoo(1.extBar)
+
+                O.Y()
+                O.foo(O.bar)
+
+                with (O) {
+                    Y()
+                    foo(bar)
+                    1.extFoo(1.extBar)
+                }
+            }
+        }
+    }
+
+    object O {
+        class Y
+
+        fun foo(n: Int) {}
+
+        val bar = 1
+
+        fun Int.extFoo(n: Int) {}
+
+        val Int.extBar: Int get() = 1
+    }
+
+}

idea/testData/multiFileIntentions/moveToCompanion/moveNonInnerClass/after/test2/usages.java

@@ -0,0 +1,9 @@
+package test2;
+
+import test.A;
+
+class Test {
+    A.Companion.B foo() {
+        return new A.Companion.B();
+    }
+}

idea/testData/multiFileIntentions/moveToCompanion/moveNonInnerClass/after/test2/usages2.java

@@ -0,0 +1,9 @@
+package test2;
+
+import test.A.Companion.B;
+
+class Test {
+    B foo() {
+        return new B();
+    }
+}

idea/testData/multiFileIntentions/moveToCompanion/moveNonInnerClass/after/usages.kt

@@ -0,0 +1,7 @@
+package test2
+
+import test.A
+
+fun foo(): A.Companion.B {
+    return A.Companion.B()
+}

idea/testData/multiFileIntentions/moveToCompanion/moveNonInnerClass/after/usages2.kt

@@ -0,0 +1,7 @@
+package test2
+
+import test.A.Companion.B
+
+fun foo(): B {
+    return B()
+}

idea/testData/multiFileIntentions/moveToCompanion/moveNonInnerClass/before/test.kt

@@ -0,0 +1,52 @@
+package test
+
+inline fun <T, R> with(receiver: T, block: T.() -> R): R = receiver.block()
+
+class A {
+    class X {
+
+    }
+
+    companion object {
+        class Y
+
+        fun foo(n: Int) {}
+
+        val bar = 1
+
+        fun Int.extFoo(n: Int) {}
+
+        val Int.extBar: Int get() = 1
+    }
+
+    object O {
+        class Y
+
+        fun foo(n: Int) {}
+
+        val bar = 1
+
+        fun Int.extFoo(n: Int) {}
+
+        val Int.extBar: Int get() = 1
+    }
+
+    class <caret>B {
+        fun test() {
+            X()
+
+            Y()
+            foo(bar)
+            1.extFoo(1.extBar)
+
+            O.Y()
+            O.foo(O.bar)
+
+            with (O) {
+                Y()
+                foo(bar)
+                1.extFoo(1.extBar)
+            }
+        }
+    }
+}

idea/testData/multiFileIntentions/moveToCompanion/moveNonInnerClass/before/test2/usages.java

@@ -0,0 +1,9 @@
+package test2;
+
+import test.A;
+
+class Test {
+    A.B foo() {
+        return new A.B();
+    }
+}

idea/testData/multiFileIntentions/moveToCompanion/moveNonInnerClass/before/test2/usages2.java

@@ -0,0 +1,9 @@
+package test2;
+
+import test.A.B;
+
+class Test {
+    B foo() {
+        return new B();
+    }
+}

idea/testData/multiFileIntentions/moveToCompanion/moveNonInnerClass/before/usages.kt

@@ -0,0 +1,7 @@
+package test2
+
+import test.A
+
+fun foo(): A.B {
+    return A.B()
+}

idea/testData/multiFileIntentions/moveToCompanion/moveNonInnerClass/before/usages2.kt

@@ -0,0 +1,7 @@
+package test2
+
+import test.A.B
+
+fun foo(): B {
+    return B()
+}

idea/testData/multiFileIntentions/moveToCompanion/moveNonInnerClass/moveNonInnerClass.test

@@ -0,0 +1,4 @@
+{
+  "mainFile": "test.kt",
+  "intentionClass": "org.jetbrains.kotlin.idea.intentions.MoveMemberToCompanionObjectIntention"
+}

idea/testData/multiFileIntentions/moveToCompanion/moveProperty/after/test.kt

@@ -0,0 +1,58 @@
+package test
+
+inline fun <T, R> with(receiver: T, block: T.() -> R): R = receiver.block()
+
+class A {
+    class X {
+
+    }
+
+    inner class OuterY
+
+    fun outerFoo(n: Int) {}
+
+    val outerBar = 1
+
+    companion object {
+        class Y
+
+        fun foo(n: Int) {}
+
+        val bar = 1
+
+        fun Int.extFoo(n: Int) {}
+
+        val Int.extBar: Int get() = 1
+        var test: Int
+            get() = 1
+            set(value: Int) {
+                X()
+
+                Y()
+                foo(bar)
+                1.extFoo(1.extBar)
+
+                O.Y()
+                O.foo(O.bar)
+
+                with (O) {
+                    Y()
+                    foo(bar)
+                    1.extFoo(1.extBar)
+                }
+            }
+    }
+
+    object O {
+        class Y
+
+        fun foo(n: Int) {}
+
+        val bar = 1
+
+        fun Int.extFoo(n: Int) {}
+
+        val Int.extBar: Int get() = 1
+    }
+
+}

idea/testData/multiFileIntentions/moveToCompanion/moveProperty/after/test2/usages.java

@@ -0,0 +1,10 @@
+package test2;
+
+import test.A;
+
+class Test {
+    void foo() {
+        int x = A.Companion.getTest();
+        A.Companion.setTest(1);
+    }
+}

idea/testData/multiFileIntentions/moveToCompanion/moveProperty/after/usages.kt

@@ -0,0 +1,8 @@
+package test2
+
+import test.A
+
+fun foo() {
+    val x = A.test
+    A.test = 1
+}

idea/testData/multiFileIntentions/moveToCompanion/moveProperty/before/test.kt

@@ -0,0 +1,58 @@
+package test
+
+inline fun <T, R> with(receiver: T, block: T.() -> R): R = receiver.block()
+
+class A {
+    class X {
+
+    }
+
+    inner class OuterY
+
+    fun outerFoo(n: Int) {}
+
+    val outerBar = 1
+
+    companion object {
+        class Y
+
+        fun foo(n: Int) {}
+
+        val bar = 1
+
+        fun Int.extFoo(n: Int) {}
+
+        val Int.extBar: Int get() = 1
+    }
+
+    object O {
+        class Y
+
+        fun foo(n: Int) {}
+
+        val bar = 1
+
+        fun Int.extFoo(n: Int) {}
+
+        val Int.extBar: Int get() = 1
+    }
+
+    var <caret>test: Int
+        get() = 1
+        set(value: Int) {
+            X()
+
+            Y()
+            foo(bar)
+            1.extFoo(1.extBar)
+
+            O.Y()
+            O.foo(O.bar)
+
+            with (O) {
+                Y()
+                foo(bar)
+                1.extFoo(1.extBar)
+            }
+        }
+}

idea/testData/multiFileIntentions/moveToCompanion/moveProperty/before/test2/usages.java

@@ -0,0 +1,10 @@
+package test2;
+
+import test.A;
+
+class Test {
+    void foo() {
+        int x = new A().getTest();
+        new A().setTest(1);
+    }
+}

idea/testData/multiFileIntentions/moveToCompanion/moveProperty/before/usages.kt

@@ -0,0 +1,8 @@
+package test2
+
+import test.A
+
+fun foo() {
+    val x = A().test
+    A().test = 1
+}

idea/testData/multiFileIntentions/moveToCompanion/moveProperty/moveProperty.test

@@ -0,0 +1,4 @@
+{
+  "mainFile": "test.kt",
+  "intentionClass": "org.jetbrains.kotlin.idea.intentions.MoveMemberToCompanionObjectIntention"
+}