remove paid / deprecated extensions from public repository

Haehnchen · Haehnchen · commit 8975aabeb5a7 · 2022-06-04T10:44:49.000+02:00
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
@@ -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<Triple<String, PhpNamedElement, FunctionReference>> consumer;
-        private Set<String> methods;
 
         TemplateRenderPsiRecursiveElementWalkingVisitor(PsiElement context, Consumer<Triple<String, PhpNamedElement, FunctionReference>> 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
@@ -99,10 +99,6 @@ public enum NamespaceType {
         "fr.adrienbrault.idea.symfony2plugin.extension.TwigNamespaceExtension"
     );
 
-    public static final ExtensionPointName<TwigFileUsage> TWIG_FILE_USAGE_EXTENSIONS = new ExtensionPointName<>(
-        "fr.adrienbrault.idea.symfony2plugin.extension.TwigFileUsage"
-    );
-
     private static final Key<CachedValue<Map<String, Set<VirtualFile>>>> TEMPLATE_CACHE_TWIG = new Key<>("TEMPLATE_CACHE_TWIG");
 
     private static final Key<CachedValue<Map<String, Set<VirtualFile>>>> 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/translation/dict/TranslationUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/dict/TranslationUtil.java
@@ -1,7 +1,6 @@
 package fr.adrienbrault.idea.symfony2plugin.translation.dict;
 
 import com.intellij.codeInsight.lookup.LookupElement;
-import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -51,14 +50,12 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
 public class TranslationUtil {
-    private static final ExtensionPointName<TranslatorProvider> TRANSLATION_PROVIDER = new ExtensionPointName<>("fr.adrienbrault.idea.symfony2plugin.extension.TranslatorProvider");
-    public static final TranslatorProvider[] INTERNAL_TRANSLATOR_PROVIDERS = new TranslatorProvider[]{
+    private static final TranslatorProvider[] INTERNAL_TRANSLATOR_PROVIDERS = new TranslatorProvider[]{
         new CompiledContainerTranslatorProvider(),
         new CompiledTranslatorProvider(),
         new IndexTranslatorProvider(),
@@ -399,10 +396,7 @@ public static Set<String> getPlaceholderFromTranslation(@NotNull String text) {
 
     @NotNull
     private static TranslatorProvider[] getTranslationProviders() {
-        return Stream.concat(
-            Arrays.stream(INTERNAL_TRANSLATOR_PROVIDERS),
-            Arrays.stream(TRANSLATION_PROVIDER.getExtensions())
-        ).toArray(TranslatorProvider[]::new);
+        return INTERNAL_TRANSLATOR_PROVIDERS;
     }
 
     /**
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
@@ -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
@@ -1,11 +1,6 @@
 <!-- All feature that are only available via valid plugin license (paid) -->
 <idea-plugin url="https://www.jetbrains.com/idea">
 
-    <extensionPoints>
-        <extensionPoint dynamic="true" name="extension.PluginConfigurationExtension" interface="fr.adrienbrault.idea.symfony2plugin.extension.PluginConfigurationExtension"/>
-        <extensionPoint dynamic="true" name="extension.TwigFileUsage" interface="fr.adrienbrault.idea.symfony2plugin.extension.TwigFileUsage"/>
-        <extensionPoint dynamic="true" name="extension.TranslatorProvider" interface="fr.adrienbrault.idea.symfony2plugin.extension.TranslatorProvider"/>
 
-    </extensionPoints>
 
 </idea-plugin>

Original file line number	Diff line number	Diff line change
`@@ -99,10 +99,6 @@ public enum NamespaceType {`
`99`	`99`	`"fr.adrienbrault.idea.symfony2plugin.extension.TwigNamespaceExtension"`
`100`	`100`	`);`
`101`	`101`
`102`		`- public static final ExtensionPointName<TwigFileUsage> TWIG_FILE_USAGE_EXTENSIONS = new ExtensionPointName<>(`
`103`		`- "fr.adrienbrault.idea.symfony2plugin.extension.TwigFileUsage"`
`104`		`- );`
`105`		`-`
`106`	`102`	`private static final Key<CachedValue<Map<String, Set<VirtualFile>>>> TEMPLATE_CACHE_TWIG = new Key<>("TEMPLATE_CACHE_TWIG");`
`107`	`103`
`108`	`104`	`private static final Key<CachedValue<Map<String, Set<VirtualFile>>>> TEMPLATE_CACHE_ALL = new Key<>("TEMPLATE_CACHE_ALL");`
`@@ -2373,14 +2369,6 @@ public static void visitTemplateIncludes(@NotNull PsiElement psiElement, @NotNul`
`2373`	`2369`	`}`
`2374`	`2370`	`}`
`2375`	`2371`	`}`
`2376`		`-`
`2377`		`- for (TwigFileUsage extension : TWIG_FILE_USAGE_EXTENSIONS.getExtensions()) {`
`2378`		`- if (extension.isIncludeTemplate(psiElement)) {`
`2379`		`- for (String template : extension.getIncludeTemplate(psiElement)) {`
`2380`		`- consumer.consume(new TemplateInclude(psiElement, template, TemplateInclude.TYPE.INCLUDE));`
`2381`		`- }`
`2382`		`- }`
`2383`		`- }`
`2384`	`2372`	`}`
`2385`	`2373`	`}`
`2386`	`2374`
`@@ -2833,16 +2821,6 @@ public void visitElement(PsiElement element) {`
`2833`	`2821`	`}`
`2834`	`2822`	`}`
`2835`	`2823`
`2836`		`- for (TwigFileUsage extension : TWIG_FILE_USAGE_EXTENSIONS.getExtensions()) {`
`2837`		`- if (!extension.isExtendsTemplate(element)) {`
`2838`		`- continue;`
`2839`		`- }`
`2840`		`-`
`2841`		`- for (String template : extension.getExtendsTemplate(element)) {`
`2842`		`- consumer.consume(Pair.create(TwigUtil.normalizeTemplateName(template), element));`
`2843`		`- }`
`2844`		`- }`
`2845`		`-`
`2846`	`2824`	`super.visitElement(element);`
`2847`	`2825`	`}`
`2848`	`2826`	`});`
Original file line number	Diff line number	Diff line change
`@@ -56,12 +56,6 @@ private boolean hasFileExtendsTag(@NotNull PsiElement element) {`
`56`	`56`	`if (child instanceof TwigExtendsTag) {`
`57`	`57`	`return true;`
`58`	`58`	`}`
`59`		`-`
`60`		`- for (TwigFileUsage extension : TwigUtil.TWIG_FILE_USAGE_EXTENSIONS.getExtensions()) {`
`61`		`- if (extension.isExtendsTemplate(child)) {`
`62`		`- return true;`
`63`		`- }`
`64`		`- }`
`65`	`59`	`}`
`66`	`60`
`67`	`61`	`return false;`