MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java-analysis] JavaPsiPatternUtil.getExposedPatternVariables: support switch guard

Browse Source 
Fixes IDEA-353697 Instanceof pattern as nullchecks are suggested for removal

GitOrigin-RevId: b187d2dcc71ecac7ad68c696d0583741791c47eb
This commit is contained in:
Tagir Valeev
2024-05-21 10:05:10 +02:00
committed by intellij-monorepo-bot
parent d69af56141
commit a60bd8c4eb
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/java-psi-impl/src/com/intellij/psi/util/JavaPsiPatternUtil.java
View File

@@ -52,7 +52,8 @@ public final class JavaPsiPatternUtil {
parent instanceof PsiPrefixExpression && ((PsiPrefixExpression)parent).getOperationTokenType().equals(JavaTokenType.EXCL) ||
parent instanceof PsiPolyadicExpression && ((PsiPolyadicExpression)parent).getOperationTokenType().equals(JavaTokenType.ANDAND) ||
parent instanceof PsiPolyadicExpression && ((PsiPolyadicExpression)parent).getOperationTokenType().equals(JavaTokenType.OROR) ||
parent instanceof PsiConditionalExpression || parent instanceof PsiIfStatement || parent instanceof PsiConditionalLoopStatement;
parent instanceof PsiConditionalExpression || parent instanceof PsiIfStatement || parent instanceof PsiConditionalLoopStatement ||
parent instanceof PsiSwitchLabeledRuleStatement; // in guard
if (!parentMayAccept) {
return Collections.emptyList();
}

12
java/java-tests/testData/inspection/dataFlow/fixture/SwitchPatternInGuard.java Normal file
View File

@@ -0,0 +1,12 @@
class Test {
sealed interface I {}
record A(String a) implements I {}
public static void main(String[] args) {
I i = new A("1");
switch (i) {
case A(var a) when a instanceof String s -> System.out.println(s);
default -> System.out.println("default");
}
}
}

1
java/java-tests/testSrc/com/intellij/java/codeInspection/DataFlowInspection21Test.java
View File

@@ -117,6 +117,7 @@ public class DataFlowInspection21Test extends DataFlowInspectionTestCase {
public void testReadResolve2() { doTest(); }
public void testDifferentTypesButNullable() { doTest(); }
public void testInstanceOfWidening() { doTest(); }
public void testSwitchPatternInGuard() { doTest(); }
public void testForEachPattern() {
myFixture.addClass("""
package org.jetbrains.annotations;