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

Java: Minor refactoring in the intention "Invert 'if' condition" - code reuse, nullability (IDEA-167957)

Browse Source
This commit is contained in:
Pavel Dolgov
2017-02-21 15:15:44 +03:00
parent 627786ab11
commit 1fd676d6ba
1 changed files with 17 additions and 20 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 -20
View File
@@ -241,11 +241,7 @@ public class InvertIfConditionAction extends PsiElementBaseIntentionAction {
PsiElement parent = ifStatement.getParent();
if (parent != null) {
if (!(parent instanceof PsiCodeBlock)) {
PsiCodeBlock codeBlock = factory.createCodeBlockFromText("{}", ifStatement);
codeBlock = (PsiCodeBlock)codeStyle.reformat(codeBlock);
codeBlock.add(ifStatement);
codeBlock = (PsiCodeBlock)ifStatement.replace(codeBlock);
ifStatement = (PsiIfStatement)codeBlock.getStatements()[0];
ifStatement = (PsiIfStatement)wrapWithCodeBlock(ifStatement);
parent = ifStatement.getParent();
thenBranch = ifStatement.getThenBranch();
}
@@ -320,24 +316,25 @@ public class InvertIfConditionAction extends PsiElementBaseIntentionAction {
ifStatement.setElseBranch(thenBranch);
}
private static PsiIfStatement addAfterWithinCodeBlock(PsiIfStatement ifStatement, PsiStatement branch) {
private static PsiStatement wrapWithCodeBlock(@NotNull PsiStatement statement) {
final Project project = statement.getProject();
final PsiElementFactory factory = JavaPsiFacade.getInstance(project).getElementFactory();
final CodeStyleManager codeStyle = CodeStyleManager.getInstance(project);
PsiCodeBlock codeBlock = factory.createCodeBlockFromText("{}", statement);
codeBlock = (PsiCodeBlock)codeStyle.reformat(codeBlock);
codeBlock.add(statement);
codeBlock = (PsiCodeBlock)statement.replace(codeBlock);
return codeBlock.getStatements()[0];
}
private static PsiIfStatement addAfterWithinCodeBlock(@NotNull PsiIfStatement ifStatement, @NotNull PsiStatement branch) {
final PsiElement parent = ifStatement.getParent();
if (parent != null && !(parent instanceof PsiCodeBlock)) {
final Project project = ifStatement.getProject();
final PsiElementFactory factory = JavaPsiFacade.getInstance(project).getElementFactory();
final CodeStyleManager codeStyle = CodeStyleManager.getInstance(project);
PsiCodeBlock codeBlock = factory.createCodeBlockFromText("{}", ifStatement);
codeBlock = (PsiCodeBlock)codeStyle.reformat(codeBlock);
final PsiIfStatement wrappedIfStatement = (PsiIfStatement)codeBlock.add(ifStatement);
addAfter(wrappedIfStatement, branch);
codeBlock = (PsiCodeBlock)ifStatement.replace(codeBlock);
return (PsiIfStatement)codeBlock.getStatements()[0];
}
else {
addAfter(ifStatement, branch);
return ifStatement;
branch = (PsiStatement)branch.copy();
ifStatement = (PsiIfStatement)wrapWithCodeBlock(ifStatement);
}
addAfter(ifStatement, branch);
return ifStatement;
}
static void addAfter(PsiIfStatement ifStatement, PsiStatement branch) throws IncorrectOperationException {