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

IDEA-204717 Can't convert enhanced 'switch' to 'if' if a branch's body contains an end-of-line comment

Browse Source
This commit is contained in:
Tagir Valeev
2018-12-26 17:56:52 +07:00
parent 5457c671f8
commit 7addf9e702
3 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -338,8 +338,13 @@ public class ConvertSwitchToIfIntention implements IntentionAction {
if (bodyStatement instanceof PsiBlockStatement) {
final PsiBlockStatement blockStatement = (PsiBlockStatement)bodyStatement;
final PsiCodeBlock codeBlock = blockStatement.getCodeBlock();
for (PsiStatement statement : codeBlock.getStatements()) {
out.append(commentTracker.text(statement));
PsiElement start = PsiTreeUtil.skipWhitespacesForward(codeBlock.getFirstBodyElement());
PsiElement end = PsiTreeUtil.skipWhitespacesBackward(codeBlock.getLastBodyElement());
if (start != null && end != null) {
for (PsiElement child = start; child != null; child = child.getNextSibling()) {
out.append(commentTracker.text(child));
if (child == end) break;
}
}
}
else {

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

@@ -0,0 +1,10 @@
// "Replace 'switch' with 'if'" "true"
class Test {
void f(int n, int k) {
if (n == 0) {
if (k == 0) return; //this comment causes the exception IDEA-204717
if (k == 1) {
}
}
}
}

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

@@ -0,0 +1,12 @@
// "Replace 'switch' with 'if'" "true"
class Test {
void f(int n, int k) {
sw<caret>itch (n) {
case 0 -> {
if (k == 0) return; //this comment causes the exception IDEA-204717
if (k == 1) {
}
}
}
}
}