IteratorDeclaration: support parenthesized hasNext, etc.

java/java-impl/src/com/intellij/codeInspection/util/IteratorDeclaration.java

@@ -21,6 +21,7 @@ import com.intellij.psi.search.searches.ReferencesSearch;
 import com.intellij.psi.util.InheritanceUtil;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;
+import com.intellij.util.ObjectUtils;
 import com.siyeh.ig.psiutils.ExpressionUtils;
 import one.util.streamex.MoreCollectors;
 import one.util.streamex.StreamEx;
@@ -76,6 +77,9 @@ public class IteratorDeclaration {
   }
 
   public boolean isIteratorMethodCall(PsiElement candidate, String method) {
+    while (candidate instanceof PsiParenthesizedExpression) {
+      candidate = ((PsiParenthesizedExpression)candidate).getExpression();
+    }
     if (!(candidate instanceof PsiMethodCallExpression)) return false;
     PsiMethodCallExpression call = (PsiMethodCallExpression)candidate;
     if (!call.getArgumentList().isEmpty()) return false;
@@ -84,24 +88,24 @@ public class IteratorDeclaration {
   }
 
   public PsiVariable getNextElementVariable(PsiStatement statement) {
+    PsiLocalVariable var = getDeclaredVariable(statement);
+    if (var == null || !isIteratorMethodCall(var.getInitializer(), "next")) return null;
+    return var;
+  }
+
+  @Nullable
+  private static PsiLocalVariable getDeclaredVariable(PsiStatement statement) {
     if (!(statement instanceof PsiDeclarationStatement)) return null;
     PsiDeclarationStatement declaration = (PsiDeclarationStatement)statement;
-    if (declaration.getDeclaredElements().length != 1) return null;
+    PsiElement[] elements = declaration.getDeclaredElements();
-    PsiElement element = declaration.getDeclaredElements()[0];
+    if (elements.length != 1) return null;
-    if (!(element instanceof PsiLocalVariable)) return null;
+    return ObjectUtils.tryCast(elements[0], PsiLocalVariable.class);
-    PsiLocalVariable var = (PsiLocalVariable)element;
-    if (!isIteratorMethodCall(var.getInitializer(), "next")) return null;
-    return var;
   }
 
   @Contract("null -> null")
   private static IteratorDeclaration extract(PsiStatement statement) {
-    if (!(statement instanceof PsiDeclarationStatement)) return null;
+    PsiLocalVariable variable = getDeclaredVariable(statement);
-    PsiDeclarationStatement declaration = (PsiDeclarationStatement)statement;
+    if (variable == null) return null;
-    if (declaration.getDeclaredElements().length != 1) return null;
-    PsiElement element = declaration.getDeclaredElements()[0];
-    if (!(element instanceof PsiLocalVariable)) return null;
-    PsiLocalVariable variable = (PsiLocalVariable)element;
     PsiExpression initializer = PsiUtil.skipParenthesizedExprDown(variable.getInitializer());
     if (!(initializer instanceof PsiMethodCallExpression)) return null;
     PsiMethodCallExpression call = (PsiMethodCallExpression)initializer;

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

@@ -3,7 +3,7 @@ import java.util.*;
 
 public class Main {
     public void removeEmpty(List<String> list) throws Exception {
-        f<caret>or(Iterator<String> it = list/*here's list*/.iterator(); it.hasNext();) {
+        f<caret>or(Iterator<String> it = list/*here's list*/.iterator(); (it.hasNext());) {
             // iterate over list
             String str = it.next();
             // if it's empty