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

Predict boolean type for 'when' expression of switch pattern

Browse Source 
IDEA-274106

GitOrigin-RevId: 3f41806bc5eceea7efa2c10bc149f231b4d42262
This commit is contained in:
Andrey Cherkasov
2022-11-07 05:17:27 +04:00
committed by intellij-monorepo-bot
parent 2f7a5590b8
commit 4bbd7cf012
13 changed files with 137 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.codeInsight;
import com.intellij.codeInsight.completion.CompletionMemory;
@@ -500,6 +500,24 @@ public final class ExpectedTypesProvider {
}
}
@Override
public void visitPatternGuard(@NotNull PsiPatternGuard guard) {
processGuard(guard);
}
@Override
public void visitGuardedPattern(@NotNull PsiGuardedPattern pattern) {
processGuard(pattern);
}
private void processGuard(@NotNull PsiCaseLabelElement guard) {
final PsiSwitchBlock switchBlock = PsiTreeUtil.getParentOfType(guard, PsiSwitchBlock.class);
if (switchBlock != null) {
final TailType caseTail = TailTypes.forSwitchLabel(switchBlock);
myResult.add(createInfoImpl(PsiType.BOOLEAN, ExpectedTypeInfo.TYPE_STRICTLY, PsiType.BOOLEAN, caseTail));
}
}
@Override
public void visitForeachStatement(@NotNull PsiForeachStatement statement) {
if (myExpr.equals(statement.getIteratedValue())) {

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalFromUsage/afterGuardedPatterns.java Normal file
View File

@@ -0,0 +1,10 @@
// "Create local variable 'flag'" "true-preview"
class Foo {
void test(Object obj) {
boolean flag;
switch (obj) {
case String s && flag -> System.out.println(1);
default -> System.out.println(2);
}
}
}

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalFromUsage/afterWhenExpression.java Normal file
View File

@@ -0,0 +1,10 @@
// "Create local variable 'flag'" "true-preview"
class Foo {
void test(Object obj) {
boolean flag;
switch (obj) {
case String s when flag -> System.out.println(1);
default -> System.out.println(2);
}
}
}

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalFromUsage/beforeGuardedPatterns.java Normal file
View File

@@ -0,0 +1,9 @@
// "Create local variable 'flag'" "true-preview"
class Foo {
void test(Object obj) {
switch (obj) {
case String s && flag<caret> -> System.out.println(1);
default -> System.out.println(2);
}
}
}

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalFromUsage/beforeWhenExpression.java Normal file
View File

@@ -0,0 +1,9 @@
// "Create local variable 'flag'" "true-preview"
class Foo {
void test(Object obj) {
switch (obj) {
case String s when flag<caret> -> System.out.println(1);
default -> System.out.println(2);
}
}
}

13
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterGuardedPattern.java Normal file
View File

@@ -0,0 +1,13 @@
// "Create method 'isEmpty' in 'Main'" "true-preview"
class Main {
void foo(Object obj) {
switch (obj) {
case String s && isEmpty(s) -> {}
default -> {}
}
}
private boolean isEmpty(String s) {
return false;
}
}

13
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterWhenExpression.java Normal file
View File

@@ -0,0 +1,13 @@
// "Create method 'isEmpty' in 'Main'" "true-preview"
class Main {
void foo(Object obj) {
switch (obj) {
case String s when isEmpty(s) -> {}
default -> {}
}
}
private boolean isEmpty(String s) {
return false;
}
}

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/beforeGuardedPattern.java Normal file
View File

@@ -0,0 +1,9 @@
// "Create method 'isEmpty' in 'Main'" "true-preview"
class Main {
void foo(Object obj) {
switch (obj) {
case String s && isEmpt<caret>y(s) -> {}
default -> {}
}
}
}

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/beforeWhenExpression.java Normal file
View File

@@ -0,0 +1,9 @@
// "Create method 'isEmpty' in 'Main'" "true-preview"
class Main {
void foo(Object obj) {
switch (obj) {
case String s when isEmpt<caret>y(s) -> {}
default -> {}
}
}
}

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createParameterFromUsage/afterGuardedPatterns.java Normal file
View File

@@ -0,0 +1,9 @@
// "Create parameter 'flag'" "true"
class Foo {
void test(Object obj, boolean flag) {
switch (obj) {
case String s && flag -> System.out.println(1);
default -> System.out.println(2);
}
}
}

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createParameterFromUsage/afterWhenExpression.java Normal file
View File

@@ -0,0 +1,9 @@
// "Create parameter 'flag'" "true"
class Foo {
void test(Object obj, boolean flag) {
switch (obj) {
case String s when flag -> System.out.println(1);
default -> System.out.println(2);
}
}
}

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createParameterFromUsage/beforeGuardedPatterns.java Normal file
View File

@@ -0,0 +1,9 @@
// "Create parameter 'flag'" "true"
class Foo {
void test(Object obj) {
switch (obj) {
case String s && flag<caret> -> System.out.println(1);
default -> System.out.println(2);
}
}
}

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createParameterFromUsage/beforeWhenExpression.java Normal file
View File

@@ -0,0 +1,9 @@
// "Create parameter 'flag'" "true"
class Foo {
void test(Object obj) {
switch (obj) {
case String s when flag<caret> -> System.out.println(1);
default -> System.out.println(2);
}
}
}