MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

MergeFilterChainAction: support parentheses

Browse Source
This commit is contained in:
Tagir Valeev
2019-02-08 15:24:53 +07:00
parent e6ca195feb
commit 7a897157f1
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/intention/impl/MergeFilterChainAction.java
+7 -10
View File
@@ -29,6 +29,7 @@ import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.refactoring.util.LambdaRefactoringUtil;
import com.intellij.util.IncorrectOperationException;
import com.siyeh.ig.psiutils.ExpressionUtils;
import com.siyeh.ig.psiutils.MethodCallUtils;
import com.siyeh.ig.psiutils.ParenthesesUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -53,19 +54,15 @@ public class MergeFilterChainAction extends PsiElementBaseIntentionAction {
@Nullable
private static PsiMethodCallExpression getFilterToMerge(PsiMethodCallExpression methodCallExpression) {
final PsiExpression qualifierExpression = methodCallExpression.getMethodExpression().getQualifierExpression();
if (qualifierExpression instanceof PsiMethodCallExpression && isFilterCall((PsiMethodCallExpression)qualifierExpression)) {
return (PsiMethodCallExpression)qualifierExpression;
final PsiMethodCallExpression prevCall = MethodCallUtils.getQualifierMethodCall(methodCallExpression);
if (prevCall != null && isFilterCall(prevCall)) {
return prevCall;
}
final PsiElement parent = methodCallExpression.getParent();
if (parent instanceof PsiReferenceExpression) {
final PsiElement gParent = parent.getParent();
if (gParent instanceof PsiMethodCallExpression && isFilterCall((PsiMethodCallExpression)gParent)) {
return (PsiMethodCallExpression)gParent;
}
final PsiMethodCallExpression nextCall = ExpressionUtils.getCallForQualifier(methodCallExpression);
if (nextCall != null && isFilterCall(nextCall)) {
return nextCall;
}
return null;
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeFilter/afterIntStream.java
+1 -1
View File
@@ -4,6 +4,6 @@ import java.util.stream.IntStream;
public class Main {
void test() {
System.out.println(IntStream.range(0, 100).filter(x -> x > 20 && x < 50).count());
System.out.println((IntStream.range(0, 100).filter(x -> x > 20 && x < 50)).count());
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeFilter/beforeIntStream.java
+1 -1
View File
@@ -4,6 +4,6 @@ import java.util.stream.IntStream;
public class Main {
void test() {
System.out.println(IntStream.range(0, 100).filter(x -> x > 20).fil<caret>ter(x -> x < 50).count());
System.out.println((IntStream.range(0, 100).filter(x -> x > 20)).fil<caret>ter(x -> x < 50).count());
}
}