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

IDEA-178434 "Unwrap 'if' statement" produces incompilable code if variable declared in the if body shadows the outer scope variable

Browse Source
This commit is contained in:
peter
2017-10-13 21:17:37 +02:00
parent f80732a7f6
commit 609eea57ac
3 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/unwrapIfStatement/afterConflictingField.java
+13
View File
@@ -0,0 +1,13 @@
// "Unwrap 'if' statement" "true"
class X {
StringBuilder str = new StringBuilder();
void test(@org.jetbrains.annotations.NotNull String x) {
<caret>{
String str = x.trim();
System.out.println(str);
}
str.append("foo");
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/unwrapIfStatement/beforeConflictingField.java
+13
View File
@@ -0,0 +1,13 @@
// "Unwrap 'if' statement" "true"
class X {
StringBuilder str = new StringBuilder();
void test(@org.jetbrains.annotations.NotNull String x) {
if(x != <caret>null) {
String str = x.trim();
System.out.println(str);
}
str.append("foo");
}
}
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/DeclarationSearchUtils.java
+13 -24
View File
@@ -20,13 +20,15 @@ import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.controlFlow.DefUseUtil;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.LocalSearchScope;
import com.intellij.psi.search.PsiSearchHelper;
import com.intellij.psi.search.SearchScope;
import com.intellij.psi.search.searches.ReferencesSearch;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
public class DeclarationSearchUtils {
@@ -51,8 +53,12 @@ public class DeclarationSearchUtils {
if (statements.length == 0) {
return false;
}
final List<PsiCodeBlock> followingBlocks = new ArrayList<>();
collectFollowingBlocks(block.getParent().getNextSibling(), followingBlocks);
List<PsiCodeBlock> affectedBlocks = ContainerUtil.newArrayList(parentBlock);
affectedBlocks.addAll(SyntaxTraverser.psiTraverser(block.getParent().getParent())
.filter(PsiCodeBlock.class)
.filter(cb -> cb.getTextRange().getStartOffset() > block.getTextRange().getEndOffset())
.toList());
SearchScope affectedScope = new LocalSearchScope(affectedBlocks.toArray(PsiElement.EMPTY_ARRAY));
final Project project = block.getProject();
final JavaPsiFacade facade = JavaPsiFacade.getInstance(project);
final PsiResolveHelper resolveHelper = facade.getResolveHelper();
@@ -71,13 +77,10 @@ public class DeclarationSearchUtils {
if (variableName == null) {
continue;
}
final PsiVariable target = resolveHelper.resolveAccessibleReferencedVariable(variableName, parentBlock);
if (target instanceof PsiLocalVariable) {
return true;
}
for (PsiCodeBlock codeBlock : followingBlocks) {
final PsiVariable target1 = resolveHelper.resolveAccessibleReferencedVariable(variableName, codeBlock);
if (target1 instanceof PsiLocalVariable) {
for (PsiCodeBlock codeBlock : affectedBlocks) {
PsiVariable target = resolveHelper.resolveAccessibleReferencedVariable(variableName, codeBlock);
if (target instanceof PsiLocalVariable ||
target instanceof PsiField && ReferencesSearch.search(target, affectedScope).findFirst() != null) {
return true;
}
}
@@ -86,20 +89,6 @@ public class DeclarationSearchUtils {
return false;
}
/**
* Depth first traversal to find all PsiCodeBlock children.
*/
private static void collectFollowingBlocks(PsiElement element,
List<PsiCodeBlock> out) {
while (element != null) {
if (element instanceof PsiCodeBlock) {
out.add((PsiCodeBlock)element);
}
collectFollowingBlocks(element.getFirstChild(), out);
element = element.getNextSibling();
}
}
public static PsiExpression findDefinition(@NotNull PsiReferenceExpression referenceExpression,
@Nullable PsiVariable variable) {
if (variable == null) {