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

can complete normally for nested try-with-resources (IDEA-138961)

Browse Source
This commit is contained in:
Anna Kozlova
2015-04-09 13:34:17 +02:00
parent b9035c54ad
commit 4ee27fecce
3 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowUtil.java
View File

@@ -732,19 +732,23 @@ public class ControlFlowUtil {
if (nextOffset == endOffset) {
int lastOffset = endOffset - 1;
Instruction lastInstruction = flow.getInstructions().get(lastOffset);
if (lastInstruction instanceof GoToInstruction &&
while (lastInstruction instanceof GoToInstruction &&
((GoToInstruction)lastInstruction).role == BranchingInstruction.Role.END &&
!((GoToInstruction)lastInstruction).isReturn) {
if (((GoToInstruction)lastInstruction).offset == startOffset) {
lastOffset = -1;
break;
}
else {
lastOffset--;
if (lastOffset < 0) {
break;
}
lastInstruction = flow.getInstructions().get(lastOffset);
}
}
if (lastOffset >= 0) {
lastInstruction = flow.getInstructions().get(lastOffset);
isNormal = !(lastInstruction instanceof GoToInstruction && ((GoToInstruction)lastInstruction).isReturn) &&
!(lastInstruction instanceof ThrowToInstruction);
}

25
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/LambdaValueCompatibleWithNestedTryWithResources.java Normal file
View File

@@ -0,0 +1,25 @@
import java.util.Collections;
import java.util.Set;
class Test {
Database database;
Set<Long> getItems() {
return database.perform(connection -> {
try (AutoCloseable c = null) {
try (AutoCloseable d = null) {
return Collections.emptySet();
}
}
});
}
public interface Database {
<V> V perform(BusinessLogic<V> logic);
}
public interface BusinessLogic<V> {
V execute(String connection) throws Exception;
}
}

4
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/OverloadResolutionTest.java
View File

@@ -89,6 +89,10 @@ public class OverloadResolutionTest extends LightDaemonAnalyzerTestCase {
doTest();
}
public void testLambdaValueCompatibleWithNestedTryWithResources() throws Exception {
doTest(false);
}
public void testManyOverloadsWithVarargs() throws Exception {
PlatformTestUtil.startPerformanceTest("Overload resolution with 14 overloads", 20000, new ThrowableRunnable() {
@Override