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

Java: Attach the quick fix to the whole switch rule when at 'information' level (IDEA-202622)

Browse Source
This commit is contained in:
Pavel Dolgov
2018-11-29 16:23:32 +03:00
parent 5dd58a2244
commit 4e041e763b
3 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/enhancedSwitch/SwitchLabeledRuleCanBeCodeBlockInspection.java
+21 -11
View File
@@ -5,8 +5,10 @@ import com.intellij.codeInspection.LocalInspectionTool;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ProblemsHolder;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.project.Project;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.profile.codeInspection.InspectionProjectProfileManager;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.ObjectUtils;
@@ -44,11 +46,22 @@ public class SwitchLabeledRuleCanBeCodeBlockInspection extends LocalInspectionTo
}
}
private void registerProblem(PsiSwitchLabeledRuleStatement statement, boolean isExpressionResult) {
holder.registerProblem(ObjectUtils.notNull(ObjectUtils.tryCast(statement.getFirstChild(), PsiKeyword.class), statement),
message(isExpressionResult ? "inspection.switch.labeled.rule.can.be.code.block.expression.message"
private void registerProblem(@NotNull PsiSwitchLabeledRuleStatement statement, boolean isResultExpression) {
holder.registerProblem(getProblemElement(statement),
message(isResultExpression ? "inspection.switch.labeled.rule.can.be.code.block.expression.message"
: "inspection.switch.labeled.rule.can.be.code.block.statement.message"),
new WrapWithCodeBlockFix(isExpressionResult));
new WrapWithCodeBlockFix(isResultExpression));
}
@NotNull
private PsiElement getProblemElement(@NotNull PsiSwitchLabeledRuleStatement statement) {
if (isOnTheFly) {
if (InspectionProjectProfileManager.isInformationLevel(getShortName(), statement) ||
ApplicationManager.getApplication().isUnitTestMode()) {
return statement;
}
}
return ObjectUtils.notNull(ObjectUtils.tryCast(statement.getFirstChild(), PsiKeyword.class), statement);
}
};
}
@@ -56,8 +69,8 @@ public class SwitchLabeledRuleCanBeCodeBlockInspection extends LocalInspectionTo
private static class WrapWithCodeBlockFix implements LocalQuickFix {
private final String myMessage;
WrapWithCodeBlockFix(boolean isExpressionResult) {
myMessage = message(isExpressionResult ? "inspection.switch.labeled.rule.can.be.code.block.fix.expression.name"
WrapWithCodeBlockFix(boolean isResultExpression) {
myMessage = message(isResultExpression ? "inspection.switch.labeled.rule.can.be.code.block.fix.expression.name"
: "inspection.switch.labeled.rule.can.be.code.block.fix.statement.name");
}
@@ -89,16 +102,13 @@ public class SwitchLabeledRuleCanBeCodeBlockInspection extends LocalInspectionTo
}
private static void wrapExpression(PsiExpressionStatement expressionStatement) {
PsiExpression expression = expressionStatement.getExpression();
CommentTracker tracker = new CommentTracker();
tracker.markUnchanged(expression);
tracker.replaceAndRestoreComments(expressionStatement, "{ break " + expression.getText() + "; }");
tracker.replaceAndRestoreComments(expressionStatement, "{ break " + tracker.text(expressionStatement) + " }");
}
private static void wrapStatement(@NotNull PsiStatement statement) {
CommentTracker tracker = new CommentTracker();
tracker.markUnchanged(statement);
tracker.replaceAndRestoreComments(statement, "{ " + statement.getText() + " }");
tracker.replaceAndRestoreComments(statement, "{ " + tracker.text(statement) + " }");
}
}
}
java/java-tests/testData/inspection/switchLabeledRuleCanBeCodeBlock/InExpression.java
+3 -3
View File
@@ -1,12 +1,12 @@
class C {
String foo(int n) {
return switch (n) {
<warning descr="Labeled rule's result expression can be wrapped with code block">case</warning> 1 -> Integer.toString(n);
<warning descr="Labeled rule's result expression can be wrapped with code block">case 1 -> Integer.toString(n);</warning>
case 2 -> { break Integer.toString(n); }
<warning descr="Labeled rule's statement can be wrapped with code block">case</warning> 3 -> throw new RuntimeException();
<warning descr="Labeled rule's statement can be wrapped with code block">case 3 -> throw new RuntimeException();</warning>
case 4 -> { throw new RuntimeException(); }
case 5 -> { break "a";}
<warning descr="Labeled rule's result expression can be wrapped with code block">default</warning> -> "b";
<warning descr="Labeled rule's result expression can be wrapped with code block">default -> "b";</warning>
};
}
}
java/java-tests/testData/inspection/switchLabeledRuleCanBeCodeBlock/InStatement.java
+3 -3
View File
@@ -2,12 +2,12 @@ class C {
String foo(int n) {
String s;
switch (n) {
<warning descr="Labeled rule's statement can be wrapped with code block">case</warning> 1 -> s = Integer.toString(n);
<warning descr="Labeled rule's statement can be wrapped with code block">case 1 -> s = Integer.toString(n);</warning>
case 2 -> { s = Integer.toString(n); }
<warning descr="Labeled rule's statement can be wrapped with code block">case</warning> 3 -> throw new RuntimeException();
<warning descr="Labeled rule's statement can be wrapped with code block">case 3 -> throw new RuntimeException();</warning>
case 4 -> { throw new RuntimeException(); }
case 5 -> { s = "a"; }
<warning descr="Labeled rule's statement can be wrapped with code block">default</warning> -> s = "b";
<warning descr="Labeled rule's statement can be wrapped with code block">default -> s = "b";</warning>
};
return s;
}