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

IDEA-88406 False positive 'constant conditions & exceptions'

Browse Source
This commit is contained in:
peter
2012-07-09 15:04:37 +02:00
parent b8d11bfc4f
commit d896318f45
3 changed files with 49 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java
+5 -10
View File
@@ -257,21 +257,15 @@ class ControlFlowAnalyzer extends JavaElementVisitor {
@Override public void visitCodeBlock(PsiCodeBlock block) {
startElement(block);
PsiStatement[] statements = block.getStatements();
for (PsiStatement statement : statements) {
statement.accept(this);
}
for (PsiStatement statement : statements) {
for (PsiStatement statement : block.getStatements()) {
if (statement instanceof PsiDeclarationStatement) {
PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)statement;
PsiElement[] declarations = declarationStatement.getDeclaredElements();
for (PsiElement declaration : declarations) {
for (PsiElement declaration : ((PsiDeclarationStatement)statement).getDeclaredElements()) {
if (declaration instanceof PsiVariable) {
myCurrentFlow.removeVariable((PsiVariable)declaration);
}
}
}
statement.accept(this);
}
finishElement(block);
@@ -581,6 +575,7 @@ class ControlFlowAnalyzer extends JavaElementVisitor {
if (enumVals != null) {
if (caseValue instanceof PsiReferenceExpression) {
//noinspection SuspiciousMethodCalls
enumVals.remove(((PsiReferenceExpression)caseValue).resolve());
}
}
@@ -929,7 +924,7 @@ class ControlFlowAnalyzer extends JavaElementVisitor {
PsiExpression lExpr = operands[0];
lExpr.accept(this);
PsiType lType = lExpr.getType();
PsiExpression rExpr = operands[1];
PsiExpression rExpr;
for (int i = 1; i < operands.length; i++) {
rExpr = operands[i];