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

improve unused return value quickfix (use SideEffectChecker and UnnecessaryReturnInspection) IDEA-166180

Browse Source
This commit is contained in:
Dmitry Batkovich
2017-01-10 18:33:33 +03:00
parent da82d17377
commit dc7d4a92f4
1 changed files with 16 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValue.java
+16 -37
View File
@@ -28,16 +28,17 @@ import com.intellij.psi.*;
import com.intellij.psi.search.searches.OverridingMethodsSearch;
import com.intellij.psi.util.PropertyUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.refactoring.changeSignature.ChangeSignatureProcessor;
import com.intellij.refactoring.changeSignature.ParameterInfoImpl;
import com.intellij.util.IncorrectOperationException;
import com.siyeh.ig.controlflow.UnnecessaryReturnInspection;
import com.siyeh.ig.psiutils.SideEffectChecker;
import org.jdom.Element;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.ArrayList;
import java.util.List;
/**
* @author max
@@ -207,43 +208,21 @@ public class UnusedReturnValue extends GlobalJavaBatchInspectionTool{
}
private static void replaceReturnStatements(@NotNull final PsiMethod method) {
final PsiCodeBlock body = method.getBody();
if (body != null) {
final List<PsiReturnStatement> returnStatements = new ArrayList<>();
body.accept(new JavaRecursiveElementWalkingVisitor() {
@Override
public void visitReturnStatement(final PsiReturnStatement statement) {
super.visitReturnStatement(statement);
returnStatements.add(statement);
}
@Override
public void visitClass(PsiClass aClass) {}
@Override
public void visitLambdaExpression(PsiLambdaExpression expression) {}
});
final PsiStatement[] psiStatements = body.getStatements();
final PsiStatement lastStatement = psiStatements[psiStatements.length - 1];
for (PsiReturnStatement returnStatement : returnStatements) {
try {
final PsiExpression expression = returnStatement.getReturnValue();
if (expression instanceof PsiLiteralExpression || expression instanceof PsiThisExpression) { //avoid side effects
WriteAction.run(() -> {
if (returnStatement == lastStatement) {
returnStatement.delete();
}
else {
returnStatement
.replace(JavaPsiFacade.getInstance(method.getProject()).getElementFactory().createStatementFromText("return;", returnStatement));
}
});
}
}
catch (IncorrectOperationException e) {
LOG.error(e);
for (PsiReturnStatement returnStatement : PsiUtil.findReturnStatements(method)) {
try {
final PsiExpression expression = returnStatement.getReturnValue();
if (expression != null && !SideEffectChecker.mayHaveSideEffects(expression)) {
WriteAction.run(() -> {
PsiReturnStatement ret = (PsiReturnStatement)returnStatement.replace(JavaPsiFacade.getInstance(method.getProject()).getElementFactory().createStatementFromText("return;", returnStatement));
if (UnnecessaryReturnInspection.isReturnRedundant(ret, false, null)) {
ret.delete();
}
});
}
}
catch (IncorrectOperationException e) {
LOG.error(e);
}
}
}
}