Merge pull request #2454 from Haehnchen/feature/symfony-command-loading

Symfony command collecting dont need to resolve PhpClass psi elements

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/action/NewFileActionUtil.java

@@ -121,7 +121,7 @@ public static String getCommandPrefix(@NotNull PsiDirectory psiDirectory) {
                 namespace = "\\" + org.apache.commons.lang3.StringUtils.strip(namespace, "\\") + "\\";
 
                 for (SymfonyCommand command : commands) {
-                    if (command.getPhpClass().getFQN().startsWith(namespace)) {
+                    if (command.getFqn().startsWith(namespace)) {
                         String name = command.getName();
                         int i = name.indexOf(":");
                         if (i > 0) {

src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/SymfonyCommandSymbolContributor.java

@@ -7,8 +7,10 @@
 import com.intellij.util.Processor;
 import com.intellij.util.indexing.FindSymbolParameters;
 import com.intellij.util.indexing.IdFilter;
+import com.jetbrains.php.lang.psi.elements.PhpClass;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2Icons;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
+import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.SymfonyCommandUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.dict.SymfonyCommand;
 import org.jetbrains.annotations.NotNull;
@@ -40,7 +42,10 @@ public void processElementsWithName(@NotNull String name, @NotNull Processor<? s
 
         for (SymfonyCommand symfonyCommand : SymfonyCommandUtil.getCommands(project)) {
             if(symfonyCommand.getName().equals(name)) {
-                processor.process(NavigationItemExStateless.create(symfonyCommand.getPhpClass(), name, Symfony2Icons.SYMFONY, "Command", true));
+                PhpClass classInterface = PhpElementsUtil.getClassInterface(project, symfonyCommand.getFqn());
+                if (classInterface != null) {
+                    processor.process(NavigationItemExStateless.create(classInterface, name, Symfony2Icons.SYMFONY, "Command", true));
+                }
             }
         }
     }

src/main/java/fr/adrienbrault/idea/symfony2plugin/util/SymfonyCommandUtil.java

@@ -17,6 +17,7 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
@@ -60,16 +61,8 @@ public static Collection<SymfonyCommand> getCommands(@NotNull Project project) {
             false
         );
 
-        Collection<SymfonyCommand> symfonyCommands = new ArrayList<>();
-        for (Map.Entry<String, String> entry : cachedValue.entrySet()) {
-            Collection<PhpClass> anyByFQN = PhpIndex.getInstance(project).getAnyByFQN(entry.getValue());
-            if (anyByFQN.isEmpty()) {
-                continue;
-            }
-
-            symfonyCommands.add(new SymfonyCommand(entry.getKey(), anyByFQN.iterator().next()));
-        }
-
-        return symfonyCommands;
+        return cachedValue.entrySet().stream()
+            .map(entry -> new SymfonyCommand(entry.getKey(), entry.getValue()))
+            .collect(Collectors.toList());
     }
 }

src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/SymfonyCommand.java

@@ -1,6 +1,5 @@
 package fr.adrienbrault.idea.symfony2plugin.util.dict;
 
-import com.jetbrains.php.lang.psi.elements.PhpClass;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -11,20 +10,26 @@ public class SymfonyCommand {
     private final String name;
 
     @NotNull
-    private final PhpClass phpClass;
+    private final String fqn;
+
+    /**
+     * @param fqn starting with "\"
+     */
+    public SymfonyCommand(@NotNull String name, @NotNull String fqn) {
+        if (!fqn.startsWith("\\")) {
+            throw new IllegalArgumentException("Invalid fqn: " + fqn);
+        }
 
-    public SymfonyCommand(@NotNull String name, @NotNull PhpClass phpClass) {
         this.name = name;
-        this.phpClass = phpClass;
+        this.fqn = fqn;
     }
-
+    
     @NotNull
     public String getName() {
         return name;
     }
 
-    @NotNull
-    public PhpClass getPhpClass() {
-        return phpClass;
+    public @NotNull String getFqn() {
+        return fqn;
     }
 }

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/SymfonyCommandUtilTest.java

@@ -32,7 +32,6 @@ public void testGetCommands() {
                 .orElseThrow();
 
             assertNotNull(command);
-            assertNotNull(command.getPhpClass());
         }
     }
 }