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

reparse from text after PSI changes in incorrect code (IDEA-188164)

Browse Source
This commit is contained in:
peter
2018-04-23 15:13:13 +02:00
parent 52cb01098a
commit 3387597e00
4 changed files with 40 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/java-tests/testData/codeInsight/generation/surroundWith/java/PsiTextConsistentAfterSurround.java Normal file
View File

@@ -0,0 +1,6 @@
class Foo {
void method(String s) {}
void foo() {
equals(method<selection>"a"</selection>);
}
}

6
java/java-tests/testData/codeInsight/generation/surroundWith/java/PsiTextConsistentAfterSurround_after.java Normal file
View File

@@ -0,0 +1,6 @@
class Foo {
void method(String s) {}
void foo() {
equals(method("a"));
}
}

6
java/java-tests/testSrc/com/intellij/java/codeInsight/generation/surroundWith/JavaSurroundWithTest.java
View File

@@ -35,6 +35,7 @@ import com.intellij.psi.PsiExpression;
import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
import com.intellij.refactoring.introduceVariable.IntroduceVariableBase;
import com.intellij.testFramework.LightCodeInsightTestCase;
import com.intellij.testFramework.PsiTestUtil;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -289,4 +290,9 @@ public class JavaSurroundWithTest extends LightCodeInsightTestCase {
new JavaExpressionSurroundDescriptor().getElementsToSurround(myFile, model.getSelectionStart(), model.getSelectionEnd());
assertEmpty(elements);
}
public void testPsiTextConsistentAfterSurround() {
doTest(new JavaWithParenthesesSurrounder());
PsiTestUtil.checkFileStructure(getFile());
}
}

27
platform/lang-impl/src/com/intellij/psi/impl/source/PostprocessReformattingAspect.java
View File

@@ -51,7 +51,9 @@ import com.intellij.psi.impl.source.codeStyle.CodeEditUtil;
import com.intellij.psi.impl.source.codeStyle.CodeFormatterFacade;
import com.intellij.psi.impl.source.codeStyle.IndentHelperImpl;
import com.intellij.psi.impl.source.tree.*;
import com.intellij.util.Function;
import com.intellij.util.LocalTimeCounter;
import com.intellij.util.containers.JBIterable;
import com.intellij.util.text.CharArrayUtil;
import com.intellij.util.text.TextRangeUtil;
import org.jetbrains.annotations.NonNls;
@@ -181,7 +183,7 @@ public class PostprocessReformattingAspect implements PomModelAspect {
for (final ASTNode node : changeSet.getChangedElements()) {
final TreeChange treeChange = changeSet.getChangesByElement(node);
for (final ASTNode affectedChild : treeChange.getAffectedChildren()) {
checkForOuters(containingFile, (TreeElement)affectedChild);
scheduleReparseIfNeeded(containingFile, affectedChild);
final ChangeInfo childChange = treeChange.getChangeByChild(affectedChild);
switch (childChange.getChangeType()) {
@@ -208,11 +210,27 @@ public class PostprocessReformattingAspect implements PomModelAspect {
}
}
private void checkForOuters(PsiFile containingFile, TreeElement affectedChild) {
if (TreeUtil.containsOuterLanguageElements(affectedChild)) {
private void scheduleReparseIfNeeded(PsiFile containingFile, ASTNode affectedChild) {
if (changeMightBreakPsiTextConsistency(affectedChild)) {
containingFile.putUserData(REPARSE_PENDING, true);
}
}
private boolean changeMightBreakPsiTextConsistency(ASTNode node) {
return TreeUtil.containsOuterLanguageElements(node) || isRightAfterErrorElement(node);
}
private boolean isRightAfterErrorElement(ASTNode _node) {
Function<ASTNode, ASTNode> prevNode = node -> {
ASTNode prev = node.getTreePrev();
return prev != null ? TreeUtil.getLastChild(prev) : node.getTreeParent();
};
return JBIterable.generate(_node, prevNode)
.skip(1)
.takeWhile(e -> e instanceof PsiWhiteSpace || e.getTextLength() == 0)
.filter(PsiErrorElement.class)
.isNotEmpty();
}
});
}
@@ -334,8 +352,6 @@ public class PostprocessReformattingAspect implements PomModelAspect {
}
}
reparseByTextIfNeeded(key, document);
Collection<Disposable> toDispose = Collections.emptyList();
try {
// process all roots in viewProvider to find marked for reformat before elements and create appropriate range markers
@@ -362,6 +378,7 @@ public class PostprocessReformattingAspect implements PomModelAspect {
CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(myPsiManager.getProject());
codeStyleManager.runWithDocCommentFormattingDisabled(
viewProvider.getPsi(viewProvider.getBaseLanguage()), () -> normalizedAction.execute(viewProvider));
reparseByTextIfNeeded(key, document);
}
}
}