MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-18 20:41:22 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java-highlighting] IDEA-326939 Support multi-pattern switch labels that define no variables

Browse Source 
GitOrigin-RevId: fb0360f00314417c17566637db6bbda4c21e6faa
This commit is contained in:
Tagir Valeev
2023-08-14 17:10:16 +02:00
committed by intellij-monorepo-bot
parent fdcb966cf3
commit 5618627fa4
7 changed files with 108 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingPatternsInSwitch/IllegalFallthroughIn20Java.java
View File

@@ -127,7 +127,7 @@ public class Main {
void test12(Integer integer) {
switch (integer) {
case 1, 2, <error descr="Invalid case label combination: A case label must consist of either a list of case constants or a single case pattern">Integer i1 when i1 > 5</error>:
case 1, 2, <error descr="Invalid case label combination: a case label must consist of either a list of case constants or a single case pattern">Integer i1 when i1 > 5</error>:
case null:
System.out.println("blah blah blah");
break;
@@ -253,7 +253,7 @@ public class Main {
void test28(String s) {
switch (s) {
case String str, <error descr="Invalid case label combination: A case label must consist of either a list of case constants or a single case pattern">"hello"</error>, "world" -> {}
case String str, <error descr="Invalid case label combination: a case label must consist of either a list of case constants or a single case pattern">"hello"</error>, "world" -> {}
}
}

61
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingPatternsInSwitch/SwitchSeveralPatternsUnnamed.java Normal file
View File

@@ -0,0 +1,61 @@
class Test {
enum X{A, B}
record R(int x, int y) {}
record R1(int z) {}
void test(Object obj) {
switch (obj) {
case Integer _, String _ -> System.out.println("string or int");
case R(_, _), R1 _ -> System.out.println("R or R1");
default -> System.out.println("other");
}
}
void testRepeat(Object obj) {
switch (obj) {
case Integer _, String _ -> System.out.println("string or int");
case Double _, <error descr="Label is dominated by a preceding case label 'Integer _'">Integer _</error> -> System.out.println("double or int");
default -> System.out.println("other");
}
}
void testEnum(Object obj) {
switch (obj) {
case X.A, <error descr="Invalid case label combination: a case label must consist of either a list of case constants or a single case pattern">String _</error> -> System.out.println("string or int");
case Integer _, <error descr="Invalid case label combination: a case label must consist of either a list of case constants or a single case pattern">X.B</error> -> System.out.println("string or int");
default -> System.out.println("other");
}
}
void test2(Object obj) {
switch (obj) {
case Integer x, <error descr="Invalid case label combination: Multiple patterns are allowed only if none of them declare any pattern variables">String _</error> -> System.out.println("string or int");
case R(_, var i), <error descr="Invalid case label combination: Multiple patterns are allowed only if none of them declare any pattern variables">R1 _</error> -> System.out.println("R or R1");
default -> System.out.println("other");
}
}
void testGuards(Object obj) {
switch (obj) {
case Integer _ when <error descr="Guard expression is allowed only after the last label element">((Integer)obj) > 0</error>,
String _ when !((String)obj).isEmpty() -> System.out.println("Positive integer or non-empty string");
default -> System.out.println("other");
}
}
void testFallthrough(Object obj) {
switch (obj) {
case Integer _:
case String _:
System.out.println("Number or string");
break;
case Double _:
case <error descr="Multiple switch labels are permitted for a switch labeled statement group only if none of them declare any pattern variables">Float f</error>:
System.out.println("double or float");
break;
default:
System.out.println("other");
}
}
}

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

@@ -90,6 +90,10 @@ public class LightPatternsForSwitchHighlightingTest extends LightJavaCodeInsight
public void testSwitchExhaustivenessWithGenericsIn21Java() {
IdeaTestUtil.withLevel(getModule(), LanguageLevel.JDK_21, this::doTest);
}
public void testSwitchSeveralPatternsUnnamed() {
IdeaTestUtil.withLevel(getModule(), LanguageLevel.JDK_21_PREVIEW, this::doTest);
}
public void testSwitchDominanceIn21Java() {
IdeaTestUtil.withLevel(getModule(), LanguageLevel.JDK_21, this::doTest);