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

switch selector error message (IDEA-123937)

Browse Source
This commit is contained in:
Anna Kozlova
2014-04-14 19:35:18 +02:00
parent 964735c32a
commit 8195023646
2 changed files with 6 additions and 3 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
+5 -3
View File
@@ -1323,10 +1323,12 @@ public class HighlightUtil extends HighlightUtilBase {
return null;
}
HighlightInfo errorResult = null;
if (!isValidTypeForSwitchSelector(type, PsiUtil.isLanguageLevel7OrHigher(expression))) {
final boolean atLeastJava7 = PsiUtil.isLanguageLevel7OrHigher(expression);
if (!isValidTypeForSwitchSelector(type, atLeastJava7)) {
final String switchSelectorMessage = atLeastJava7 ? JavaErrorMessages.message("valid.switch.17.selector.types")
: JavaErrorMessages.message("valid.switch.selector.types");
String message =
JavaErrorMessages.message("incompatible.types", JavaErrorMessages.message("valid.switch.selector.types"), JavaHighlightUtil.formatType(
type));
JavaErrorMessages.message("incompatible.types", switchSelectorMessage, JavaHighlightUtil.formatType(type));
errorResult = HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(expression).descriptionAndTooltip(message).create();
QuickFixAction.registerQuickFixAction(errorResult, QUICK_FIX_FACTORY.createConvertSwitchToIfIntention(statement));
if (PsiType.LONG.equals(type) || PsiType.FLOAT.equals(type) || PsiType.DOUBLE.equals(type)) {
java/java-psi-impl/src/messages/JavaErrorMessages.properties
+1
View File
@@ -220,6 +220,7 @@ not.a.statement=Not a statement
invalid.statement=Invalid statement
incompatible.types=Incompatible types. Found: ''{1}'', required: ''{0}''
valid.switch.selector.types=byte, char, short or int
valid.switch.17.selector.types=char, byte, short, int, Character, Byte, Short, Integer, String, or an enum
dot.expected.after.super.or.this='.' expected
unqualified.super.disallowed=Unqualified super reference is not allowed in extension method