[java] IDEA-293932 Extend selection selects unnecessary trailing whitespaces

GitOrigin-RevId: 40ce5ff3c6839ec4f1b2393964050e409fa1f658

java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/MethodCallSelectioner.java

@@ -39,8 +39,8 @@ public class MethodCallSelectioner implements ExtendWordSelectionHandler {
       return null;
     }
     else {
-      return Collections.singletonList(new TextRange(referenceNameElement.getTextRange().getStartOffset(), 
-                                                     methodCall.getTextRange().getEndOffset()));
+      return List.of(new TextRange(referenceNameElement.getTextRange().getStartOffset(), methodCall.getTextRange().getEndOffset()),
+                     methodCall.getTextRange());
     }
   }
 }

java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/ReferenceSelectioner.java

@@ -66,10 +66,10 @@ public class ReferenceSelectioner extends BasicSelectioner {
       element = firstChild;
     }
 
-//      if (element instanceof PsiMethodCallExpression) {
-    result.addAll(expandToWholeLine(editorText, new TextRange(element.getTextRange().getStartOffset(),
-                                                              endElement.getTextRange().getEndOffset())));
-//      }
+    TextRange range = new TextRange(element.getTextRange().getStartOffset(),
+                                    endElement.getTextRange().getEndOffset());
+    result.add(range);
+    result.addAll(expandToWholeLine(editorText, range));
 
     if (!(e.getParent() instanceof PsiJavaCodeReferenceElement)) {
       if (e.getNextSibling() instanceof PsiJavaToken ||

java/java-tests/testData/codeInsight/selectWordAction/callMultiline/after1.java

@@ -0,0 +1,7 @@
+class X {
+  void test(List<String> list) {
+    list.stream()
+      .<selection>m<caret>ap</selection>(x -> x)
+      .collect(toList());
+  }
+}

java/java-tests/testData/codeInsight/selectWordAction/callMultiline/after2.java

@@ -0,0 +1,7 @@
+class X {
+  void test(List<String> list) {
+    list.stream()
+      .<selection>m<caret>ap(x -> x)</selection>
+      .collect(toList());
+  }
+}

java/java-tests/testData/codeInsight/selectWordAction/callMultiline/after3.java

@@ -0,0 +1,7 @@
+class X {
+  void test(List<String> list) {
+    <selection>list.stream()
+      .m<caret>ap(x -> x)</selection>
+      .collect(toList());
+  }
+}

java/java-tests/testData/codeInsight/selectWordAction/callMultiline/after4.java

@@ -0,0 +1,7 @@
+class X {
+  void test(List<String> list) {
+<selection>    list.stream()
+      .m<caret>ap(x -> x)
+</selection>      .collect(toList());
+  }
+}

java/java-tests/testData/codeInsight/selectWordAction/callMultiline/before.java

@@ -0,0 +1,7 @@
+class X {
+  void test(List<String> list) {
+    list.stream()
+      .m<caret>ap(x -> x)
+      .collect(toList());
+  }
+}

java/java-tests/testData/codeInsight/selectWordAction/callMultiline2/after1.java

@@ -0,0 +1,7 @@
+class X {
+  void test(List<String> list) {
+    list.stream()
+      .map(x <selection><caret>-></selection> x)
+      .collect(toList());
+  }
+}

java/java-tests/testData/codeInsight/selectWordAction/callMultiline2/after2.java

@@ -0,0 +1,7 @@
+class X {
+  void test(List<String> list) {
+    list.stream()
+      .map(<selection>x <caret>-> x</selection>)
+      .collect(toList());
+  }
+}

java/java-tests/testData/codeInsight/selectWordAction/callMultiline2/after3.java

@@ -0,0 +1,7 @@
+class X {
+  void test(List<String> list) {
+    list.stream()
+      .<selection>map(x <caret>-> x)</selection>
+      .collect(toList());
+  }
+}

java/java-tests/testData/codeInsight/selectWordAction/callMultiline2/after4.java

@@ -0,0 +1,7 @@
+class X {
+  void test(List<String> list) {
+    <selection>list.stream()
+      .map(x <caret>-> x)</selection>
+      .collect(toList());
+  }
+}

java/java-tests/testData/codeInsight/selectWordAction/callMultiline2/after5.java

@@ -0,0 +1,7 @@
+class X {
+  void test(List<String> list) {
+<selection>    list.stream()
+      .map(x <caret>-> x)
+</selection>      .collect(toList());
+  }
+}

java/java-tests/testData/codeInsight/selectWordAction/callMultiline2/before.java

@@ -0,0 +1,7 @@
+class X {
+  void test(List<String> list) {
+    list.stream()
+      .map(x <caret>-> x)
+      .collect(toList());
+  }
+}

java/java-tests/testSrc/com/intellij/codeInsight/JavaSelectWordTest.java

@@ -66,6 +66,14 @@ public class JavaSelectWordTest extends SelectWordTestBase {
     doTest("java");
   }
 
+  public void testCallMultiline() {
+    doTest("java");
+  }
+
+  public void testCallMultiline2() {
+    doTest("java");
+  }
+
   public void testBlock1() {
     doTest("java");
   }