[java-inspections] Java8CollectionRemoveIf: highlight only 'for'/'while' keyword instead of the whole statement

GitOrigin-RevId: b2b312efab7a974dab6a2021a788274bc6cfc1b2

java/java-impl/src/com/intellij/codeInspection/java18api/Java8CollectionRemoveIfInspection.java

@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.codeInspection.java18api;
 
 import com.intellij.codeInsight.daemon.QuickFixBundle;
@@ -8,7 +8,6 @@ import com.intellij.codeInspection.util.IterableTraversal;
 import com.intellij.codeInspection.util.IteratorDeclaration;
 import com.intellij.codeInspection.util.LambdaGenerationUtil;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.TextRange;
 import com.intellij.pom.java.JavaFeature;
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.CodeStyleManager;
@@ -75,7 +74,7 @@ public class Java8CollectionRemoveIfInspection extends AbstractBaseJavaLocalInsp
       }
 
       private void registerProblem(PsiLoopStatement statement, PsiJavaToken endToken) {
-        holder.registerProblem(statement, new TextRange(0, endToken.getTextOffset() - statement.getTextOffset() + 1),
+        holder.registerProblem(statement.getFirstChild(),
                                QuickFixBundle.message("java.8.collection.removeif.inspection.description"),
                                new ReplaceWithRemoveIfQuickFix());
       }
@@ -134,7 +133,7 @@ public class Java8CollectionRemoveIfInspection extends AbstractBaseJavaLocalInsp
 
     @Override
     public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
-      PsiElement element = descriptor.getStartElement();
+      PsiElement element = descriptor.getStartElement().getParent();
       if(!(element instanceof PsiLoopStatement)) return;
       PsiLoopStatement loop = (PsiLoopStatement)element;
       PsiStatement[] statements = ControlFlowUtils.unwrapBlock(loop.getBody());

java/java-tests/testData/inspection/java8CollectionRemoveIf/beforeForEachRemoveArrayList.java

@@ -4,7 +4,7 @@ import java.util.*;
 public class Main {
     public void removeEmpty(List<String> list) throws Exception {
         // Copy to avoid CME
-        for(<caret>String item : new ArrayList<>(list)) {
+        for<caret>(String item : new ArrayList<>(list)) {
             if(item.isEmpty()) list.remove(item);
         }
     }

java/java-tests/testData/inspection/java8CollectionRemoveIf/beforeForEachRemoveSimple.java

@@ -3,7 +3,7 @@ import java.util.*;
 
 public class Main {
     public void removeEmpty(List<String> list) throws Exception {
-        for(<caret>String item : list) {
+        for<caret>(String item : list) {
             // Presumably CopyOnWriteArrayList
             if(item.isEmpty()) list.remove(item);
         }

java/java-tests/testData/inspection/java8CollectionRemoveIf/beforeForEachRemoveToArray.java

@@ -4,7 +4,7 @@ import java.util.*;
 public class Main {
     public void removeEmpty(List<String> list) throws Exception {
         // Copy to avoid CME
-        for(<caret>String item : list.toArray(new String[list.size()])) {
+        for<caret>(String item : list.toArray(new String[list.size()])) {
             if(item.isEmpty()) list.remove(item);
         }
     }

java/java-tests/testData/inspection/java8CollectionRemoveIf/beforeIteratorRemoveInline.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 public class Main {
   public void testIterator(List<List<String>> data, boolean b) {
-    for(Ite<caret>rator<List<String>> iter = (data.iterator()); iter.hasNext();) {
+    for<caret>(Iterator<List<String>> iter = (data.iterator()); iter.hasNext();) {
       if(iter.next().isEmpty() && /* also check the flag */ b) {
         iter.remove();
       }

java/java-tests/testData/inspection/java8CollectionRemoveIf/beforeIteratorRemoveInlineNoBrace.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 public class Main {
   public void testIterator(List<List<String>> data, boolean b) {
-    for(Ite<caret>rator<List<String>> iter = (data.iterator()); iter.hasNext();)
+    for<caret>(Iterator<List<String>> iter = (data.iterator()); iter.hasNext();)
       if(iter.next().isEmpty() && /* also check the flag */ b)
         iter.remove();
   }

java/java-tests/testData/inspection/java8CollectionRemoveIf/beforeIteratorRemoveInlineShortCircuit.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 public class Main {
   public void testIterator(List<List<String>> data, boolean b) {
-    for(Ite<caret>rator<List<String>> iter = data.iterator(); iter.hasNext();) {
+    for<caret>(Iterator<List<String>> iter = data.iterator(); iter.hasNext();) {
       if(b && iter.next().isEmpty()) {
         iter.remove();
       }

java/java-tests/testData/inspection/java8CollectionRemoveIf/beforeIteratorRemoveInlineTwice.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 public class Main {
   public void testIterator(List<List<String>> data, boolean b) {
-    for(Ite<caret>rator<List<String>> iter = data.iterator(); iter.hasNext();) {
+    for<caret>(Iterator<List<String>> iter = data.iterator(); iter.hasNext();) {
       if(iter.next().isEmpty() && iter.next().isEmpty()) {
         iter.remove();
       }

java/java-tests/testData/inspection/java8CollectionRemoveIf/beforeIteratorRemoveListIterator.java

@@ -4,7 +4,7 @@ import java.util.*;
 public class Test {
     void test(List<String> list) {
         ListIterator<String> iterator = list.listIterator();
-        while(iterator<caret>.hasNext()) {
+        while<caret>(iterator.hasNext()) {
             if(iterator.next().isEmpty()) {
                 iterator.remove();
             }