Replace getClassInterface with hasClassOrInterface for improved caching and performance of class and interface lookups.

Haehnchen · Haehnchen · commit cf0e1c6a409d · 2025-12-17T18:38:34.000+01:00
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/NewFileActionUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/NewFileActionUtil.java
@@ -66,7 +66,7 @@ public static boolean isInGivenDirectoryScope(@NotNull AnActionEvent event, @Not
 
     public static String guessCommandTemplateType(@NotNull Project project, @NotNull String namespace) {
         // Check if InvokableCommand is available (Symfony 7.3+)
-        if (PhpElementsUtil.getClassInterface(project, "\\Symfony\\Component\\Console\\Command\\InvokableCommand") != null) {
+        if (PhpElementsUtil.hasClassOrInterface(project, "\\Symfony\\Component\\Console\\Command\\InvokableCommand")) {
             String normalizedNamespace = "\\" + org.apache.commons.lang3.StringUtils.strip(namespace, "\\") + "\\";
             Collection<PhpClass> commandClasses = PhpIndexUtil.getPhpClassInsideNamespace(project, normalizedNamespace);
 
@@ -90,7 +90,7 @@ public static String guessCommandTemplateType(@NotNull Project project, @NotNull
             }
         }
 
-        if (PhpElementsUtil.getClassInterface(project, "\\Symfony\\Component\\Console\\Attribute\\AsCommand") != null) {
+        if (PhpElementsUtil.hasClassOrInterface(project, "\\Symfony\\Component\\Console\\Attribute\\AsCommand")) {
             return "command_attributes";
         }
 
@@ -106,7 +106,7 @@ public static String guessCommandTemplateType(@NotNull Project project, @NotNull
     }
 
     public static String guessControllerTemplateType(@NotNull Project project) {
-        if (PhpElementsUtil.getClassInterface(project, "\\Symfony\\Component\\Routing\\Attribute\\Route") != null) {
+        if (PhpElementsUtil.hasClassOrInterface(project, "\\Symfony\\Component\\Routing\\Attribute\\Route")) {
             return "controller_attributes";
         }
 
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/NewTwigExtensionAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/NewTwigExtensionAction.java
@@ -89,7 +89,7 @@ public void actionPerformed(@NotNull AnActionEvent event) {
     @NotNull
     private static String detectTemplate(@NotNull Project project) {
         // If attributes are available, use the new attribute-based template
-        if (PhpElementsUtil.getClassInterface(project, "\\Twig\\Attribute\\AsTwigFunction") != null) {
+        if (PhpElementsUtil.hasClassOrInterface(project, "\\Twig\\Attribute\\AsTwigFunction")) {
             return "twig_extension_function_attribute";
         }
 
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/PhpAttributeCompletionContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/PhpAttributeCompletionContributor.java
@@ -95,7 +95,7 @@ private Collection<LookupElement> getControllerCompletions(@NotNull Project proj
             Collection<LookupElement> lookupElements = new ArrayList<>();
 
             // Add Route attribute completion
-            if (PhpElementsUtil.getClassInterface(project, ROUTE_ATTRIBUTE_FQN) != null) {
+            if (PhpElementsUtil.hasClassOrInterface(project, ROUTE_ATTRIBUTE_FQN)) {
                 LookupElement routeLookupElement = LookupElementBuilder
                     .create("#[Route]")
                     .withIcon(Symfony2Icons.SYMFONY_ATTRIBUTE)
@@ -107,7 +107,7 @@ private Collection<LookupElement> getControllerCompletions(@NotNull Project proj
             }
 
             // Add IsGranted attribute completion
-            if (PhpElementsUtil.getClassInterface(project, IS_GRANTED_ATTRIBUTE_FQN) != null) {
+            if (PhpElementsUtil.hasClassOrInterface(project, IS_GRANTED_ATTRIBUTE_FQN)) {
                 LookupElement isGrantedLookupElement = LookupElementBuilder
                     .create("#[IsGranted]")
                     .withIcon(Symfony2Icons.SYMFONY_ATTRIBUTE)
@@ -119,7 +119,7 @@ private Collection<LookupElement> getControllerCompletions(@NotNull Project proj
             }
 
             // Add Cache attribute completion
-            if (PhpElementsUtil.getClassInterface(project, CACHE_ATTRIBUTE_FQN) != null) {
+            if (PhpElementsUtil.hasClassOrInterface(project, CACHE_ATTRIBUTE_FQN)) {
                 LookupElement cacheLookupElement = LookupElementBuilder
                     .create("#[Cache]")
                     .withIcon(Symfony2Icons.SYMFONY_ATTRIBUTE)
@@ -137,7 +137,7 @@ private Collection<LookupElement> getTwigExtensionCompletions(@NotNull Project p
             Collection<LookupElement> lookupElements = new ArrayList<>();
 
             // Add AsTwigFilter attribute completion
-            if (PhpElementsUtil.getClassInterface(project, AS_TWIG_FILTER_ATTRIBUTE_FQN) != null) {
+            if (PhpElementsUtil.hasClassOrInterface(project, AS_TWIG_FILTER_ATTRIBUTE_FQN)) {
                 LookupElement lookupElement = LookupElementBuilder
                     .create("#[AsTwigFilter]")
                     .withIcon(Symfony2Icons.SYMFONY_ATTRIBUTE)
@@ -149,7 +149,7 @@ private Collection<LookupElement> getTwigExtensionCompletions(@NotNull Project p
             }
 
             // Add AsTwigFunction attribute completion
-            if (PhpElementsUtil.getClassInterface(project, AS_TWIG_FUNCTION_ATTRIBUTE_FQN) != null) {
+            if (PhpElementsUtil.hasClassOrInterface(project, AS_TWIG_FUNCTION_ATTRIBUTE_FQN)) {
                 LookupElement lookupElement = LookupElementBuilder
                     .create("#[AsTwigFunction]")
                     .withIcon(Symfony2Icons.SYMFONY_ATTRIBUTE)
@@ -161,7 +161,7 @@ private Collection<LookupElement> getTwigExtensionCompletions(@NotNull Project p
             }
 
             // Add AsTwigTest attribute completion
-            if (PhpElementsUtil.getClassInterface(project, AS_TWIG_TEST_ATTRIBUTE_FQN) != null) {
+            if (PhpElementsUtil.hasClassOrInterface(project, AS_TWIG_TEST_ATTRIBUTE_FQN)) {
                 LookupElement lookupElement = LookupElementBuilder
                     .create("#[AsTwigTest]")
                     .withIcon(Symfony2Icons.SYMFONY_ATTRIBUTE)
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/ServicePropertyInsertUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/ServicePropertyInsertUtil.java
@@ -62,7 +62,7 @@ public static List<String> getInjectionService(@NotNull Project project, @NotNul
         for (String property : propertyNameFind) {
             if (alias.containsKey(property.toLowerCase())) {
                 String key = property.toLowerCase();
-                if (!PhpIndex.getInstance(project).getAnyByFQN(alias.get(key)).isEmpty()) {
+                if (PhpElementsUtil.hasClassOrInterface(project, alias.get(key))) {
                     String fqn = alias.get(key);
                     servicesMatch.put(fqn, new Match(fqn, 4));
                 }
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/inspection/YamlClassInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/inspection/YamlClassInspection.java
@@ -66,7 +66,7 @@ private void invoke(@NotNull final PsiElement psiElement, @NotNull ProblemsHolde
 
         if (YamlHelper.isValidParameterName(className)) {
             String resolvedParameter = ContainerCollectionResolver.resolveParameter(project, className);
-            if (resolvedParameter != null && !PhpIndex.getInstance(project).getAnyByFQN(resolvedParameter).isEmpty()) {
+            if (resolvedParameter != null && PhpElementsUtil.hasClassOrInterface(project, resolvedParameter)) {
                 return;
             }
         }
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/php/AddRouteAttributeIntention.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/php/AddRouteAttributeIntention.java
@@ -110,7 +110,7 @@ public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull Psi
             return false;
         }
 
-        if (PhpElementsUtil.getClassInterface(project, ROUTE_ATTRIBUTE_CLASS) == null) {
+        if (!PhpElementsUtil.hasClassOrInterface(project, ROUTE_ATTRIBUTE_CLASS)) {
             return false;
         }
 
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/php/CommandToInvokableIntention.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/php/CommandToInvokableIntention.java
@@ -163,7 +163,7 @@ public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull Psi
         }
 
         // check if feature exists
-        if (PhpElementsUtil.getClassInterface(project, "Symfony\\Component\\Console\\Command\\InvokableCommand") == null) {
+        if (!PhpElementsUtil.hasClassOrInterface(project, "\\Symfony\\Component\\Console\\Command\\InvokableCommand")) {
             return false;
         }
 
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpElementsUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpElementsUtil.java
@@ -4,6 +4,7 @@
 import com.intellij.lang.ASTNode;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.Ref;
 import com.intellij.patterns.ElementPattern;
 import com.intellij.patterns.PatternCondition;
@@ -12,6 +13,10 @@
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.formatter.FormatterUtil;
+import com.intellij.psi.util.CachedValue;
+import com.intellij.psi.util.CachedValueProvider;
+import com.intellij.psi.util.CachedValuesManager;
+import com.intellij.psi.util.PsiModificationTracker;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.ProcessingContext;
 import com.intellij.util.Processor;
@@ -55,13 +60,19 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
 public class PhpElementsUtil {
 
+    /**
+     * Cache for class/interface existence checks to avoid repeated PhpIndex queries
+     */
+    private static final Key<CachedValue<Map<String, Boolean>>> CLASS_EXISTS_CACHE = new Key<>("SYMFONY_PHP_CLASS_EXISTS_CACHE");
+
     /**
      * Only parameter on first index or named: "a('caret'), a(test: 'caret')"
      */
@@ -859,6 +870,24 @@ static public PhpClass getClassInterface(Project project, @NotNull String classN
         return phpClasses.isEmpty() ? null : phpClasses.iterator().next();
     }
 
+    static public boolean hasClassOrInterface(@NotNull Project project, @NotNull String classFqnName) {
+        // Get or create the cached map
+        Map<String, Boolean> cache = CachedValuesManager.getManager(project).getCachedValue(
+            project,
+            CLASS_EXISTS_CACHE,
+            () -> CachedValueProvider.Result.create(
+                new ConcurrentHashMap<>(),
+                PsiModificationTracker.MODIFICATION_COUNT
+            ),
+            false
+        );
+
+        // Check the cache first, compute and store if missing
+        return cache.computeIfAbsent(classFqnName, fqn ->
+            !PhpIndex.getInstance(project).getAnyByFQN(fqn).isEmpty()
+        );
+    }
+
     /**
      * @param subjectClass eg DateTime
      * @param expectedClass eg DateTimeInterface

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public static boolean isInGivenDirectoryScope(@NotNull AnActionEvent event, @Not`
`66`	`66`
`67`	`67`	`public static String guessCommandTemplateType(@NotNull Project project, @NotNull String namespace) {`
`68`	`68`	`// Check if InvokableCommand is available (Symfony 7.3+)`
`69`		`- if (PhpElementsUtil.getClassInterface(project, "\\Symfony\\Component\\Console\\Command\\InvokableCommand") != null) {`
	`69`	`+ if (PhpElementsUtil.hasClassOrInterface(project, "\\Symfony\\Component\\Console\\Command\\InvokableCommand")) {`
`70`	`70`	`String normalizedNamespace = "\\" + org.apache.commons.lang3.StringUtils.strip(namespace, "\\") + "\\";`
`71`	`71`	`Collection<PhpClass> commandClasses = PhpIndexUtil.getPhpClassInsideNamespace(project, normalizedNamespace);`
`72`	`72`
`@@ -90,7 +90,7 @@ public static String guessCommandTemplateType(@NotNull Project project, @NotNull`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
`93`		`- if (PhpElementsUtil.getClassInterface(project, "\\Symfony\\Component\\Console\\Attribute\\AsCommand") != null) {`
	`93`	`+ if (PhpElementsUtil.hasClassOrInterface(project, "\\Symfony\\Component\\Console\\Attribute\\AsCommand")) {`
`94`	`94`	`return "command_attributes";`
`95`	`95`	`}`
`96`	`96`
`@@ -106,7 +106,7 @@ public static String guessCommandTemplateType(@NotNull Project project, @NotNull`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`public static String guessControllerTemplateType(@NotNull Project project) {`
`109`		`- if (PhpElementsUtil.getClassInterface(project, "\\Symfony\\Component\\Routing\\Attribute\\Route") != null) {`
	`109`	`+ if (PhpElementsUtil.hasClassOrInterface(project, "\\Symfony\\Component\\Routing\\Attribute\\Route")) {`
`110`	`110`	`return "controller_attributes";`
`111`	`111`	`}`
`112`	`112`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public void actionPerformed(@NotNull AnActionEvent event) {`
`89`	`89`	`@NotNull`
`90`	`90`	`private static String detectTemplate(@NotNull Project project) {`
`91`	`91`	`// If attributes are available, use the new attribute-based template`
`92`		`- if (PhpElementsUtil.getClassInterface(project, "\\Twig\\Attribute\\AsTwigFunction") != null) {`
	`92`	`+ if (PhpElementsUtil.hasClassOrInterface(project, "\\Twig\\Attribute\\AsTwigFunction")) {`
`93`	`93`	`return "twig_extension_function_attribute";`
`94`	`94`	`}`
`95`	`95`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public static List<String> getInjectionService(@NotNull Project project, @NotNul`
`62`	`62`	`for (String property : propertyNameFind) {`
`63`	`63`	`if (alias.containsKey(property.toLowerCase())) {`
`64`	`64`	`String key = property.toLowerCase();`
`65`		`- if (!PhpIndex.getInstance(project).getAnyByFQN(alias.get(key)).isEmpty()) {`
	`65`	`+ if (PhpElementsUtil.hasClassOrInterface(project, alias.get(key))) {`
`66`	`66`	`String fqn = alias.get(key);`
`67`	`67`	`servicesMatch.put(fqn, new Match(fqn, 4));`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ private void invoke(@NotNull final PsiElement psiElement, @NotNull ProblemsHolde`
`66`	`66`
`67`	`67`	`if (YamlHelper.isValidParameterName(className)) {`
`68`	`68`	`String resolvedParameter = ContainerCollectionResolver.resolveParameter(project, className);`
`69`		`- if (resolvedParameter != null && !PhpIndex.getInstance(project).getAnyByFQN(resolvedParameter).isEmpty()) {`
	`69`	`+ if (resolvedParameter != null && PhpElementsUtil.hasClassOrInterface(project, resolvedParameter)) {`
`70`	`70`	`return;`
`71`	`71`	`}`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull Psi`
`110`	`110`	`return false;`
`111`	`111`	`}`
`112`	`112`
`113`		`- if (PhpElementsUtil.getClassInterface(project, ROUTE_ATTRIBUTE_CLASS) == null) {`
	`113`	`+ if (!PhpElementsUtil.hasClassOrInterface(project, ROUTE_ATTRIBUTE_CLASS)) {`
`114`	`114`	`return false;`
`115`	`115`	`}`
`116`	`116`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull Psi`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`// check if feature exists`
`166`		`- if (PhpElementsUtil.getClassInterface(project, "Symfony\\Component\\Console\\Command\\InvokableCommand") == null) {`
	`166`	`+ if (!PhpElementsUtil.hasClassOrInterface(project, "\\Symfony\\Component\\Console\\Command\\InvokableCommand")) {`
`167`	`167`	`return false;`
`168`	`168`	`}`
`169`	`169`