MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 04:51:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

preserve comments on invert if (IDEA-159847)

Browse Source
This commit is contained in:
Anna Kozlova
2016-08-15 21:07:36 +03:00
parent 1d7e2f6389
commit b2b09c29ee
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/java-impl/src/com/intellij/codeInsight/intention/impl/InvertIfConditionAction.java
View File

@@ -318,9 +318,11 @@ public class InvertIfConditionAction extends PsiElementBaseIntentionAction {
private static void addAfter(PsiIfStatement ifStatement, PsiStatement thenBranch) throws IncorrectOperationException {
if (thenBranch instanceof PsiBlockStatement) {
PsiBlockStatement blockStatement = (PsiBlockStatement) thenBranch;
PsiStatement[] statements = blockStatement.getCodeBlock().getStatements();
if (statements.length > 0) {
ifStatement.getParent().addRangeAfter(statements[0], statements[statements.length - 1], ifStatement);
final PsiCodeBlock block = blockStatement.getCodeBlock();
final PsiElement firstBodyElement = block.getFirstBodyElement();
final PsiElement lastBodyElement = block.getLastBodyElement();
if (firstBodyElement != null && lastBodyElement != null) {
ifStatement.getParent().addRangeAfter(firstBodyElement, lastBodyElement, ifStatement);
}
} else {
ifStatement.getParent().addAfter(thenBranch, ifStatement);

9
java/java-tests/testData/codeInsight/invertIfCondition/afterPreserveComments.java Normal file
View File

@@ -0,0 +1,9 @@
// "Invert 'if' condition" "true"
class A {
public void foo() {
if (!c) {
return;
} //comments to restore
a();
}
}

8
java/java-tests/testData/codeInsight/invertIfCondition/beforePreserveComments.java Normal file
View File

@@ -0,0 +1,8 @@
// "Invert 'if' condition" "true"
class A {
public void foo() {
<caret>if (c) { //comments to restore
a();
}
}
}