support multideclarations in Select Word

#KT-6833 Fixed

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

@@ -25,6 +25,7 @@ import java.util.ArrayList
 import org.jetbrains.kotlin.psi.psiUtil.siblings
 import com.intellij.psi.PsiComment
 import com.intellij.psi.PsiWhiteSpace
+import org.jetbrains.kotlin.psi.JetMultiDeclaration
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
 
@@ -33,8 +34,11 @@ public class KotlinDeclarationSelectioner : ExtendWordSelectionHandlerBase() {
             = e is JetDeclaration
 
     override fun select(e: PsiElement, editorText: CharSequence, cursorOffset: Int, editor: Editor): List<TextRange>? {
-        val result = ArrayList<TextRange>()
+        if (e is JetMultiDeclaration) {
+            return selectMultiDeclaration(editorText, e)
+        }
 
+        val result = ArrayList<TextRange>()
         val firstChild = e.getFirstChild()
         val firstNonComment = firstChild
                 .siblings(forward = true, withItself = true)
@@ -46,13 +50,26 @@ public class KotlinDeclarationSelectioner : ExtendWordSelectionHandlerBase() {
                 .first { it !is PsiComment && it !is PsiWhiteSpace }
 
         if (firstNonComment != firstChild || lastNonComment != lastChild) {
-            val start = firstNonComment.startOffset
-            val end = lastNonComment.endOffset
-            result.addAll(ExtendWordSelectionHandlerBase.expandToWholeLine(editorText, TextRange(start, end)))
+            result.addRange(editorText, TextRange(firstNonComment.startOffset, lastNonComment.endOffset))
         }
 
-        result.addAll(ExtendWordSelectionHandlerBase.expandToWholeLine(editorText, e.getTextRange()))
+        result.addRange(editorText, e.getTextRange())
 
         return result
     }
+
+    private fun selectMultiDeclaration(editorText: CharSequence, e: JetMultiDeclaration): ArrayList<TextRange> {
+        val result = ArrayList<TextRange>()
+        val lpar = e.lPar
+        val rpar = e.rPar
+        if (lpar != null && rpar != null) {
+            result.addRange(editorText, TextRange(lpar.textRange.endOffset, rpar.textRange.startOffset))
+            result.addRange(editorText, TextRange(lpar.textRange.startOffset, rpar.textRange.endOffset))
+        }
+        return result
+    }
+}
+
+fun MutableList<TextRange>.addRange(editorText: CharSequence, range: TextRange) {
+    addAll(ExtendWordSelectionHandlerBase.expandToWholeLine(editorText, range))
 }

idea/testData/wordSelection/MultiDeclaration/0.kt

@@ -0,0 +1,3 @@
+fun f() {
+    val (a<caret>, b) = 1 to 2
+}

idea/testData/wordSelection/MultiDeclaration/1.kt

@@ -0,0 +1,3 @@
+fun f() {
+    val (<selection>a<caret></selection>, b) = 1 to 2
+}

idea/testData/wordSelection/MultiDeclaration/2.kt

@@ -0,0 +1,3 @@
+fun f() {
+    val (<selection>a<caret>, b</selection>) = 1 to 2
+}

idea/testData/wordSelection/MultiDeclaration/3.kt

@@ -0,0 +1,3 @@
+fun f() {
+    val <selection>(a<caret>, b)</selection> = 1 to 2
+}

idea/testData/wordSelection/MultiDeclaration/4.kt

@@ -0,0 +1,3 @@
+fun f() {
+    <selection>val (a<caret>, b) = 1 to 2</selection>
+}

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

@@ -62,6 +62,8 @@ public class WordSelectionTest extends JetLightCodeInsightFixtureTestCase {
 
     public void testIfCondition() { doTest(); }
 
+    public void testMultiDeclaration() { doTest(); }
+
     private void doTest() {
         String dirName = getTestName(false);