Override/Implement members: place members in the same order as super class members

idea/testData/codeInsight/overrideImplement/implementFromClassName.kt

@@ -0,0 +1,8 @@
+interface Runnable {
+    fun run()
+}
+
+class <caret>A : Runnable {
+    fun foo() {
+    }
+}

idea/testData/codeInsight/overrideImplement/implementFromClassName.kt.after

@@ -0,0 +1,12 @@
+interface Runnable {
+    fun run()
+}
+
+class A : Runnable {
+    fun foo() {
+    }
+
+    override fun run() {
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+    }
+}

idea/testData/codeInsight/overrideImplement/implementFromClassName2.kt

@@ -0,0 +1,18 @@
+interface A {
+    fun a1()
+    fun a2()
+    fun a3()
+    fun a4()
+    fun a5()
+    fun a6()
+    fun a7()
+    fun a8()
+}
+
+class <caret>Test : A {
+    override fun a3() {
+    }
+
+    override fun a6() {
+    }
+}

idea/testData/codeInsight/overrideImplement/implementFromClassName2.kt.after

@@ -0,0 +1,42 @@
+interface A {
+    fun a1()
+    fun a2()
+    fun a3()
+    fun a4()
+    fun a5()
+    fun a6()
+    fun a7()
+    fun a8()
+}
+
+class Test : A {
+    override fun a1() {
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+    }
+
+    override fun a2() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun a3() {
+    }
+
+    override fun a4() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun a5() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun a6() {
+    }
+
+    override fun a7() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun a8() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+}

idea/testData/codeInsight/overrideImplement/implementFromClassName3.kt

@@ -0,0 +1,18 @@
+interface A {
+    fun a1()
+    fun a2()
+    fun a3()
+    fun a4()
+    fun a5()
+    fun a6()
+    fun a7()
+    fun a8()
+}
+
+class <caret>Test : A {
+    override fun a6() {
+    }
+
+    override fun a3() {
+    }
+}

idea/testData/codeInsight/overrideImplement/implementFromClassName3.kt.after

@@ -0,0 +1,42 @@
+interface A {
+    fun a1()
+    fun a2()
+    fun a3()
+    fun a4()
+    fun a5()
+    fun a6()
+    fun a7()
+    fun a8()
+}
+
+class Test : A {
+    override fun a6() {
+    }
+
+    override fun a7() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun a8() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun a1() {
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+    }
+
+    override fun a2() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun a3() {
+    }
+
+    override fun a4() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun a5() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+}

idea/testData/codeInsight/overrideImplement/implementFromClassName4.kt

@@ -0,0 +1,21 @@
+interface A {
+    fun a1()
+    fun a2()
+    fun a3()
+    fun a4()
+    fun a5()
+    fun a6()
+    fun a7()
+    fun a8()
+}
+
+class <caret>Test : A {
+    override fun a4() {
+    }
+
+    override fun a6() {
+    }
+
+    override fun a2() {
+    }
+}

idea/testData/codeInsight/overrideImplement/implementFromClassName4.kt.after

@@ -0,0 +1,41 @@
+interface A {
+    fun a1()
+    fun a2()
+    fun a3()
+    fun a4()
+    fun a5()
+    fun a6()
+    fun a7()
+    fun a8()
+}
+
+class Test : A {
+    override fun a4() {
+    }
+
+    override fun a5() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun a6() {
+    }
+
+    override fun a7() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun a8() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun a1() {
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+    }
+
+    override fun a2() {
+    }
+
+    override fun a3() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+}

idea/testData/codeInsight/overrideImplement/implementFromClassName5.kt

@@ -0,0 +1,27 @@
+interface A {
+    fun a1()
+    fun a2()
+    fun a3()
+    fun a4()
+    fun a5()
+    fun a6()
+    fun a7()
+    fun a8()
+}
+
+class <caret>Test : A {
+    fun foo() {
+    }
+
+    override fun a3() {
+    }
+
+    fun bar() {
+    }
+
+    override fun a6() {
+    }
+
+    fun baz() {
+    }
+}

idea/testData/codeInsight/overrideImplement/implementFromClassName5.kt.after

@@ -0,0 +1,51 @@
+interface A {
+    fun a1()
+    fun a2()
+    fun a3()
+    fun a4()
+    fun a5()
+    fun a6()
+    fun a7()
+    fun a8()
+}
+
+class Test : A {
+    fun foo() {
+    }
+
+    override fun a1() {
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+    }
+
+    override fun a2() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun a3() {
+    }
+
+    override fun a4() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun a5() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    fun bar() {
+    }
+
+    override fun a6() {
+    }
+
+    override fun a7() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun a8() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    fun baz() {
+    }
+}

idea/testData/codeInsight/overrideImplement/implementFromClassName6.kt

@@ -0,0 +1,27 @@
+interface A {
+    fun a1()
+    fun a2()
+    fun a3()
+    fun a4()
+    fun a5()
+    fun a6()
+    fun a7()
+    fun a8()
+}
+
+interface B {
+    fun b3()
+    fun b2()
+    fun b1()
+}
+
+class <caret>Test : A, B {
+    override fun a3() {
+    }
+
+    override fun b2() {
+    }
+
+    override fun a6() {
+    }
+}

idea/testData/codeInsight/overrideImplement/implementFromClassName6.kt.after

@@ -0,0 +1,59 @@
+interface A {
+    fun a1()
+    fun a2()
+    fun a3()
+    fun a4()
+    fun a5()
+    fun a6()
+    fun a7()
+    fun a8()
+}
+
+interface B {
+    fun b3()
+    fun b2()
+    fun b1()
+}
+
+class Test : A, B {
+    override fun a1() {
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+    }
+
+    override fun a2() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun a3() {
+    }
+
+    override fun a4() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun a5() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun b3() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun b2() {
+    }
+
+    override fun b1() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun a6() {
+    }
+
+    override fun a7() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun a8() {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+}

idea/testData/codeInsight/overrideImplement/overrideFromClassName.kt.after

@@ -3,6 +3,13 @@ interface Some {
 }
 
 class Other {
+    fun test() {
+        val a = 1
+    }
+    fun otherTest() {
+
+    }
+
     override fun equals(other: Any?): Boolean {
         <selection><caret>return super.equals(other)</selection>
     }
@@ -14,12 +21,5 @@ class Other {
     override fun toString(): String {
         return super.toString()
     }
-
-    fun test() {
-        val a = 1
-    }
-    fun otherTest() {
-
-    }
 }
 

idea/testData/intentions/implementAbstractMember/function/enumClassWithSemicolonAndMembers.kt.after

@@ -7,11 +7,10 @@ interface T<X> {
 enum class E : T<Int> {
     A, B, C;
 
-    override fun foo(x: Int): Int {
-        <caret><selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
-    }
-
     val bar = 1
 
     fun baz() = 2
+    override fun foo(x: Int): Int {
+        <caret><selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+    }
 }

idea/testData/intentions/implementAbstractMember/property/enumClassWithSemicolonAndMembers.kt.after

@@ -7,10 +7,9 @@ interface T<X> {
 enum class E : T<Int> {
     A, B, C;
 
-    override val foo: Int
-        get() = <caret><selection>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
-
     val bar = 1
 
     fun baz() = 2
+    override val foo: Int
+        get() = <caret><selection>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
 }