Extend Selection: don't select lambda parameters if lambda is multiple lines (#2586)

#KT-29364  Fixed

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

@@ -23,6 +23,7 @@ import com.intellij.psi.PsiComment
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiWhiteSpace
 import com.intellij.psi.impl.source.tree.LeafPsiElement
+import org.jetbrains.kotlin.idea.refactoring.getLineNumber
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.siblings
@@ -44,6 +45,7 @@ class KotlinStatementGroupSelectioner : ExtendWordSelectionHandlerBase() {
             .firstOrNull {
                 // find preceding '{' or blank line
                 it is LeafPsiElement && it.elementType == KtTokens.LBRACE || it is PsiWhiteSpace && it.getText()!!.count { it == '\n' } > 1
+                        || (it is LeafPsiElement && it.elementType == KtTokens.ARROW && e.getLineNumber() != it.getLineNumber())
             }
             ?.siblings(forward = true, withItself = false)
             ?.dropWhile { it is PsiWhiteSpace } // and take first non-whitespace element after it

idea/testData/wordSelection/ValueParametersInLambda2/0.kt

@@ -0,0 +1,5 @@
+fun foo(f: (Int) -> Int) {}
+
+fun test() {
+    foo { it -> <caret>it + 1 }
+}

idea/testData/wordSelection/ValueParametersInLambda2/1.kt

@@ -0,0 +1,5 @@
+fun foo(f: (Int) -> Int) {}
+
+fun test() {
+    foo { it -> <caret><selection>it</selection> + 1 }
+}

idea/testData/wordSelection/ValueParametersInLambda2/2.kt

@@ -0,0 +1,5 @@
+fun foo(f: (Int) -> Int) {}
+
+fun test() {
+    foo { it -> <caret><selection>it + 1</selection> }
+}

idea/testData/wordSelection/ValueParametersInLambda2/3.kt

@@ -0,0 +1,5 @@
+fun foo(f: (Int) -> Int) {}
+
+fun test() {
+    foo { <selection>it -> <caret>it + 1</selection> }
+}

idea/testData/wordSelection/ValueParametersInLambda2/4.kt

@@ -0,0 +1,5 @@
+fun foo(f: (Int) -> Int) {}
+
+fun test() {
+    foo <selection>{ it -> <caret>it + 1 }</selection>
+}

idea/testData/wordSelection/ValueParametersInLambda3/0.kt

@@ -0,0 +1,9 @@
+fun foo(f: (Int) -> Int) {}
+
+fun test() {
+    foo { it ->
+        <caret>it + 1
+
+        it + 1
+    }
+}

idea/testData/wordSelection/ValueParametersInLambda3/1.kt

@@ -0,0 +1,9 @@
+fun foo(f: (Int) -> Int) {}
+
+fun test() {
+    foo { it ->
+        <caret><selection>it</selection> + 1
+
+        it + 1
+    }
+}

idea/testData/wordSelection/ValueParametersInLambda3/2.kt

@@ -0,0 +1,9 @@
+fun foo(f: (Int) -> Int) {}
+
+fun test() {
+    foo { it ->
+        <caret><selection>it + 1</selection>
+
+        it + 1
+    }
+}

idea/testData/wordSelection/ValueParametersInLambda3/3.kt

@@ -0,0 +1,9 @@
+fun foo(f: (Int) -> Int) {}
+
+fun test() {
+    foo { it ->
+<selection>        <caret>it + 1
+</selection>
+        it + 1
+    }
+}

idea/testData/wordSelection/ValueParametersInLambda3/4.kt

@@ -0,0 +1,9 @@
+fun foo(f: (Int) -> Int) {}
+
+fun test() {
+    foo { it ->
+<selection>        <caret>it + 1
+
+        it + 1
+</selection>    }
+}

idea/testData/wordSelection/ValueParametersInLambda3/5.kt

@@ -0,0 +1,9 @@
+fun foo(f: (Int) -> Int) {}
+
+fun test() {
+    foo <selection>{ it ->
+        <caret>it + 1
+
+        it + 1
+    }</selection>
+}

idea/testData/wordSelection/ValueParametersInLambda4/0.kt

@@ -0,0 +1,9 @@
+fun foo(f: (Int) -> Int) {}
+
+fun test() {
+    foo { it ->
+        it + 1
+
+        <caret>it + 1
+    }
+}

idea/testData/wordSelection/ValueParametersInLambda4/1.kt

@@ -0,0 +1,9 @@
+fun foo(f: (Int) -> Int) {}
+
+fun test() {
+    foo { it ->
+        it + 1
+
+        <caret><selection>it</selection> + 1
+    }
+}

idea/testData/wordSelection/ValueParametersInLambda4/2.kt

@@ -0,0 +1,9 @@
+fun foo(f: (Int) -> Int) {}
+
+fun test() {
+    foo { it ->
+        it + 1
+
+        <caret><selection>it + 1</selection>
+    }
+}

idea/testData/wordSelection/ValueParametersInLambda4/3.kt

@@ -0,0 +1,9 @@
+fun foo(f: (Int) -> Int) {}
+
+fun test() {
+    foo { it ->
+        it + 1
+
+<selection>        <caret>it + 1
+</selection>    }
+}

idea/testData/wordSelection/ValueParametersInLambda4/4.kt

@@ -0,0 +1,9 @@
+fun foo(f: (Int) -> Int) {}
+
+fun test() {
+    foo { it ->
+<selection>        it + 1
+
+        <caret>it + 1
+</selection>    }
+}

idea/testData/wordSelection/ValueParametersInLambda4/5.kt

@@ -0,0 +1,9 @@
+fun foo(f: (Int) -> Int) {}
+
+fun test() {
+    foo <selection>{ it ->
+        it + 1
+
+        <caret>it + 1
+    }</selection>
+}

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

@@ -39,6 +39,12 @@ public class WordSelectionTest extends KotlinLightCodeInsightFixtureTestCase {
 
     public void testValueParametersInLambda() { doTest(); }
 
+    public void testValueParametersInLambda2() { doTest(); }
+
+    public void testValueParametersInLambda3() { doTest(); }
+
+    public void testValueParametersInLambda4() { doTest(); }
+
     public void testDocComment() { doTest(); }
 
     public void testDocCommentOneLine() { doTest(); }