KT-3949 Extend selection in case of comment before several statements

#KT-3949 Fixed

idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinStatementGroupSelectioner.kt

@@ -16,10 +16,8 @@
 
 package org.jetbrains.jet.plugin.editor.wordSelection
 
-import com.intellij.codeInsight.editorActions.wordSelection.BasicSelectioner
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
-import com.intellij.openapi.util.text.LineTokenizer
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiWhiteSpace
 import com.intellij.psi.impl.source.tree.LeafPsiElement
@@ -31,13 +29,14 @@ import org.jetbrains.jet.lexer.JetTokens
 
 import com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase
 import org.jetbrains.jet.lang.psi.psiUtil.siblings
+import com.intellij.psi.PsiComment
 
 /**
  * Originally from IDEA platform: StatementGroupSelectioner
  */
 public class KotlinStatementGroupSelectioner : ExtendWordSelectionHandlerBase() {
     override fun canSelect(e: PsiElement)
-            = e is JetExpression || e is JetWhenEntry
+            = e is JetExpression || e is JetWhenEntry || e is PsiComment
 
     override fun select(e: PsiElement, editorText: CharSequence, cursorOffset: Int, editor: Editor): List<TextRange>? {
         val parent = e.getParent()

idea/testData/wordSelection/CommentForStatements/0.kt

@@ -0,0 +1,9 @@
+fun test() {
+    x()
+
+    // <caret>comment for several lines
+    foo()
+    bar()
+
+    y()
+}

idea/testData/wordSelection/CommentForStatements/1.kt

@@ -0,0 +1,9 @@
+fun test() {
+    x()
+
+    // <selection><caret>comment</selection> for several lines
+    foo()
+    bar()
+
+    y()
+}

idea/testData/wordSelection/CommentForStatements/2.kt

@@ -0,0 +1,9 @@
+fun test() {
+    x()
+
+    // <selection><caret>comment for several lines</selection>
+    foo()
+    bar()
+
+    y()
+}

idea/testData/wordSelection/CommentForStatements/3.kt

@@ -0,0 +1,9 @@
+fun test() {
+    x()
+
+    <selection>// <caret>comment for several lines</selection>
+    foo()
+    bar()
+
+    y()
+}

idea/testData/wordSelection/CommentForStatements/4.kt

@@ -0,0 +1,9 @@
+fun test() {
+    x()
+
+<selection>    // <caret>comment for several lines
+</selection>    foo()
+    bar()
+
+    y()
+}

idea/testData/wordSelection/CommentForStatements/5.kt

@@ -0,0 +1,9 @@
+fun test() {
+    x()
+
+<selection>    // <caret>comment for several lines
+    foo()
+    bar()
+</selection>
+    y()
+}

idea/testData/wordSelection/CommentForStatements/6.kt

@@ -0,0 +1,9 @@
+fun test() {
+<selection>    x()
+
+    // <caret>comment for several lines
+    foo()
+    bar()
+
+    y()
+</selection>}

idea/tests/org/jetbrains/jet/plugin/WordSelectionTest.java

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