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 viewer: handle stubs for empty psi elements

Browse Source
This commit is contained in:
anstarovoyt
2017-08-06 15:58:14 +03:00
parent 544c6a196a
commit 29d6df5397
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/internal/psiView/stubtree/StubViewerPsiBasedTree.java
+20 -4
View File
@@ -234,10 +234,26 @@ public class StubViewerPsiBasedTree implements ViewerPsiBasedTree {
ASTNode treeNode = myFile.findTreeForStub(stubTree, stubElement);
if (treeNode == null) return;
PsiElement result = CodeInsightUtilCore
.findElementInRange(myFile, treeNode.getStartOffset(),
treeNode.getStartOffset() + treeNode.getTextLength(), PsiElement.class,
myFile.getLanguage());
PsiElement result = null;
if (treeNode.getTextLength() > 0) {
result = CodeInsightUtilCore
.findElementInRange(myFile, treeNode.getStartOffset(),
treeNode.getStartOffset() + treeNode.getTextLength(), PsiElement.class,
myFile.getLanguage());
}
else {
PsiElement elementAt = myFile.findElementAt(treeNode.getStartOffset());
if (elementAt != null && elementAt.getTextLength() > 0) {
PsiElement parent = elementAt.getParent();
PsiElement child = parent != null ? parent.getFirstChild() : null;
if (child != null && child.getTextRange().getStartOffset() == treeNode.getStartOffset()) {
elementAt = child;
}
}
if (elementAt != null && elementAt.getTextLength() == 0) {
result = elementAt;
}
}
if (result != null) {
myUpdater.updatePsiTree(result, myStubTree.hasFocus() ? result.getTextRange() : null);