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

invert if: pass context to resolve to correct inner/local class (IDEA-169396)

Browse Source
This commit is contained in:
Anna.Kozlova
2017-03-15 19:08:13 +01:00
parent 1ff37a0c30
commit 02d25ac5f6
3 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,7 +102,7 @@ public class InvertIfConditionAction extends PsiElementBaseIntentionAction {
final CodeStyleManager codeStyle = CodeStyleManager.getInstance(project);
PsiBlockStatement codeBlock = (PsiBlockStatement)factory.createStatementFromText("{}", null);
PsiBlockStatement codeBlock = (PsiBlockStatement)factory.createStatementFromText("{}", ifStatement);
codeBlock = (PsiBlockStatement)codeStyle.reformat(codeBlock);
ifStatement.getThenBranch().replace(codeBlock);
@@ -182,7 +182,7 @@ public class InvertIfConditionAction extends PsiElementBaseIntentionAction {
final CodeStyleManager codeStyle = CodeStyleManager.getInstance(project);
if (flow.getSize() == 0) {
ifStatement.setElseBranch(thenBranch);
PsiStatement statement = factory.createStatementFromText("{}", null);
PsiStatement statement = factory.createStatementFromText("{}", ifStatement);
statement = (PsiStatement) codeStyle.reformat(statement);
statement = (PsiStatement) ifStatement.getThenBranch().replace(statement);
codeStyle.reformat(statement);
@@ -194,7 +194,7 @@ public class InvertIfConditionAction extends PsiElementBaseIntentionAction {
LOG.assertTrue(endOffset >= 0);
if (endOffset >= flow.getSize()) {
PsiStatement statement = factory.createStatementFromText("return;", null);
PsiStatement statement = factory.createStatementFromText("return;", ifStatement);
statement = (PsiStatement) codeStyle.reformat(statement);
if (thenBranch instanceof PsiBlockStatement) {
PsiStatement[] statements = ((PsiBlockStatement) thenBranch).getCodeBlock().getStatements();
@@ -219,7 +219,7 @@ public class InvertIfConditionAction extends PsiElementBaseIntentionAction {
if (element != null && element.getParent() instanceof PsiForStatement && ((PsiForStatement)element.getParent()).getUpdate() == element ||
element instanceof PsiWhileStatement && flow.getStartOffset(element) == endOffset ||
element instanceof PsiForeachStatement && flow.getStartOffset(element) + 1 == endOffset) {
PsiStatement statement = factory.createStatementFromText("continue;", null);
PsiStatement statement = factory.createStatementFromText("continue;", ifStatement);
statement = (PsiStatement)codeStyle.reformat(statement);
ifStatement = addAfterWithinCodeBlock(ifStatement, thenBranch);
ifStatement.getThenBranch().replace(statement);
@@ -267,7 +267,7 @@ public class InvertIfConditionAction extends PsiElementBaseIntentionAction {
last = last.getPrevSibling();
PsiBlockStatement codeBlock = (PsiBlockStatement) factory.createStatementFromText("{}", null);
PsiBlockStatement codeBlock = (PsiBlockStatement) factory.createStatementFromText("{}", ifStatement);
codeBlock.getCodeBlock().addRange(first, last);
first.getParent().deleteChildRange(first, last);
ifStatement.getThenBranch().replace(codeBlock);
@@ -277,7 +277,7 @@ public class InvertIfConditionAction extends PsiElementBaseIntentionAction {
}
setElseBranch(ifStatement, thenBranch, flow);
PsiStatement statement = factory.createStatementFromText("{}", null);
PsiStatement statement = factory.createStatementFromText("{}", ifStatement);
statement = (PsiStatement) codeStyle.reformat(statement);
statement = (PsiStatement) ifStatement.getThenBranch().replace(statement);
codeStyle.reformat(statement);

16
java/java-tests/testData/codeInsight/invertIfCondition/afterConflictWithJavaLangClass.java Normal file
View File

@@ -0,0 +1,16 @@
// "Invert 'if' condition" "true"
class Main2 {
private static class Process { }
public static void main(String[] args) {
List<Process> processList = null;
if (processList != null) {
for (Process process : processList) {
System.out.println("process = " + process);
}
}
else {
return;
}
}
}

14
java/java-tests/testData/codeInsight/invertIfCondition/beforeConflictWithJavaLangClass.java Normal file
View File

@@ -0,0 +1,14 @@
// "Invert 'if' condition" "true"
class Main2 {
private static class Process { }
public static void main(String[] args) {
List<Process> processList = null;
i<caret>f (processList == null) {
return;
}
for (Process process : processList) {
System.out.println("process = " + process);
}
}
}