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

[java-intentions] IDEA-312732 Invert 'if' doesn't work if branches have 'yield'

Browse Source 
GitOrigin-RevId: 500a77bff4f250dbcd4779293e678d262227014f
This commit is contained in:
Mikhail Pyltsin
2023-02-23 14:33:18 +01:00
committed by intellij-monorepo-bot
parent ca3fa43d58
commit 06dfb15bc0
3 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -419,7 +419,10 @@ public class InvertIfConditionAction extends PsiElementBaseIntentionAction {
endOffset = controlFlow.getSize();
}
while (endOffset < instructions.size() && instructions.get(endOffset) instanceof GoToInstruction &&
!((GoToInstruction) instructions.get(endOffset)).isReturn && !(controlFlow.getElement(endOffset) instanceof PsiBreakStatement) && !(controlFlow.getElement(endOffset) instanceof PsiContinueStatement)) {
!((GoToInstruction) instructions.get(endOffset)).isReturn &&
!(controlFlow.getElement(endOffset) instanceof PsiYieldStatement) &&
!(controlFlow.getElement(endOffset) instanceof PsiBreakStatement) &&
!(controlFlow.getElement(endOffset) instanceof PsiContinueStatement)) {
endOffset = ((BranchingInstruction)instructions.get(endOffset)).offset;
}

15
java/java-tests/testData/codeInsight/invertIfCondition/afterYield.java Normal file
View File

@@ -0,0 +1,15 @@
// "Invert 'if' condition" "true-preview"
class A {
int test(int x, int y) {
return switch (y) {
default -> {
if (x <= 10) {
yield 21;
}
else {
yield 11;
}
}
};
}
}

13
java/java-tests/testData/codeInsight/invertIfCondition/beforeYield.java Normal file
View File

@@ -0,0 +1,13 @@
// "Invert 'if' condition" "true-preview"
class A {
int test(int x, int y) {
return switch (y) {
default -> {
if (<caret>x > 10) {
yield 11;
}
yield 21;
}
};
}
}