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-94910 (control flow for resource variables fixed)

Browse Source
This commit is contained in:
Roman Shevchenko
2012-12-05 18:15:35 +01:00
parent 3abad067e3
commit cd78bed856
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java
+5 -5
View File
@@ -777,11 +777,6 @@ class ControlFlowAnalyzer extends JavaElementVisitor {
public void visitTryStatement(PsiTryStatement statement) {
startElement(statement);
PsiResourceList resourceList = statement.getResourceList();
if (resourceList != null) {
resourceList.accept(this);
}
PsiCodeBlock finallyBlock = statement.getFinallyBlock();
if (finallyBlock != null) {
myCatchStack.push(new CatchDescriptor(finallyBlock));
@@ -806,6 +801,11 @@ class ControlFlowAnalyzer extends JavaElementVisitor {
int endOffset = finallyBlock == null ? getEndOffset(statement) : getStartOffset(finallyBlock) - 2;
PsiResourceList resourceList = statement.getResourceList();
if (resourceList != null) {
resourceList.accept(this);
}
PsiCodeBlock tryBlock = statement.getTryBlock();
if (tryBlock != null) {
tryBlock.accept(this);
java/java-tests/testData/inspection/dataFlow/TryWithResources.java
+2 -4
View File
@@ -1,5 +1,3 @@
import java.lang.Exception;
class Test {
static class MyResource implements AutoCloseable {
@Override public void close() { }
@@ -22,7 +20,7 @@ class Test {
}
}
/*static class ResourcefulException1 extends Exception { }
static class ResourcefulException1 extends Exception { }
static class ResourcefulException2 extends Exception { }
static class ExceptionalResource implements AutoCloseable {
@@ -45,5 +43,5 @@ class Test {
System.out.println("2");
}
}
}*/
}
}