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

InvertIfConditionAction: better comment handling

Browse Source
This commit is contained in:
Tagir Valeev
2018-03-12 15:55:14 +07:00
parent 2218aa62ae
commit adf14b7ded
3 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/intention/impl/InvertIfConditionAction.java
+17 -12
View File
@@ -163,13 +163,14 @@ public class InvertIfConditionAction extends PsiElementBaseIntentionAction {
PsiElementFactory factory = JavaPsiFacade.getInstance(ifStatement.getProject()).getElementFactory();
Project project = ifStatement.getProject();
CommentTracker ct = new CommentTracker();
PsiStatement thenBranch = Objects.requireNonNull(ifStatement.getThenBranch());
PsiStatement elseBranch = ifStatement.getElseBranch();
if (elseBranch != null) {
elseBranch = (PsiStatement) elseBranch.copy();
setElseBranch(ifStatement, thenBranch, flow);
ifStatement.getThenBranch().replace(elseBranch);
setElseBranch(ifStatement, thenBranch, flow, ct);
ct.replaceAndRestoreComments(ifStatement.getThenBranch(), elseBranch);
return ifStatement;
}
@@ -178,7 +179,7 @@ public class InvertIfConditionAction extends PsiElementBaseIntentionAction {
ifStatement.setElseBranch(thenBranch);
PsiStatement statement = factory.createStatementFromText("{}", ifStatement);
statement = (PsiStatement) codeStyle.reformat(statement);
statement = (PsiStatement) ifStatement.getThenBranch().replace(statement);
statement = (PsiStatement) ct.replaceAndRestoreComments(ifStatement.getThenBranch(), statement);
codeStyle.reformat(statement);
return ifStatement;
}
@@ -197,12 +198,13 @@ public class InvertIfConditionAction extends PsiElementBaseIntentionAction {
if (firstElement != null && lastElement != null) {
ifStatement.getParent().addRangeAfter(firstElement, lastElement, ifStatement);
}
ct.markUnchanged(thenBranch);
} else {
if (!(thenBranch instanceof PsiReturnStatement)) {
ifStatement = addAfterWithinCodeBlock(ifStatement, thenBranch);
}
}
Objects.requireNonNull(ifStatement.getThenBranch()).replace(statement);
ct.replaceAndRestoreComments(Objects.requireNonNull(ifStatement.getThenBranch()), statement);
return ifStatement;
}
PsiElement element = flow.getElement(endOffset);
@@ -221,7 +223,7 @@ public class InvertIfConditionAction extends PsiElementBaseIntentionAction {
if (element instanceof PsiReturnStatement) {
PsiReturnStatement returnStatement = (PsiReturnStatement) element;
ifStatement = addAfterWithinCodeBlock(ifStatement, thenBranch);
Objects.requireNonNull(ifStatement.getThenBranch()).replace(returnStatement.copy());
ct.replaceAndRestoreComments(Objects.requireNonNull(ifStatement.getThenBranch()), returnStatement.copy());
ControlFlow flow2 = buildControlFlow(findCodeBlock(ifStatement));
if (!ControlFlowUtil.isInstructionReachable(flow2, flow2.getStartOffset(returnStatement), 0)) returnStatement.delete();
@@ -244,7 +246,7 @@ public class InvertIfConditionAction extends PsiElementBaseIntentionAction {
}
}
if (nextUnreachable) {
setElseBranch(ifStatement, thenBranch, flow);
setElseBranch(ifStatement, thenBranch, flow, ct);
PsiElement first = ifStatement.getNextSibling();
if (first != null) {
@@ -261,21 +263,24 @@ public class InvertIfConditionAction extends PsiElementBaseIntentionAction {
PsiBlockStatement codeBlock = (PsiBlockStatement) factory.createStatementFromText("{}", ifStatement);
codeBlock.getCodeBlock().addRange(first, last);
first.getParent().deleteChildRange(first, last);
ifStatement.getThenBranch().replace(codeBlock);
ct.replaceAndRestoreComments(ifStatement.getThenBranch(), codeBlock);
}
codeStyle.reformat(ifStatement);
return ifStatement;
}
setElseBranch(ifStatement, thenBranch, flow);
setElseBranch(ifStatement, thenBranch, flow, ct);
PsiStatement statement = factory.createStatementFromText("{}", ifStatement);
statement = (PsiStatement) codeStyle.reformat(statement);
statement = (PsiStatement) Objects.requireNonNull(ifStatement.getThenBranch()).replace(statement);
statement = (PsiStatement)ct.replaceAndRestoreComments(Objects.requireNonNull(ifStatement.getThenBranch()), statement);
codeStyle.reformat(statement);
return ifStatement;
}
private static void setElseBranch(PsiIfStatement ifStatement, PsiStatement thenBranch, ControlFlow flow)
private static void setElseBranch(PsiIfStatement ifStatement,
PsiStatement thenBranch,
ControlFlow flow,
CommentTracker ct)
throws IncorrectOperationException {
if (flow.getEndOffset(ifStatement) == flow.getEndOffset(thenBranch)) {
final PsiLoopStatement loopStmt = PsiTreeUtil.getParentOfType(ifStatement, PsiLoopStatement.class);
@@ -285,7 +290,7 @@ public class InvertIfConditionAction extends PsiElementBaseIntentionAction {
final PsiStatement[] statements = ((PsiBlockStatement)body).getCodeBlock().getStatements();
if (statements.length > 0 && !PsiTreeUtil.isAncestor(statements[statements.length - 1], ifStatement, false) &&
ArrayUtilRt.find(statements, ifStatement) < 0) {
ifStatement.setElseBranch(thenBranch);
ifStatement.setElseBranch(ct.markUnchanged(thenBranch));
return;
}
}
@@ -304,7 +309,7 @@ public class InvertIfConditionAction extends PsiElementBaseIntentionAction {
}
}
}
ifStatement.setElseBranch(thenBranch);
ifStatement.setElseBranch(ct.markUnchanged(thenBranch));
}
private static PsiStatement wrapWithCodeBlock(@NotNull PsiStatement statement) {
java/java-tests/testData/codeInsight/invertIfCondition/afterContinueWithCommentNoBlock.java
+11
View File
@@ -0,0 +1,11 @@
// "Invert 'if' condition" "true"
class A {
void f(){
while (true) {
if (false) //comment
{
System.out.println();
}
}
}
}
java/java-tests/testData/codeInsight/invertIfCondition/beforeContinueWithCommentNoBlock.java
+9
View File
@@ -0,0 +1,9 @@
// "Invert 'if' condition" "true"
class A {
void f(){
while (true) {
i<caret>f (true) continue;//comment
System.out.println();
}
}
}