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

CodeEditUtil.addChildren: avoid returning invalid AST

Browse Source
This commit is contained in:
peter
2017-11-24 16:48:30 +01:00
parent 2dd6a4a053
commit 4d005013e6
3 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/unwrapIfStatement/afterEmptyElseBlock.java Normal file
View File

@@ -0,0 +1,15 @@
// "Remove 'if' statement extracting side effects" "true"
import org.jetbrains.annotations.NotNull;
class X {
public String getRole(Object parent) {
if (parent instanceof Foo) {
((Foo) parent).getBar();
}
return null;
}
}
interface Foo {
@NotNull
Integer getBar();
}

17
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/unwrapIfStatement/beforeEmptyElseBlock.java Normal file
View File

@@ -0,0 +1,17 @@
// "Remove 'if' statement extracting side effects" "true"
import org.jetbrains.annotations.NotNull;
class X {
public String getRole(Object parent) {
if (parent instan<caret>ceof Foo && ((Foo)parent).getBar() == null) {
return "a";
}
else {
}
return null;
}
}
interface Foo {
@NotNull
Integer getBar();
}

2
platform/core-impl/src/com/intellij/psi/impl/source/codeStyle/CodeEditUtil.java
View File

@@ -70,7 +70,7 @@ public class CodeEditUtil {
ASTNode result = first;
if (firstAddedLeaf != null) {
ASTNode placeHolderEnd = makePlaceHolderBetweenTokens(prevLeaf, firstAddedLeaf, isFormattingRequired(prevLeaf, first), false);
if (placeHolderEnd != prevLeaf && first == firstAddedLeaf) {
if (placeHolderEnd != prevLeaf && first == firstAddedLeaf || result.getTreeParent() != parent) {
result = placeHolderEnd;
}
ASTNode lastAddedLeaf = findLastLeaf(first, last);