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

java - unwrap switch label fix: support used pattern variables in the switch

Browse Source 
GitOrigin-RevId: 47387f009a92a5e17846da4fa131f754234d7cf6
This commit is contained in:
Ilyas Selimov
2021-11-16 17:54:51 +07:00
committed by intellij-monorepo-bot
parent 01d333898a
commit c3a56381e7
28 changed files with 488 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java
View File

@@ -278,7 +278,7 @@ public abstract class DataFlowInspectionBase extends AbstractBaseJavaLocalInspec
private void createDescription(ProblemsHolder holder,
final DataFlowInstructionVisitor visitor,
PsiElement scope,
PsiElement scope,
Instruction @NotNull [] instructions) {
ProblemReporter reporter = new ProblemReporter(holder, scope);
@@ -351,8 +351,7 @@ public abstract class DataFlowInspectionBase extends AbstractBaseJavaLocalInspec
continue;
}
coveredSwitches.add(switchBlock);
holder.registerProblem(label, JavaAnalysisBundle.message("dataflow.message.only.switch.label"),
createUnwrapSwitchLabelFix());
holder.registerProblem(label, JavaAnalysisBundle.message("dataflow.message.only.switch.label"), createUnwrapSwitchLabelFix());
}
PsiSwitchBlock switchBlock = PsiTreeUtil.getParentOfType(labelReachability.keySet().iterator().next(), PsiSwitchBlock.class);
Set<PsiElement> suspiciousElements = SwitchBlockHighlightingModel.findSuspiciousLabelElements(switchBlock);

168
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/UnwrapSwitchLabelFix.java
View File

@@ -8,14 +8,20 @@ import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.dataFlow.fix.DeleteSwitchLabelFix;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.VariableKind;
import com.intellij.psi.impl.PsiImplUtil;
import com.intellij.psi.search.searches.ReferencesSearch;
import com.intellij.psi.util.JavaPsiPatternUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.ObjectUtils;
import com.siyeh.ig.controlflow.SwitchStatementWithTooFewBranchesInspection.UnwrapSwitchStatementFix;
import com.intellij.util.containers.JBIterable;
import com.siyeh.ig.psiutils.BreakConverter;
import com.siyeh.ig.psiutils.CommentTracker;
import com.siyeh.ig.psiutils.VariableNameGenerator;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.List;
import java.util.Objects;
@@ -49,46 +55,180 @@ public class UnwrapSwitchLabelFix implements LocalQuickFix {
new CommentTracker().deleteAndRestoreComments(labelElement);
}
}
tryUnwrap(labelStatement, block);
tryUnwrap(labelStatement, label, block);
}
private static void tryUnwrap(PsiSwitchLabelStatementBase labelStatement, PsiSwitchBlock block) {
private static void tryUnwrap(@NotNull PsiSwitchLabelStatementBase labelStatement, @NotNull PsiCaseLabelElement label,
@NotNull PsiSwitchBlock block) {
if (block instanceof PsiSwitchStatement) {
BreakConverter converter = BreakConverter.from(block);
if (converter == null) return;
converter.process();
unwrapStatement(labelStatement, (PsiSwitchStatement)block);
} else {
UnwrapSwitchStatementFix.unwrapExpression((PsiSwitchExpression)block);
unwrapStatement(labelStatement, label, (PsiSwitchStatement)block);
}
else {
unwrapExpression((PsiSwitchExpression)block, label);
}
}
private static void unwrapStatement(PsiSwitchLabelStatementBase labelStatement, PsiSwitchStatement statement) {
PsiCodeBlock block = statement.getBody();
private static void unwrapStatement(@NotNull PsiSwitchLabelStatementBase labelStatement, @NotNull PsiCaseLabelElement label,
@NotNull PsiSwitchStatement switchStatement) {
PsiCodeBlock block = switchStatement.getBody();
PsiStatement body =
labelStatement instanceof PsiSwitchLabeledRuleStatement ? ((PsiSwitchLabeledRuleStatement)labelStatement).getBody() : null;
PsiVariable variable = null;
if (body == null) {
if (block != null) {
variable = createVariable(label, switchStatement, block);
}
new CommentTracker().deleteAndRestoreComments(labelStatement);
}
else if (body instanceof PsiBlockStatement) {
variable = createVariable(label, switchStatement, body);
block = ((PsiBlockStatement)body).getCodeBlock();
}
else {
variable = createVariable(label, switchStatement, body);
new CommentTracker().replaceAndRestoreComments(labelStatement, body);
}
PsiCodeBlock parent = ObjectUtils.tryCast(statement.getParent(), PsiCodeBlock.class);
PsiCodeBlock parent = ObjectUtils.tryCast(switchStatement.getParent(), PsiCodeBlock.class);
CommentTracker ct = new CommentTracker();
if (parent != null && !BlockUtils.containsConflictingDeclarations(Objects.requireNonNull(block), parent)) {
ct.grabComments(statement);
ct.grabComments(switchStatement);
ct.markUnchanged(block);
ct.insertCommentsBefore(statement);
BlockUtils.inlineCodeBlock(statement, block);
ct.insertCommentsBefore(switchStatement);
PsiElement firstElementAdded = BlockUtils.inlineCodeBlock(switchStatement, block);
if (variable != null && firstElementAdded != null) {
addVariable(variable, firstElementAdded, parent);
}
}
else if (block != null) {
ct.replaceAndRestoreComments(statement, ct.text(block));
if (variable != null) {
PsiStatement firstStatement = ArrayUtil.getFirstElement(block.getStatements());
if (firstStatement != null) {
block.addBefore(variable, firstStatement);
}
}
ct.replaceAndRestoreComments(switchStatement, ct.text(block));
}
else {
ct.deleteAndRestoreComments(statement);
ct.deleteAndRestoreComments(switchStatement);
}
}
/**
* Unwraps switch expression if it consists of single expression-branch; does nothing otherwise
*
* @param switchExpression expression to unwrap
*/
public static void unwrapExpression(@NotNull PsiSwitchExpression switchExpression) {
unwrapExpression(switchExpression, null);
}
private static void unwrapExpression(@NotNull PsiSwitchExpression switchExpression, @Nullable PsiCaseLabelElement label) {
PsiCodeBlock body = switchExpression.getBody();
if (body == null) return;
PsiStatement[] statements = body.getStatements();
if (statements.length != 1 || !(statements[0] instanceof PsiSwitchLabeledRuleStatement)) return;
PsiSwitchLabeledRuleStatement rule = (PsiSwitchLabeledRuleStatement)statements[0];
PsiStatement ruleBody = rule.getBody();
if (!(ruleBody instanceof PsiExpressionStatement)) return;
if (label == null) {
new CommentTracker().replaceAndRestoreComments(switchExpression, ((PsiExpressionStatement)ruleBody).getExpression());
return;
}
PsiVariable variable = createVariable(label, switchExpression, ruleBody);
if (variable == null) {
new CommentTracker().replaceAndRestoreComments(switchExpression, ((PsiExpressionStatement)ruleBody).getExpression());
return;
}
PsiElement parent = switchExpression, gParent = switchExpression.getParent();
while (!(gParent instanceof PsiCodeBlock || gParent instanceof PsiClass)) {
if (parent instanceof PsiFile) {
gParent = null;
parent = null;
break;
}
parent = gParent;
gParent = parent.getParent();
}
new CommentTracker().replaceAndRestoreComments(switchExpression, ((PsiExpressionStatement)ruleBody).getExpression());
if (gParent != null) {
addVariable(variable, parent, gParent);
}
}
/**
* @param label a switch label element
* @param switchBlock a considered switch block
* @param body a body of either switch labeled rule if <code>switchBlock</code> consists of labeled rules,
* or a body of the entire switch statement
* @return either field or a local variable extracted from a pattern variable if it's possible and necessary.
* If a pattern variable type is not total for selector type, a type cast expression will be created then.
*/
@Nullable
private static PsiVariable createVariable(@NotNull PsiCaseLabelElement label,
@NotNull PsiSwitchBlock switchBlock,
@NotNull PsiElement body) {
if (!(label instanceof PsiPattern)) return null;
PsiExpression selector = switchBlock.getExpression();
if (selector == null) return null;
PsiType selectorType = selector.getType();
if (selectorType == null) return null;
PsiPatternVariable patternVar = JavaPsiPatternUtil.getPatternVariable(((PsiPattern)label));
if (patternVar == null) return null;
JBIterable<PsiReferenceExpression> bodyTraverser = SyntaxTraverser.psiTraverser(body).filter(PsiReferenceExpression.class);
PsiSwitchLabelStatementBase labelStatement = PsiTreeUtil.getParentOfType(label, PsiSwitchLabelStatementBase.class);
if (labelStatement instanceof PsiSwitchLabelStatement) {
bodyTraverser = bodyTraverser.filter(expr -> PsiTreeUtil.getParentOfType(expr, PsiSwitchLabelStatementBase.class) != labelStatement);
}
if (bodyTraverser.find(expr -> expr.resolve() == patternVar) == null) return null;
String declarationStatementText = Objects.requireNonNull(patternVar.getPattern()).getText() + "=";
if (!JavaPsiPatternUtil.isTotalForType(patternVar.getPattern(), selectorType)) {
declarationStatementText += "(" + patternVar.getTypeElement().getType().getPresentableText() + ")";
}
declarationStatementText += selector.getText() + ";";
if (switchBlock instanceof PsiSwitchExpression) {
PsiElement parent = PsiTreeUtil.getParentOfType(switchBlock, PsiClass.class, true, PsiCodeBlock.class);
if (parent != null) {
return JavaPsiFacade.getInstance(label.getProject()).getParserFacade().createFieldFromText(declarationStatementText, label);
}
}
return (PsiLocalVariable)((PsiDeclarationStatement)JavaPsiFacade.getInstance(label.getProject()).getParserFacade()
.createStatementFromText(declarationStatementText, label)).getDeclaredElements()[0];
}
/**
* If there is no naming conflict between <code>variable</code> and existing ones, the name of <code>variable</code> leaves as is.
* Otherwise, we need to select a new unique name for <code>variable</code> and rename its references as well.
*
* @param variable variable to add
* @param variableSibling is used as anchor for <code>variable</code> to be added
* @param variableParent parent for both <code>variable</code> and <code>variableSibling</code>.
* Mostly used to detect a conflict and to add <code>variable</code> as a child.
*/
private static void addVariable(@NotNull PsiVariable variable, @NotNull PsiElement variableSibling, @NotNull PsiElement variableParent) {
boolean hasConflictingDeclaration = hasConflictingDeclaration(variable, variableParent);
if (variable instanceof PsiLocalVariable) {
PsiStatement declaration = JavaPsiFacade.getInstance(variableSibling.getProject()).getParserFacade()
.createStatementFromText(variable.getText(), variableSibling);
variable = (PsiVariable)((PsiDeclarationStatement)variableParent.addBefore(declaration, variableSibling)).getDeclaredElements()[0];
}
else {
variable = (PsiVariable)variableParent.addBefore(variable, variableSibling);
}
if (!hasConflictingDeclaration) return;
String newVarName = new VariableNameGenerator(variableParent, variableParent instanceof PsiClass ? VariableKind.FIELD : VariableKind.LOCAL_VARIABLE)
.byName(variable.getName()).generate(true);
for (PsiReference ref : ReferencesSearch.search(Objects.requireNonNull(variable), variable.getUseScope())) {
ref.handleElementRename(newVarName);
}
variable.setName(newVarName);
}
private static boolean hasConflictingDeclaration(@NotNull PsiVariable var, @NotNull PsiElement context) {
return !new VariableNameGenerator(context, var instanceof PsiField ? VariableKind.FIELD : VariableKind.LOCAL_VARIABLE)
.byName(var.getName()).generate(true).equals(var.getName());
}
}

26
java/java-psi-impl/src/com/intellij/codeInsight/BlockUtils.java
View File

@@ -7,6 +7,7 @@ import com.intellij.psi.codeStyle.CodeStyleManager;
import com.intellij.psi.util.PsiUtil;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.util.SmartList;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -199,22 +200,29 @@ public final class BlockUtils {
return false;
}
public static void inlineCodeBlock(@NotNull PsiStatement orig, PsiCodeBlock codeBlock) {
/**
* Method inlines the statements inside <code>codeBlock</code> replacing <code>statement</code>.
*
* @param statement statement to delete
* @param codeBlock a block with statements to inline
* @return a first inlined statement, or null if <code>codeBlock</code> doesn't contain any statements.
*/
@Nullable
@Contract(pure = true)
public static PsiElement inlineCodeBlock(@NotNull PsiStatement statement, @NotNull PsiCodeBlock codeBlock) {
PsiJavaToken lBrace = codeBlock.getLBrace();
PsiJavaToken rBrace = codeBlock.getRBrace();
if (lBrace == null || rBrace == null) return;
if (lBrace == null || rBrace == null) return null;
final PsiElement[] children = codeBlock.getChildren();
PsiElement added = null;
if (children.length > 2) {
final PsiElement added =
orig.getParent().addRangeBefore(
children[1],
children[children.length - 2],
orig);
final CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(orig.getManager());
added = statement.getParent().addRangeBefore(children[1], children[children.length - 2], statement);
final CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(statement.getManager());
codeStyleManager.reformat(added);
}
orig.delete();
statement.delete();
return added;
}
public static PsiBlockStatement createBlockStatement(Project project) {

14
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapPatternConflict1.java Normal file
View File

@@ -0,0 +1,14 @@
// "Remove unreachable branches" "true"
class Test {
void test(Number n) {
n = 1;
{
Integer i = (Integer) n;
int j = 1;
System.out.println(i);
}
{
Object j = "";
}
}
}

12
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapPatternConflict2.java Normal file
View File

@@ -0,0 +1,12 @@
// "Remove unreachable branches" "true"
class Test {
void test(Number n) {
n = 1;
{
Integer i = (Integer) n;
int j = 1;
System.out.println(i);
}
Object j = "";
}
}

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapPatternConflict3.java Normal file
View File

@@ -0,0 +1,9 @@
// "Remove unreachable branches" "true"
class Test {
void test(Number n) {
n = 1;
Integer i1 = (Integer) n;
System.out.println(i1);
Object i = "";
}
}

11
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapPatternConflict4.java Normal file
View File

@@ -0,0 +1,11 @@
// "Remove unreachable branches" "true"
class Test {
void test(Number n) {
n = 1;
Integer i1 = (Integer) n;
System.out.println(i1);
{
Object i = "";
}
}
}

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapPatternConflict5.java Normal file
View File

@@ -0,0 +1,10 @@
// "Remove unreachable branches" "true"
class Test {
void test(Number n) {
n = 1;
Integer i1 = (Integer) n;
int result = i1 + 10;
int i = 5;
System.out.println(result + i);
}
}

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapPatternConflict6.java Normal file
View File

@@ -0,0 +1,9 @@
// "Remove unreachable branches" "true"
class Test {
Number n = 1;
Integer i = (Integer) n;
int result = i + 10;
{
int i = 5;
}
}

11
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapPatternConflict7.java Normal file
View File

@@ -0,0 +1,11 @@
// "Remove unreachable branches" "true"
class Test {
int test(Number n) {
n = 1;
Object i1 = n;
System.out.println((int) i1 + 10);
int i = 5;
System.out.println(i);
}
}

18
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapPatternNoConflict1.java Normal file
View File

@@ -0,0 +1,18 @@
// "Remove unreachable branches" "true"
import java.util.concurrent.ThreadLocalRandom;
class Test {
void test(Number n) {
n = 1;
Integer i = (Integer) n;
int rand = ThreadLocalRandom.current().nextInt();
if (rand > 10) {
i = 2;
}
else {
i = 3;
}
System.out.println(i);
}
}

16
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapPatternNoConflict2.java Normal file
View File

@@ -0,0 +1,16 @@
// "Remove unreachable branches" "true"
import java.util.concurrent.ThreadLocalRandom;
class Test {
void test(Number n) {
n = 1;
Integer i = (Integer) n;
int rand = ThreadLocalRandom.current().nextInt();
if (rand > 10) {
i = 2;
}
else {
i = 3;
}
System.out.println(i);
}
}

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapPatternNoConflict3.java Normal file
View File

@@ -0,0 +1,9 @@
// "Remove unreachable branches" "true"
class Test {
final String s = "abc";
void test() {
System.out.println(1);
}
}

0
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapPattern.java → java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapPatternNoConflict4.java
View File

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapPatternNoConflict5.java Normal file
View File

@@ -0,0 +1,9 @@
// "Remove unreachable branches" "true"
class Test {
int test(Number n) {
n = 1;
Integer i = (Integer) n;
return 1 + i;
}
}

17
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapPatternConflict1.java Normal file
View File

@@ -0,0 +1,17 @@
// "Remove unreachable branches" "true"
class Test {
void test(Number n) {
n = 1;
switch (n) {
case <caret>Integer i && i == 1 -> {
int j = 1;
System.out.println(i);
}
case Long s -> System.out.println(s);
default -> System.out.println();
}
{
Object j = "";
}
}
}

19
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapPatternConflict2.java Normal file
View File

@@ -0,0 +1,19 @@
// "Remove unreachable branches" "true"
class Test {
void test(Number n) {
n = 1;
switch (n) {
case <caret>Integer i && i == 1:
int j = 1;
System.out.println(i);
break;
case Long s:
System.out.println(s);
break;
default:
System.out.println();
break;
}
Object j = "";
}
}

12
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapPatternConflict3.java Normal file
View File

@@ -0,0 +1,12 @@
// "Remove unreachable branches" "true"
class Test {
void test(Number n) {
n = 1;
switch (n) {
case <caret>Integer i && i == 1 -> System.out.println(i);
case Long s -> System.out.println(s);
default -> System.out.println();
}
Object i = "";
}
}

20
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapPatternConflict4.java Normal file
View File

@@ -0,0 +1,20 @@
// "Remove unreachable branches" "true"
class Test {
void test(Number n) {
n = 1;
switch (n) {
case <caret>Integer i && i == 1:
System.out.println(i);
break;
case Long s:
System.out.println(s);
break;
default:
System.out.println();
break;
}
{
Object i = "";
}
}
}

13
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapPatternConflict5.java Normal file
View File

@@ -0,0 +1,13 @@
// "Remove unreachable branches" "true"
class Test {
void test(Number n) {
n = 1;
int result = switch (n) {
case <caret>Integer i && i == 1 -> i;
case Long l -> l.intValue();
case default -> 1;
} + 10;
int i = 5;
System.out.println(result + i);
}
}

12
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapPatternConflict6.java Normal file
View File

@@ -0,0 +1,12 @@
// "Remove unreachable branches" "true"
class Test {
Number n = 1;
int result = switch (n) {
case <caret>Integer i && i == 1 -> i;
case Long l -> l.intValue();
case default -> 1;
} + 10;
{
int i = 5;
}
}

13
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapPatternConflict7.java Normal file
View File

@@ -0,0 +1,13 @@
// "Remove unreachable branches" "true"
class Test {
int test(Number n) {
n = 1;
System.out.println(switch (n) {
case Long l -> l.intValue();
case <caret>Object i -> (int)i;
} + 10);
int i = 5;
System.out.println(i);
}
}

23
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapPatternNoConflict1.java Normal file
View File

@@ -0,0 +1,23 @@
// "Remove unreachable branches" "true"
import java.util.concurrent.ThreadLocalRandom;
class Test {
void test(Number n) {
n = 1;
switch (n) {
case <caret>Integer i && i == 1 -> {
int rand = ThreadLocalRandom.current().nextInt();
if (rand > 10) {
i = 2;
}
else {
i = 3;
}
System.out.println(i);
}
case Long s -> System.out.println(s);
default -> System.out.println();
}
}
}

25
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapPatternNoConflict2.java Normal file
View File

@@ -0,0 +1,25 @@
// "Remove unreachable branches" "true"
import java.util.concurrent.ThreadLocalRandom;
class Test {
void test(Number n) {
n = 1;
switch (n) {
case <caret>Integer i && i == 1:
int rand = ThreadLocalRandom.current().nextInt();
if (rand > 10) {
i = 2;
}
else {
i = 3;
}
System.out.println(i);
break;
case Long s:
System.out.println(s);
break;
default:
System.out.println();
break;
}
}
}

19
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapPatternNoConflict3.java Normal file
View File

@@ -0,0 +1,19 @@
// "Remove unreachable branches" "true"
class Test {
final String s = "abc";
void test() {
switch (s) {
case <caret>String ss && ss.length() <= 3:
System.out.println(1);
break;
case "fsd":
System.out.println(2);
break;
case default:
System.out.println(3);
break;
}
}
}

0
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapPattern.java → java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapPatternNoConflict4.java
View File

12
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapPatternNoConflict5.java Normal file
View File

@@ -0,0 +1,12 @@
// "Remove unreachable branches" "true"
class Test {
int test(Number n) {
n = 1;
return 1 + switch (n) {
case <caret>Integer i && i == 1 -> i;
case Long l -> l.intValue();
case default -> 1;
};
}
}

19
plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementWithTooFewBranchesInspection.java
View File

@@ -16,6 +16,7 @@
package com.siyeh.ig.controlflow;
import com.intellij.codeInsight.daemon.impl.quickfix.ConvertSwitchToIfIntention;
import com.intellij.codeInsight.daemon.impl.quickfix.UnwrapSwitchLabelFix;
import com.intellij.codeInspection.CommonQuickFixBundle;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ui.SingleIntegerFieldOptionsPanel;
@@ -26,7 +27,6 @@ import com.siyeh.InspectionGadgetsBundle;
import com.siyeh.ig.BaseInspection;
import com.siyeh.ig.BaseInspectionVisitor;
import com.siyeh.ig.InspectionGadgetsFix;
import com.siyeh.ig.psiutils.CommentTracker;
import com.siyeh.ig.psiutils.SwitchUtils;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
@@ -146,23 +146,8 @@ public class SwitchStatementWithTooFewBranchesInspection extends BaseInspection
if (block instanceof PsiSwitchStatement) {
ConvertSwitchToIfIntention.doProcessIntention((PsiSwitchStatement)block);
} else if (block instanceof PsiSwitchExpression) {
unwrapExpression((PsiSwitchExpression)block);
UnwrapSwitchLabelFix.unwrapExpression((PsiSwitchExpression)block);
}
}
/**
* Unwraps switch expression if it consists of single expression-branch; does nothing otherwise
* @param switchExpression expression to unwrap
*/
public static void unwrapExpression(PsiSwitchExpression switchExpression) {
PsiCodeBlock body = switchExpression.getBody();
if (body == null) return;
PsiStatement[] statements = body.getStatements();
if (statements.length != 1 || !(statements[0] instanceof PsiSwitchLabeledRuleStatement)) return;
PsiSwitchLabeledRuleStatement rule = (PsiSwitchLabeledRuleStatement)statements[0];
PsiStatement ruleBody = rule.getBody();
if (!(ruleBody instanceof PsiExpressionStatement)) return;
new CommentTracker().replaceAndRestoreComments(switchExpression, ((PsiExpressionStatement)ruleBody).getExpression());
}
}
}