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-intention] WrapSwitchRuleStatementsIntoBlock: support erroneous semicolon; fix-all option

Browse Source 
Fixes EA-261429 - AE: JavaParserUtil.parseFragment

GitOrigin-RevId: 3939658513b2b1bec5eca693e50386fd4fe2e58e
This commit is contained in:
Tagir Valeev
2021-03-18 11:36:32 +07:00
committed by intellij-monorepo-bot
parent 232eab2954
commit 1e2b4cfe0d
5 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/WrapSwitchRuleStatementsIntoBlockFix.java
View File

@@ -2,11 +2,13 @@
package com.intellij.codeInsight.daemon.impl.quickfix;
import com.intellij.codeInsight.daemon.QuickFixBundle;
import com.intellij.codeInsight.daemon.impl.actions.IntentionActionWithFixAllOption;
import com.intellij.codeInsight.intention.impl.BaseIntentionAction;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.ObjectUtils;
@@ -15,7 +17,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.Objects;
public class WrapSwitchRuleStatementsIntoBlockFix extends BaseIntentionAction {
public class WrapSwitchRuleStatementsIntoBlockFix extends BaseIntentionAction implements IntentionActionWithFixAllOption {
@NotNull
private final PsiSwitchLabeledRuleStatement myRuleStatement;
@@ -65,6 +67,12 @@ public class WrapSwitchRuleStatementsIntoBlockFix extends BaseIntentionAction {
oldBody = myRuleStatement.getBody().copy();
myRuleStatement.getBody().delete();
}
for (PsiElement lastChild = myRuleStatement.getLastChild(); lastChild != null; lastChild = lastChild.getPrevSibling()) {
if (PsiUtil.isJavaToken(lastChild, JavaTokenType.SEMICOLON)) {
lastChild.delete();
break;
}
}
PsiSwitchLabeledRuleStatement newRule = (PsiSwitchLabeledRuleStatement)JavaPsiFacade.getElementFactory(project).createStatementFromText(
myRuleStatement.getText() + "{}", myRuleStatement);
PsiCodeBlock block = ((PsiBlockStatement)Objects.requireNonNull(newRule.getBody())).getCodeBlock();

13
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/wrapSwitchRuleStatements/afterOneSemicolon.java Normal file
View File

@@ -0,0 +1,13 @@
// "Apply all 'Create block' fixes in file" "true"
class X {
void test(int x) {
switch(x) {
case 1 -> {
}
case 2 -> {
}
case 3 -> {
}
}
}
}

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/wrapSwitchRuleStatements/afterTwoSemicolons.java Normal file
View File

@@ -0,0 +1,10 @@
// "Wrap with block" "true"
class X {
void test(int x) {
switch(x) {
case 1 -> { /**/
;
}
}
}
}

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/wrapSwitchRuleStatements/beforeOneSemicolon.java Normal file
View File

@@ -0,0 +1,10 @@
// "Apply all 'Create block' fixes in file" "true"
class X {
void test(int x) {
switch(x) {
case 1 -> <caret>;
case 2 -> ;
case 3 -> ;
}
}
}

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/wrapSwitchRuleStatements/beforeTwoSemicolons.java Normal file
View File

@@ -0,0 +1,8 @@
// "Wrap with block" "true"
class X {
void test(int x) {
switch(x) {
case 1 -> <caret>; /**/ ;
}
}
}