diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/PhpMethodVariableResolveUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/PhpMethodVariableResolveUtil.java index d65f58212..b6356651d 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/PhpMethodVariableResolveUtil.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/PhpMethodVariableResolveUtil.java @@ -262,12 +262,10 @@ public static void visitRenderTemplateFunctions(@NotNull PsiElement context, @No private static class TemplateRenderPsiRecursiveElementWalkingVisitor extends PsiRecursiveElementWalkingVisitor { private final PsiElement context; private final Consumer> consumer; - private Set methods; TemplateRenderPsiRecursiveElementWalkingVisitor(PsiElement context, Consumer> consumer) { this.context = context; this.consumer = consumer; - methods = null; } @Override @@ -312,22 +310,7 @@ private void visitMethodReference(@NotNull MethodReference methodReference) { return; } - // init methods once per file - if(methods == null) { - methods = new HashSet<>(); - - PluginConfigurationExtension[] extensions = Symfony2ProjectComponent.PLUGIN_CONFIGURATION_EXTENSION.getExtensions(); - if(extensions.length > 0) { - PluginConfigurationExtensionParameter pluginConfiguration = new PluginConfigurationExtensionParameter(context.getProject()); - for (PluginConfigurationExtension extension : extensions) { - extension.invokePluginConfiguration(pluginConfiguration); - } - - methods.addAll(pluginConfiguration.getTemplateUsageMethod()); - } - } - - if(!methods.contains(methodName) && !methodName.toLowerCase().contains("render")) { + if (!methodName.toLowerCase().contains("render")) { return; } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigUtil.java index d561940f1..7455d911a 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigUtil.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigUtil.java @@ -99,10 +99,6 @@ public enum NamespaceType { "fr.adrienbrault.idea.symfony2plugin.extension.TwigNamespaceExtension" ); - public static final ExtensionPointName TWIG_FILE_USAGE_EXTENSIONS = new ExtensionPointName<>( - "fr.adrienbrault.idea.symfony2plugin.extension.TwigFileUsage" - ); - private static final Key>>> TEMPLATE_CACHE_TWIG = new Key<>("TEMPLATE_CACHE_TWIG"); private static final Key>>> TEMPLATE_CACHE_ALL = new Key<>("TEMPLATE_CACHE_ALL"); @@ -2373,14 +2369,6 @@ public static void visitTemplateIncludes(@NotNull PsiElement psiElement, @NotNul } } } - - for (TwigFileUsage extension : TWIG_FILE_USAGE_EXTENSIONS.getExtensions()) { - if (extension.isIncludeTemplate(psiElement)) { - for (String template : extension.getIncludeTemplate(psiElement)) { - consumer.consume(new TemplateInclude(psiElement, template, TemplateInclude.TYPE.INCLUDE)); - } - } - } } } @@ -2833,16 +2821,6 @@ public void visitElement(PsiElement element) { } } - for (TwigFileUsage extension : TWIG_FILE_USAGE_EXTENSIONS.getExtensions()) { - if (!extension.isExtendsTemplate(element)) { - continue; - } - - for (String template : extension.getExtendsTemplate(element)) { - consumer.consume(Pair.create(TwigUtil.normalizeTemplateName(template), element)); - } - } - super.visitElement(element); } }); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/icon/TwigIconProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/icon/TwigIconProvider.java index 0dc8e595a..5f25952cf 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/icon/TwigIconProvider.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/icon/TwigIconProvider.java @@ -56,12 +56,6 @@ private boolean hasFileExtendsTag(@NotNull PsiElement element) { if (child instanceof TwigExtendsTag) { return true; } - - for (TwigFileUsage extension : TwigUtil.TWIG_FILE_USAGE_EXTENSIONS.getExtensions()) { - if (extension.isExtendsTemplate(child)) { - return true; - } - } } return false; diff --git a/src/main/resources/META-INF/pay.xml b/src/main/resources/META-INF/pay.xml index 87e481de6..ea1c4886c 100644 --- a/src/main/resources/META-INF/pay.xml +++ b/src/main/resources/META-INF/pay.xml @@ -1,11 +1,6 @@ - - - - -