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

defer assignment: choose anchor from same code block

Browse Source 
EA-48621 - assert: CompositeElement.addChild
This commit is contained in:
Anna.Kozlova
2016-10-12 12:58:45 +02:00
parent 2fe5c4f51c
commit 5af6b0be16
3 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeferFinalAssignmentFix.java
View File

@@ -154,7 +154,10 @@ public class DeferFinalAssignmentFix implements IntentionAction {
PsiElement element = null; //controlFlow.getEndOffset(codeBlock) == offset ? getEnclosingStatement(controlFlow.getElement(offset)) : null;
while (offset < controlFlow.getSize()) {
element = controlFlow.getElement(offset);
if (element != null) element = PsiUtil.getEnclosingStatement(element);
while (element != null) {
if (element.getParent() == codeBlock) break;
element = element.getParent();
}
int startOffset = controlFlow.getStartOffset(element);
if (startOffset != -1 && startOffset >= minOffset && element instanceof PsiStatement) break;
offset++;

11
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deferFinalAssignment/afterNestedCodeBlocks.java Normal file
View File

@@ -0,0 +1,11 @@
// "Defer assignment to 'i' using temp variable" "true"
class a {
{
final int i;
int i1;
if (true) i1 = 0;
if (true) i1 = 0;
i = i1;
{if (false);}
}
}

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deferFinalAssignment/beforeNestedCodeBlocks.java Normal file
View File

@@ -0,0 +1,9 @@
// "Defer assignment to 'i' using temp variable" "true"
class a {
{
final int i;
if (true) i = 0;
if (true) <caret>i = 0;
{if (false);}
}
}