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

[psi formatting] prettify

Browse Source
This commit is contained in:
yarik
2017-06-20 14:48:38 +03:00
parent 60228a1b81
commit f3b1efc3f2
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/psi/formatter/PsiBasedFormattingModel.java
+9 -15
View File
@@ -85,7 +85,8 @@ public class PsiBasedFormattingModel implements FormattingModelEx {
ASTNode leafElement = findElementAt(offset);
if (leafElement != null) {
PsiElement injectedElement = InjectedLanguageUtil.findInjectedElementNoCommit(myASTNode.getPsi().getContainingFile(), offset);
PsiFile hostFile = myASTNode.getPsi().getContainingFile();
PsiElement injectedElement = InjectedLanguageUtil.findInjectedElementNoCommit(hostFile, offset);
TextRange effectiveRange = injectedElement != null ? rangeInInjectedDocument(textRange, injectedElement) : null;
if (effectiveRange == null) {
@@ -95,24 +96,17 @@ public class PsiBasedFormattingModel implements FormattingModelEx {
if (leafElement.getPsi() instanceof PsiFile) {
return null;
} else {
if (!leafElement.getPsi().isValid()) {
String message = "Invalid element found in '\n" +
myASTNode.getText() +
"\n' at " +
offset +
"(" +
myASTNode.getText().substring(offset, Math.min(offset + 10, myASTNode.getTextLength()));
LOG.error(message);
}
LOG.assertTrue(leafElement.getPsi().isValid());
return replaceWithPsiInLeaf(effectiveRange, whiteSpace, leafElement);
}
} else if (textRange.getEndOffset() == myASTNode.getTextLength()){
}
else if (textRange.getEndOffset() == myASTNode.getTextLength()){
CodeStyleManager.getInstance(myProject).performActionWithFormatterDisabled(
(Runnable)() -> FormatterUtil.replaceLastWhiteSpace(myASTNode, whiteSpace, textRange));
(Runnable)() -> FormatterUtil.replaceLastWhiteSpace(myASTNode, whiteSpace, textRange)
);
return whiteSpace;
} else {
}
else {
return null;
}
}