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

[java] value break ref inside switch expression always resolves to a variable (IDEA-204204)

Browse Source 
... even when a switch expression is not an innermost context of the break
This commit is contained in:
Roman Shevchenko
2018-12-17 18:49:16 +01:00
parent 98b64568d1
commit 6f7e4784f3
3 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
+1 -1
View File
@@ -796,7 +796,7 @@ public class HighlightUtil extends HighlightUtilBase {
return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(statement).descriptionAndTooltip(message).create();
}
}
else if (expression != null && !plainRef) {
else if (expression != null && (!plainRef || ((PsiReferenceExpression)expression).resolve() instanceof PsiVariable)) {
String message = JavaErrorMessages.message("value.break.unexpected");
return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(statement).descriptionAndTooltip(message).create();
}
java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java
+9 -2
View File
@@ -306,8 +306,15 @@ public class PsiReferenceExpressionImpl extends ExpressionPsiElement implements
labels = new JavaResolveResult[]{new CandidateInfo(labeled, PsiSubstitutor.EMPTY)};
}
PsiElement context = PsiImplUtil.findEnclosingSwitchOrLoop(breakStatement);
if (!(context instanceof PsiSwitchExpression)) {
boolean insideSwitchExpression = false;
PsiElement context = breakStatement;
while ((context = PsiImplUtil.findEnclosingSwitchOrLoop(context.getParent())) != null) {
if (context instanceof PsiSwitchExpression) {
insideSwitchExpression = true;
break;
}
}
if (!insideSwitchExpression) {
return labels;
}
else if (labels.length > 0) {
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting12/ValueBreaks.java
+17 -1
View File
@@ -18,14 +18,30 @@ class ValueBreaks {
sink(switch (0) {
case 0 -> { while (true) <error descr="Value break outside switch expression">break 42;</error> }
case 1 -> { while (true) break <error descr="Undefined label: 'ref'">ref</error>; }
case 1 -> { while (true) <error descr="Value break outside switch expression">break ref;</error> }
case 2 -> { while (true) break <error descr="Undefined label: 'wtf'">wtf</error>; }
case 3 -> { break ref; }
case 4 -> { break (ref); }
case 5 -> { break <error descr="Cannot resolve symbol 'wtf'">wtf</error>; }
case 6 -> {
int a = 0;
a: switch (0) {
default: break <error descr="Reference to 'a' is ambiguous, both 'a:' and 'variable a' match">a</error>;
}
}
default -> throw new RuntimeException();
});
switch (0) {
case 0 -> { while (true) break <error descr="Undefined label: 'ref'">ref</error>; }
case 1 -> {
int a = 0;
a: switch (0) {
default: break a;
}
}
}
ref: sink(switch (0) {
default: break <error descr="Reference to 'ref' is ambiguous, both 'ref:' and 'ValueBreaks.ref' match">ref</error>;
});