Expand selection for class members #KT-28289 Fixed

idea/resources/META-INF/plugin-common.xml

@@ -593,6 +593,7 @@
     <extendWordSelectionHandler implementation="org.jetbrains.kotlin.idea.editor.wordSelection.KotlinSuperTypeSelectioner"/>
     <extendWordSelectionHandler implementation="org.jetbrains.kotlin.idea.editor.wordSelection.KotlinBracketsSelectioner"/>
     <extendWordSelectionHandler implementation="org.jetbrains.kotlin.idea.editor.wordSelection.KotlinLabeledReturnSelectioner"/>
+    <extendWordSelectionHandler implementation="org.jetbrains.kotlin.idea.editor.wordSelection.KotlinClassMemberSelectioner"/>
     <basicWordSelectionFilter implementation="org.jetbrains.kotlin.idea.editor.wordSelection.KotlinWordSelectionFilter"/>
 
     <typedHandler implementation="org.jetbrains.kotlin.idea.editor.KotlinTypedHandler"/>

idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinClassMemberSelectioner.kt

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.editor.wordSelection
+
+import com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.util.TextRange
+import com.intellij.psi.PsiElement
+import org.jetbrains.kotlin.psi.KtClassBody
+import org.jetbrains.kotlin.psi.psiUtil.getNextSiblingIgnoringWhitespace
+import org.jetbrains.kotlin.psi.psiUtil.getPrevSiblingIgnoringWhitespace
+
+class KotlinClassMemberSelectioner : ExtendWordSelectionHandlerBase() {
+    override fun canSelect(e: PsiElement): Boolean {
+        return e.parent is KtClassBody
+    }
+
+    override fun select(e: PsiElement, editorText: CharSequence, cursorOffset: Int, editor: Editor): List<TextRange>? {
+        val parent = e.parent
+        val firstChild = parent.firstChild ?: return null
+        val lastChild = parent.lastChild ?: return null
+        val startElement = firstChild.getNextSiblingIgnoringWhitespace() ?: firstChild
+        val endElement = lastChild.getPrevSiblingIgnoringWhitespace() ?: lastChild
+        val textRange = TextRange(startElement.textRange.startOffset, endElement.textRange.endOffset)
+        return expandToWholeLinesWithBlanks(editorText, textRange)
+    }
+}

idea/testData/wordSelection/ClassMember1/0.kt

@@ -0,0 +1,12 @@
+class C {
+    <caret>constructor()
+
+    init {
+    }
+
+    fun foo() {
+    }
+
+    // comment
+    val bar = 1
+}

idea/testData/wordSelection/ClassMember1/1.kt

@@ -0,0 +1,12 @@
+class C {
+    <selection><caret>constructor</selection>()
+
+    init {
+    }
+
+    fun foo() {
+    }
+
+    // comment
+    val bar = 1
+}

idea/testData/wordSelection/ClassMember1/2.kt

@@ -0,0 +1,12 @@
+class C {
+    <selection><caret>constructor()</selection>
+
+    init {
+    }
+
+    fun foo() {
+    }
+
+    // comment
+    val bar = 1
+}

idea/testData/wordSelection/ClassMember1/3.kt

@@ -0,0 +1,12 @@
+class C {
+<selection>    <caret>constructor()
+</selection>
+    init {
+    }
+
+    fun foo() {
+    }
+
+    // comment
+    val bar = 1
+}

idea/testData/wordSelection/ClassMember1/4.kt

@@ -0,0 +1,12 @@
+class C {
+<selection>    <caret>constructor()
+
+    init {
+    }
+
+    fun foo() {
+    }
+
+    // comment
+    val bar = 1
+</selection>}

idea/testData/wordSelection/ClassMember1/5.kt

@@ -0,0 +1,12 @@
+class C <selection>{
+    <caret>constructor()
+
+    init {
+    }
+
+    fun foo() {
+    }
+
+    // comment
+    val bar = 1
+}</selection>

idea/testData/wordSelection/ClassMember2/0.kt

@@ -0,0 +1,13 @@
+class C {
+
+    constructor()
+
+    <caret>init {
+    }
+
+    fun foo() {
+    }
+
+    // comment
+    val bar = 1
+}

idea/testData/wordSelection/ClassMember2/1.kt

@@ -0,0 +1,13 @@
+class C {
+
+    constructor()
+
+    <selection><caret>init</selection> {
+    }
+
+    fun foo() {
+    }
+
+    // comment
+    val bar = 1
+}

idea/testData/wordSelection/ClassMember2/2.kt

@@ -0,0 +1,13 @@
+class C {
+
+    constructor()
+
+<selection>    <caret>init {
+    }
+</selection>
+    fun foo() {
+    }
+
+    // comment
+    val bar = 1
+}

idea/testData/wordSelection/ClassMember2/3.kt

@@ -0,0 +1,13 @@
+class C {
+
+<selection>    constructor()
+
+    <caret>init {
+    }
+
+    fun foo() {
+    }
+
+    // comment
+    val bar = 1
+</selection>}

idea/testData/wordSelection/ClassMember2/4.kt

@@ -0,0 +1,13 @@
+class C {
+<selection>
+    constructor()
+
+    <caret>init {
+    }
+
+    fun foo() {
+    }
+
+    // comment
+    val bar = 1
+</selection>}

idea/testData/wordSelection/ClassMember2/5.kt

@@ -0,0 +1,13 @@
+class C <selection>{
+
+    constructor()
+
+    <caret>init {
+    }
+
+    fun foo() {
+    }
+
+    // comment
+    val bar = 1
+}</selection>

idea/testData/wordSelection/ClassMember3/0.kt

@@ -0,0 +1,13 @@
+class C {
+    constructor()
+
+    init {
+    }
+
+    <caret>fun foo() {
+    }
+
+    // comment
+    val bar = 1
+
+}

idea/testData/wordSelection/ClassMember3/1.kt

@@ -0,0 +1,13 @@
+class C {
+    constructor()
+
+    init {
+    }
+
+    <selection><caret>fun</selection> foo() {
+    }
+
+    // comment
+    val bar = 1
+
+}

idea/testData/wordSelection/ClassMember3/2.kt

@@ -0,0 +1,13 @@
+class C {
+    constructor()
+
+    init {
+    }
+
+<selection>    <caret>fun foo() {
+    }
+</selection>
+    // comment
+    val bar = 1
+
+}

idea/testData/wordSelection/ClassMember3/3.kt

@@ -0,0 +1,13 @@
+class C {
+<selection>    constructor()
+
+    init {
+    }
+
+    <caret>fun foo() {
+    }
+
+    // comment
+    val bar = 1
+</selection>
+}

idea/testData/wordSelection/ClassMember3/4.kt

@@ -0,0 +1,13 @@
+class C {
+<selection>    constructor()
+
+    init {
+    }
+
+    <caret>fun foo() {
+    }
+
+    // comment
+    val bar = 1
+
+</selection>}

idea/testData/wordSelection/ClassMember3/5.kt

@@ -0,0 +1,13 @@
+class C <selection>{
+    constructor()
+
+    init {
+    }
+
+    <caret>fun foo() {
+    }
+
+    // comment
+    val bar = 1
+
+}</selection>

idea/testData/wordSelection/ClassMember4/0.kt

@@ -0,0 +1,14 @@
+class C {
+
+    constructor()
+
+    init {
+    }
+
+    fun foo() {
+    }
+
+    // comment
+    <caret>val bar = 1
+
+}

idea/testData/wordSelection/ClassMember4/1.kt

@@ -0,0 +1,14 @@
+class C {
+
+    constructor()
+
+    init {
+    }
+
+    fun foo() {
+    }
+
+    // comment
+    <selection><caret>val</selection> bar = 1
+
+}

idea/testData/wordSelection/ClassMember4/2.kt

@@ -0,0 +1,14 @@
+class C {
+
+    constructor()
+
+    init {
+    }
+
+    fun foo() {
+    }
+
+    // comment
+    <selection><caret>val bar = 1</selection>
+
+}

idea/testData/wordSelection/ClassMember4/3.kt

@@ -0,0 +1,14 @@
+class C {
+
+    constructor()
+
+    init {
+    }
+
+    fun foo() {
+    }
+
+    // comment
+<selection>    <caret>val bar = 1
+</selection>
+}

idea/testData/wordSelection/ClassMember4/4.kt

@@ -0,0 +1,14 @@
+class C {
+
+    constructor()
+
+    init {
+    }
+
+    fun foo() {
+    }
+
+<selection>    // comment
+    <caret>val bar = 1
+</selection>
+}

idea/testData/wordSelection/ClassMember4/5.kt

@@ -0,0 +1,14 @@
+class C {
+
+<selection>    constructor()
+
+    init {
+    }
+
+    fun foo() {
+    }
+
+    // comment
+    <caret>val bar = 1
+</selection>
+}

idea/testData/wordSelection/ClassMember4/6.kt

@@ -0,0 +1,14 @@
+class C {
+
+<selection>    constructor()
+
+    init {
+    }
+
+    fun foo() {
+    }
+
+    // comment
+    <caret>val bar = 1
+
+</selection>}

idea/testData/wordSelection/ClassMember4/7.kt

@@ -0,0 +1,14 @@
+class C <selection>{
+
+    constructor()
+
+    init {
+    }
+
+    fun foo() {
+    }
+
+    // comment
+    <caret>val bar = 1
+
+}</selection>

idea/testData/wordSelection/ClassMember5/0.kt

@@ -0,0 +1,12 @@
+class C {
+    constructor()
+
+    init {
+    }
+
+    fun foo() {
+    }
+
+    <caret>// comment
+    val bar = 1
+}

idea/testData/wordSelection/ClassMember5/1.kt

@@ -0,0 +1,12 @@
+class C {
+    constructor()
+
+    init {
+    }
+
+    fun foo() {
+    }
+
+    <selection><caret>// comment</selection>
+    val bar = 1
+}

idea/testData/wordSelection/ClassMember5/2.kt

@@ -0,0 +1,12 @@
+class C {
+    constructor()
+
+    init {
+    }
+
+    fun foo() {
+    }
+
+<selection>    <caret>// comment
+</selection>    val bar = 1
+}

idea/testData/wordSelection/ClassMember5/3.kt

@@ -0,0 +1,12 @@
+class C {
+    constructor()
+
+    init {
+    }
+
+    fun foo() {
+    }
+
+<selection>    <caret>// comment
+    val bar = 1
+</selection>}

idea/testData/wordSelection/ClassMember5/4.kt

@@ -0,0 +1,12 @@
+class C {
+<selection>    constructor()
+
+    init {
+    }
+
+    fun foo() {
+    }
+
+    <caret>// comment
+    val bar = 1
+</selection>}

idea/testData/wordSelection/ClassMember5/5.kt

@@ -0,0 +1,12 @@
+class C <selection>{
+    constructor()
+
+    init {
+    }
+
+    fun foo() {
+    }
+
+    <caret>// comment
+    val bar = 1
+}</selection>

idea/tests/org/jetbrains/kotlin/idea/WordSelectionTest.java

@@ -135,6 +135,12 @@ public class WordSelectionTest extends KotlinLightCodeInsightFixtureTestCase {
 
     public void testLabeledReturn() { doTest(); }
 
+    public void testClassMember1() { doTest(); }
+    public void testClassMember2() { doTest(); }
+    public void testClassMember3() { doTest(); }
+    public void testClassMember4() { doTest(); }
+    public void testClassMember5() { doTest(); }
+
     private void doTest() {
         String dirName = getTestName(false);