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

less psi allocation during stub indexing

Browse Source
This commit is contained in:
peter
2016-05-28 11:44:39 +02:00
parent 1ec4e0ca26
commit 857c80cd17
2 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/psi/stubs/DefaultStubBuilder.java
+13 -16
View File
@@ -45,32 +45,28 @@ public class DefaultStubBuilder implements StubBuilder {
@NotNull
private StubElement buildStubTreeFor(@NotNull PsiElement root, @NotNull StubElement parentStub) {
Stack<StubElement> parentStubs = new Stack<StubElement>();
Stack<PsiElement> parentElements = new Stack<PsiElement>();
parentElements.push(root);
Stack<ASTNode> parentElements = new Stack<ASTNode>();
parentElements.push(root.getNode());
parentStubs.push(parentStub);
while (!parentElements.isEmpty()) {
StubElement stub = parentStubs.pop();
PsiElement elt = parentElements.pop();
ASTNode node = parentElements.pop();
if (elt instanceof StubBasedPsiElement) {
final IStubElementType type = ((StubBasedPsiElement)elt).getElementType();
if (type.shouldCreateStub(elt.getNode())) {
@SuppressWarnings("unchecked") StubElement s = type.createStub(elt, stub);
stub = s;
IElementType type = node.getElementType();
if (type instanceof IStubElementType && ((IStubElementType)type).shouldCreateStub(node)) {
PsiElement elt = node.getPsi();
if (elt instanceof StubBasedPsiElement) {
//noinspection unchecked
stub = ((IStubElementType)type).createStub(elt, stub);
}
}
else {
final ASTNode node = elt.getNode();
final IElementType type = node == null? null : node.getElementType();
if (type instanceof IStubElementType && ((IStubElementType)type).shouldCreateStub(node)) {
else {
LOG.error("Non-StubBasedPsiElement requests stub creation. Stub type: " + type + ", PSI: " + elt);
}
}
for (PsiElement child = elt.getLastChild(); child != null; child = child.getPrevSibling()) {
if (!skipChildProcessingWhenBuildingStubs(elt, child)) {
for (ASTNode child = node.getLastChildNode(); child != null; child = child.getTreePrev()) {
if (!skipChildProcessingWhenBuildingStubs(node, child)) {
parentStubs.push(stub);
parentElements.push(child);
}
@@ -80,6 +76,7 @@ public class DefaultStubBuilder implements StubBuilder {
}
/**
* @deprecated override and invoke {@link #skipChildProcessingWhenBuildingStubs(ASTNode, ASTNode)}
* Note to implementers: always keep in sync with {@linkplain #skipChildProcessingWhenBuildingStubs(ASTNode, ASTNode)}.
*/
protected boolean skipChildProcessingWhenBuildingStubs(@NotNull PsiElement parent, @NotNull PsiElement element) {
python/src/com/jetbrains/python/psi/impl/stubs/PyFileStubBuilder.java
-5
View File
@@ -39,11 +39,6 @@ public class PyFileStubBuilder extends DefaultStubBuilder {
return super.createStubForFile(file);
}
@Override
protected boolean skipChildProcessingWhenBuildingStubs(@NotNull PsiElement parent, @NotNull PsiElement element) {
return parent instanceof PyIfStatement && PyUtil.isIfNameEqualsMain((PyIfStatement)parent);
}
@Override
public boolean skipChildProcessingWhenBuildingStubs(@NotNull ASTNode parent, @NotNull ASTNode node) {
PsiElement psi = parent.getPsi();