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

remove variable: do not leave tailing loops/ifs (IDEA-124489)

Browse Source
This commit is contained in:
Anna Kozlova
2014-06-04 21:41:29 +04:00
parent 83abbd012d
commit 9d5429e77f
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedVariableUtil.java
View File

@@ -18,7 +18,6 @@ package com.intellij.codeInsight.daemon.impl.quickfix;
import com.intellij.psi.*;
import com.intellij.psi.util.InheritanceUtil;
import com.intellij.psi.util.PropertyUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.IncorrectOperationException;
import gnu.trove.THashSet;
@@ -221,7 +220,12 @@ public class RemoveUnusedVariableUtil {
}
}
else if (element instanceof PsiExpressionStatement && deleteMode != CANCEL) {
element.delete();
final PsiElement parent = element.getParent();
if (parent instanceof PsiIfStatement || parent instanceof PsiLoopStatement && ((PsiLoopStatement)parent).getBody() == element) {
element.replace(JavaPsiFacade.getElementFactory(element.getProject()).createStatementFromText(";", element));
} else {
element.delete();
}
break;
}
else if (element instanceof PsiVariable && element == variable) {

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedVariable/afterIfNoBlock.java Normal file
View File

@@ -0,0 +1,9 @@
// "Remove variable 'foo'" "true"
class a {
private int refactorTest(int i) {
int bar = 0;
if (i >0) ;
return bar;
}
}

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedVariable/beforeIfNoBlock.java Normal file
View File

@@ -0,0 +1,10 @@
// "Remove variable 'foo'" "true"
class a {
private int refactorTest(int i) {
int f<caret>oo = 0;
int bar = 0;
if (i >0) foo++;
return bar;
}
}