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-intentions] ConvertSwitchToIfIntention: fix brace handling

Browse Source 
Fixes EA-795482 - IOE: JavaParserUtil.parseFragment

GitOrigin-RevId: 63fe89da84e4432fab8f8f191c139add97553640
This commit is contained in:
Tagir Valeev
2023-02-13 10:13:31 +01:00
committed by intellij-monorepo-bot
parent e947f7b9a8
commit 2b2d79fb6a
7 changed files with 68 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertSwitchToIfIntention.java
View File

@@ -477,8 +477,8 @@ public class ConvertSwitchToIfIntention implements IntentionActionWithFixAllOpti
for (PsiElement bodyStatement : bodyStatements) {
if (bodyStatement instanceof PsiBlockStatement blockStatement) {
final PsiCodeBlock codeBlock = blockStatement.getCodeBlock();
PsiElement start = PsiTreeUtil.skipWhitespacesForward(codeBlock.getFirstBodyElement());
PsiElement end = PsiTreeUtil.skipWhitespacesBackward(codeBlock.getLastBodyElement());
PsiElement start = PsiTreeUtil.skipWhitespacesForward(codeBlock.getLBrace());
PsiElement end = PsiTreeUtil.skipWhitespacesBackward(codeBlock.getRBrace());
if (start != null && end != null && start != codeBlock.getRBrace()) {
for (PsiElement child = start; child != null; child = child.getNextSibling()) {
out.append(commentTracker.text(child));

12
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterNestedBlock.java Normal file
View File

@@ -0,0 +1,12 @@
// "Replace 'switch' with 'if'" "true-preview"
class X {
void test(int x) {
if (x == 1) {
{
System.out.println("hello");
}
} else if (x == 2) {
System.out.println("oops");
}
}
}

12
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterNestedBlock2.java Normal file
View File

@@ -0,0 +1,12 @@
// "Replace 'switch' with 'if'" "true-preview"
class X {
void test(int x) {
if (x == 1) {
{
System.out.println("hello");
}
} else if (x == 2) {
System.out.println("oops");
}
}
}

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterNoSpaceBeforeBrace.java Normal file
View File

@@ -0,0 +1,10 @@
// "Replace 'switch' with 'if'" "true-preview"
class X {
void test(int x) {
if (x == 1) {
System.out.println("");
} else if (x == 2) {
System.out.println("oops");
}
}
}

11
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeNestedBlock.java Normal file
View File

@@ -0,0 +1,11 @@
// "Replace 'switch' with 'if'" "true-preview"
class X {
void test(int x) {
<caret>switch (x) {
case 1 -> {{
System.out.println("hello");
}}
case 2 -> System.out.println("oops");
}
}
}

12
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeNestedBlock2.java Normal file
View File

@@ -0,0 +1,12 @@
// "Replace 'switch' with 'if'" "true-preview"
class X {
void test(int x) {
<caret>switch (x) {
case 1 -> {
{
System.out.println("hello");
}}
case 2 -> System.out.println("oops");
}
}
}

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeNoSpaceBeforeBrace.java Normal file
View File

@@ -0,0 +1,9 @@
// "Replace 'switch' with 'if'" "true-preview"
class X {
void test(int x) {
<caret>switch (x) {
case 1 -> { System.out.println("");}
case 2 -> System.out.println("oops");
}
}
}