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

SideEffectChecker, RemoveUnusedVariableUtil: cosmetic changes

Browse Source
This commit is contained in:
Tagir Valeev
2018-07-03 10:13:15 +07:00
parent 16f06f8ec8
commit 53b6a83c94
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedVariableUtil.java
+15 -11
View File
@@ -18,12 +18,15 @@ package com.intellij.codeInsight.daemon.impl.quickfix;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.IncorrectOperationException;
import com.siyeh.ig.psiutils.ExpressionUtils;
import com.siyeh.ig.psiutils.SideEffectChecker;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Predicate;
public class RemoveUnusedVariableUtil {
public enum RemoveMode {
@@ -32,20 +35,21 @@ public class RemoveUnusedVariableUtil {
CANCEL
}
public static boolean checkSideEffects(PsiExpression element, @Nullable PsiVariable variableToIgnore, List<? super PsiElement> sideEffects) {
@Contract("_, _, null -> false; null, _, _ -> false")
public static boolean checkSideEffects(PsiExpression element,
@Nullable PsiVariable variableToIgnore,
List<? super PsiElement> sideEffects) {
if (sideEffects == null || element == null) return false;
List<PsiElement> writes = new ArrayList<>();
SideEffectChecker.checkSideEffects(element, writes);
if (variableToIgnore != null) {
for (int i = writes.size() - 1; i >= 0; i--) {
PsiElement write = writes.get(i);
if (!(write instanceof PsiAssignmentExpression)) continue;
PsiExpression lExpression = ((PsiAssignmentExpression)write).getLExpression();
if (lExpression instanceof PsiReference && ((PsiReference)lExpression).resolve() == variableToIgnore) {
writes.remove(i);
}
}
Predicate<PsiElement> allowedSideEffect;
if (variableToIgnore == null) {
allowedSideEffect = e -> false;
}
else {
allowedSideEffect = e -> e instanceof PsiAssignmentExpression &&
ExpressionUtils.isReferenceTo(((PsiAssignmentExpression)e).getLExpression(), variableToIgnore);
}
SideEffectChecker.checkSideEffects(element, writes, allowedSideEffect);
sideEffects.addAll(writes);
return !writes.isEmpty();
}
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/SideEffectChecker.java
+7 -1
View File
@@ -112,7 +112,13 @@ public class SideEffectChecker {
}
public static boolean checkSideEffects(@NotNull PsiExpression element, @NotNull List<PsiElement> sideEffects) {
final SideEffectsVisitor visitor = new SideEffectsVisitor(sideEffects, element);
return checkSideEffects(element, sideEffects, e -> false);
}
public static boolean checkSideEffects(@NotNull PsiExpression element,
@NotNull List<PsiElement> sideEffects,
Predicate<PsiElement> ignoreElement) {
final SideEffectsVisitor visitor = new SideEffectsVisitor(sideEffects, element, ignoreElement);
element.accept(visitor);
return visitor.mayHaveSideEffects();
}