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

Java: Check that the variable used in conditional return isn't used anywhere else (IDEA-152688)

Browse Source
This commit is contained in:
Pavel Dolgov
2017-06-15 13:09:00 +03:00
parent 9c86885ea0
commit 509fa38e40
3 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/extractMethod/ControlFlowWrapper.java
+2 -2
View File
@@ -147,8 +147,8 @@ public class ControlFlowWrapper {
return myExitStatements;
}
public List<PsiVariable> filterUsedVariables(PsiVariable[] outputVariables) {
return ControlFlowUtil.filterUsedVariables(myControlFlow, myFlowEnd, outputVariables);
public boolean isVariableUsedAfterEnd(PsiVariable variable) {
return ControlFlowUtil.needVariableValueAt(variable, myControlFlow, myFlowEnd);
}
public static class ExitStatementsNotSameException extends Exception {}
java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectProcessor.java
+4 -1
View File
@@ -874,7 +874,10 @@ public class ExtractMethodObjectProcessor extends BaseRefactoringProcessor {
setMethodCall((PsiMethodCallExpression)((PsiLocalVariable)replace.getDeclaredElements()[0]).getInitializer());
}
final List<PsiVariable> usedVariables = myControlFlowWrapper.filterUsedVariables(myOutputVariables);
PsiVariable[] usedVariables = myOutputVariables;
if (generatesConditionalExit() && myOutputVariable != null && !myControlFlowWrapper.isVariableUsedAfterEnd(myOutputVariable)) {
usedVariables = ArrayUtil.remove(usedVariables, myOutputVariable);
}
Collection<ControlFlowUtil.VariableInfo> reassigned = myControlFlowWrapper.getInitializedTwice();
for (PsiVariable variable : usedVariables) {
String name = variable.getName();
java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowUtil.java
+1 -14
View File
@@ -148,7 +148,7 @@ public class ControlFlowUtil {
return result;
}
private static boolean needVariableValueAt(final PsiVariable variable, final ControlFlow flow, final int offset) {
public static boolean needVariableValueAt(final PsiVariable variable, final ControlFlow flow, final int offset) {
InstructionClientVisitor<Boolean> visitor = new InstructionClientVisitor<Boolean>() {
final boolean[] neededBelow = new boolean[flow.getSize() + 1];
@@ -361,19 +361,6 @@ public class ControlFlowUtil {
return outputVariables;
}
public static List<PsiVariable> filterUsedVariables(ControlFlow flow, int offset, PsiVariable[] variables) {
if (offset >= flow.getSize()) {
return Collections.emptyList();
}
List<PsiVariable> result = new ArrayList<>();
for (PsiVariable variable : variables) {
if (needVariableValueAt(variable, flow, offset)) {
result.add(variable);
}
}
return result;
}
public static Collection<PsiStatement> findExitPointsAndStatements(final ControlFlow flow, final int start, final int end, final IntArrayList exitPoints,
final Class... classesFilter) {
if (end == start) {