KT-18158 Expand selection should select the comment after expression getter on the same line (#1122)

* Expand selection should select the comment after expression getter on the same line #KT-18158 Fixed

* Fixed expand selection behavior for the declaration with comment #KT-18158

* Remove redundant code #KT-18158

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

@@ -6,7 +6,7 @@ interface A {
 fun some() : A {
     return object : A {
         override val method: () -> Unit?
-            get() = <selection><caret>TODO("not implemented")</selection> //To change initializer of created properties use File | Settings | File Templates.
+            get() = <selection><caret>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
     }
 }
 

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

@@ -4,5 +4,5 @@ interface A {
 
 class B : A {
     override val String.prop: Int
-        get() = <selection><caret>TODO("not implemented")</selection> //To change initializer of created properties use File | Settings | File Templates.
+        get() = <selection><caret>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
 }

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

@@ -4,6 +4,6 @@ interface A {
 
 class B : A {
     override var Int.foo: Double
-        get() = <selection><caret>TODO("not implemented")</selection> //To change initializer of created properties use File | Settings | File Templates.
+        get() = <selection><caret>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
         set(value) {}
 }

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

@@ -11,7 +11,7 @@ interface T {
 
 class C : T {
     override val a1: Byte
-        get() = <selection><caret>TODO("not implemented")</selection> //To change initializer of created properties use File | Settings | File Templates.
+        get() = <selection><caret>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
     override val a2: Short
         get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
     override val a3: Int

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

@@ -4,5 +4,5 @@ interface T {
 
 class GC() : T {
     override val v: Int
-        get() = <selection><caret>TODO("not implemented")</selection> //To change initializer of created properties use File | Settings | File Templates.
+        get() = <selection><caret>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
 }

idea/testData/intentions/declarations/convertMemberToExtension/abstract.kt.after

@@ -3,5 +3,5 @@ abstract class Owner {
 }
 
 fun Owner.f() {
-    <caret><selection>TODO("not implemented")</selection> //To change body of created functions use File | Settings | File Templates.
+    <caret><selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
 }

idea/testData/intentions/declarations/convertMemberToExtension/abstractProperty.kt.after

@@ -3,4 +3,4 @@ abstract class Owner {
 }
 
 val Owner.p: Int
-    get() = <caret><selection>TODO("not implemented")</selection> //To change initializer of created properties use File | Settings | File Templates.
+    get() = <caret><selection>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>

idea/testData/intentions/declarations/convertMemberToExtension/valWithDefaultGetter.kt.after

@@ -4,4 +4,4 @@ class Owner {
 }
 
 val Owner.p: Int
-    get() = <caret><selection>TODO("not implemented")</selection> //To change initializer of created properties use File | Settings | File Templates.
+    get() = <caret><selection>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>

idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultGetterAndSetter.kt.after

@@ -4,7 +4,7 @@ class Owner {
 }
 
 var Owner.p: Int
-    get() = <caret><selection>TODO("not implemented")</selection> //To change initializer of created properties use File | Settings | File Templates.
+    get() = <caret><selection>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
     set(value) {
         TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
     }

idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultSetter.kt.after

@@ -6,5 +6,5 @@ class Owner {
 var Owner.p: Int
     get() = 1
     set(value) {
-        <caret><selection>TODO("not implemented")</selection> //To change initializer of created properties use File | Settings | File Templates.
+        <caret><selection>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
     }

idea/testData/intentions/declarations/convertMemberToExtension/varWithGetter.kt.after

@@ -6,5 +6,5 @@ class Owner {
 var Owner.p: Int
     get() { return 1 }
     set(value) {
-        <caret><selection>TODO("not implemented")</selection> //To change initializer of created properties use File | Settings | File Templates.
+        <caret><selection>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
     }

idea/testData/intentions/declarations/convertMemberToExtension/varWithSetter.kt.after

@@ -5,5 +5,5 @@ class Owner {
 }
 
 var Owner.p: Int
-    get() = <caret><selection>TODO("not implemented")</selection> //To change initializer of created properties use File | Settings | File Templates.
+    get() = <caret><selection>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
     set(v) {}

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

@@ -8,5 +8,5 @@ enum class E : T<Int> {
     A, B, C;
 
     override val foo: Int
-        get() = <caret><selection>TODO("not implemented")</selection> //To change initializer of created properties use File | Settings | File Templates.
+        get() = <caret><selection>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
 }

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

@@ -8,5 +8,5 @@ enum class E : T<Int> {
     A, B, C;
 
     override val foo: Int
-        get() = <caret><selection>TODO("not implemented")</selection> //To change initializer of created properties use File | Settings | File Templates.
+        get() = <caret><selection>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
 }

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

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

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

@@ -9,7 +9,7 @@ enum class E(n: Int) {
             get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
     }, C(3) {
         override val foo: Int
-            get() = <caret><selection>TODO("not implemented")</selection> //To change initializer of created properties use File | Settings | File Templates.
+            get() = <caret><selection>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
     };
 
     abstract val foo: Int

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

@@ -12,7 +12,7 @@ class U : T<String> {
 
 class V : T<Int> {
     override val foo: Int
-        get() = <caret><selection>TODO("not implemented")</selection> //To change initializer of created properties use File | Settings | File Templates.
+        get() = <caret><selection>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
 
 }
 

idea/testData/wordSelection/DeclarationWithComment1/0.kt

@@ -0,0 +1,2 @@
+val s1: String
+    get() = <caret>TODO("not implemented") // after

idea/testData/wordSelection/DeclarationWithComment1/1.kt

@@ -0,0 +1,2 @@
+val s1: String
+    get() = <selection><caret>TODO</selection>("not implemented") // after

idea/testData/wordSelection/DeclarationWithComment1/2.kt

@@ -0,0 +1,2 @@
+val s1: String
+    get() = <selection><caret>TODO("not implemented")</selection> // after

idea/testData/wordSelection/DeclarationWithComment1/3.kt

@@ -0,0 +1,2 @@
+val s1: String
+    get() = <selection><caret>TODO("not implemented") // after</selection>

idea/testData/wordSelection/DeclarationWithComment1/4.kt

@@ -0,0 +1,2 @@
+val s1: String
+    <selection>get() = <caret>TODO("not implemented") // after</selection>

idea/testData/wordSelection/DeclarationWithComment2/0.kt

@@ -0,0 +1,2 @@
+val s2: String
+    get() = /* before */ <caret>TODO("not implemented")

idea/testData/wordSelection/DeclarationWithComment2/1.kt

@@ -0,0 +1,2 @@
+val s2: String
+    get() = /* before */ <selection><caret>TODO</selection>("not implemented")

idea/testData/wordSelection/DeclarationWithComment2/2.kt

@@ -0,0 +1,2 @@
+val s2: String
+    get() = /* before */ <selection><caret>TODO("not implemented")</selection>

idea/testData/wordSelection/DeclarationWithComment2/3.kt

@@ -0,0 +1,2 @@
+val s2: String
+    get() = <selection>/* before */ <caret>TODO("not implemented")</selection>

idea/testData/wordSelection/DeclarationWithComment2/4.kt

@@ -0,0 +1,2 @@
+val s2: String
+    <selection>get() = /* before */ <caret>TODO("not implemented")</selection>

idea/testData/wordSelection/DeclarationWithComment3/0.kt

@@ -0,0 +1,2 @@
+val s3: String
+    get() = /* before */ <caret>TODO("not implemented") // after

idea/testData/wordSelection/DeclarationWithComment3/1.kt

@@ -0,0 +1,2 @@
+val s3: String
+    get() = /* before */ <selection><caret>TODO</selection>("not implemented") // after

idea/testData/wordSelection/DeclarationWithComment3/2.kt

@@ -0,0 +1,2 @@
+val s3: String
+    get() = /* before */ <selection><caret>TODO("not implemented")</selection> // after

idea/testData/wordSelection/DeclarationWithComment3/3.kt

@@ -0,0 +1,2 @@
+val s3: String
+    get() = <selection>/* before */ <caret>TODO("not implemented") // after</selection>

idea/testData/wordSelection/DeclarationWithComment3/4.kt

@@ -0,0 +1,2 @@
+val s3: String
+    <selection>get() = /* before */ <caret>TODO("not implemented") // after</selection>

idea/testData/wordSelection/DeclarationWithComment4/0.kt

@@ -0,0 +1,2 @@
+val s4: String
+    get() = /* before1 */ /* before2 */ <caret>TODO("not implemented") /* after1 */ /* after2 */

idea/testData/wordSelection/DeclarationWithComment4/1.kt

@@ -0,0 +1,2 @@
+val s4: String
+    get() = /* before1 */ /* before2 */ <selection><caret>TODO</selection>("not implemented") /* after1 */ /* after2 */

idea/testData/wordSelection/DeclarationWithComment4/2.kt

@@ -0,0 +1,2 @@
+val s4: String
+    get() = /* before1 */ /* before2 */ <selection><caret>TODO("not implemented")</selection> /* after1 */ /* after2 */

idea/testData/wordSelection/DeclarationWithComment4/3.kt

@@ -0,0 +1,2 @@
+val s4: String
+    get() = <selection>/* before1 */ /* before2 */ <caret>TODO("not implemented") /* after1 */ /* after2 */</selection>

idea/testData/wordSelection/DeclarationWithComment4/4.kt

@@ -0,0 +1,2 @@
+val s4: String
+    <selection>get() = /* before1 */ /* before2 */ <caret>TODO("not implemented") /* after1 */ /* after2 */</selection>