Skip to content

optimize Twig "extends" tag indexing performance #1374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 14, 2019
Merged

optimize Twig "extends" tag indexing performance #1374

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 23 additions & 21 deletions src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigBlockIndexExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,29 +54,31 @@ public DataIndexer<String, Set<String>, FileContent> getIndexer() {
}
}

for(TwigExtendsTag extendsTag : PsiTreeUtil.getChildrenOfTypeAsList(psiFile, TwigExtendsTag.class)) {
for (String templateName : TwigUtil.getTwigExtendsTagTemplates(extendsTag)) {
blocks.putIfAbsent("extends", new HashSet<>());
blocks.get("extends").add(TwigUtil.normalizeTemplateName(templateName));
}
}

for(TwigCompositeElement twigCompositeElement: PsiTreeUtil.getChildrenOfTypeAsList(psiFile, TwigCompositeElement.class)) {
if(twigCompositeElement.getNode().getElementType() == TwigElementTypes.TAG) {
twigCompositeElement.acceptChildren(new PsiRecursiveElementWalkingVisitor() {
@Override
public void visitElement(PsiElement element) {
if(TwigPattern.getTwigTagUseNamePattern().accepts(element) && PsiElementUtils.getParentOfType(element, TwigElementTypes.EMBED_STATEMENT) == null) {
String templateName = TwigUtil.normalizeTemplateName(PsiElementUtils.trimQuote(element.getText()));
if(StringUtils.isNotBlank(templateName)) {
blocks.putIfAbsent("use", new HashSet<>());
blocks.get("use").add(templateName);
for(PsiElement psiElement : PsiTreeUtil.getChildrenOfAnyType(psiFile, TwigExtendsTag.class, TwigCompositeElement.class)) {
if (psiElement instanceof TwigExtendsTag) {
// {% extends 'foo.html.twig' %}
for (String templateName : TwigUtil.getTwigExtendsTagTemplates((TwigExtendsTag) psiElement)) {
blocks.putIfAbsent("extends", new HashSet<>());
blocks.get("extends").add(TwigUtil.normalizeTemplateName(templateName));
}
} else if(psiElement instanceof TwigCompositeElement) {
// {% use 'foo.html.twig' %}
if(psiElement.getNode().getElementType() == TwigElementTypes.TAG) {
psiElement.acceptChildren(new PsiRecursiveElementWalkingVisitor() {
@Override
public void visitElement(PsiElement element) {
if(TwigPattern.getTwigTagUseNamePattern().accepts(element) && PsiElementUtils.getParentOfType(element, TwigElementTypes.EMBED_STATEMENT) == null) {
String templateName = TwigUtil.normalizeTemplateName(PsiElementUtils.trimQuote(element.getText()));
if(StringUtils.isNotBlank(templateName)) {
blocks.putIfAbsent("use", new HashSet<>());
blocks.get("use").add(templateName);
}
}
}

super.visitElement(element);
}
});
super.visitElement(element);
}
});
}
}
}
}
Expand Down