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

lambda isValueCompatible check: ensure throws is not treated as normal completion (IDEA-135581)

Browse Source
This commit is contained in:
Anna Kozlova
2015-01-26 20:19:16 +03:00
parent 6edc7c729c
commit 012e57d2ea
3 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowUtil.java
+2 -1
View File
@@ -731,7 +731,8 @@ public class ControlFlowUtil {
if (nextOffset == endOffset) {
final Instruction lastInstruction = flow.getInstructions().get(endOffset - 1);
isNormal = !(lastInstruction instanceof GoToInstruction && ((GoToInstruction)lastInstruction).isReturn);
isNormal = !(lastInstruction instanceof GoToInstruction && ((GoToInstruction)lastInstruction).isReturn) &&
!(lastInstruction instanceof ThrowToInstruction);
}
isNormal |= throwToOffset <= endOffset && !isLeaf(nextOffset) && canCompleteNormally[nextOffset];