optimize container as service navigation now its use indexed services, too. in preparation for #428

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/util/controller/ControllerIndex.java

@@ -10,9 +10,11 @@
 import fr.adrienbrault.idea.symfony2plugin.dic.XmlServiceParser;
 import fr.adrienbrault.idea.symfony2plugin.routing.Route;
 import fr.adrienbrault.idea.symfony2plugin.routing.RouteHelper;
+import fr.adrienbrault.idea.symfony2plugin.stubs.ContainerCollectionResolver;
 import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.PhpIndexUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.SymfonyBundleUtil;
+import fr.adrienbrault.idea.symfony2plugin.util.dict.ServiceUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.dict.SymfonyBundle;
 import fr.adrienbrault.idea.symfony2plugin.util.service.ServiceXmlParserFactory;
 import org.jetbrains.annotations.Nullable;
@@ -21,8 +23,10 @@
 
 public class ControllerIndex {
 
-    Project project;
-    PhpIndex phpIndex;
+    private Project project;
+    private PhpIndex phpIndex;
+
+    private ContainerCollectionResolver.LazyServiceCollector lazyServiceCollector;
 
     public ControllerIndex(Project project) {
        this.project = project;
@@ -52,20 +56,17 @@ public ControllerAction getControllerActionOnService(String shortcutName) {
         String serviceId = shortcutName.substring(0, shortcutName.lastIndexOf(":"));
         String methodName = shortcutName.substring(shortcutName.lastIndexOf(":") + 1);
 
-        ServiceMap serviceMap = ServiceXmlParserFactory.getInstance(this.project, XmlServiceParser.class).getServiceMap();
-
-        if(serviceMap.getMap().containsKey(serviceId))  {
-            Collection<? extends PhpNamedElement> methodCalls = this.phpIndex.getBySignature("#M#C" + serviceMap.getMap().get(serviceId) + "." + methodName, null, 0);
-
-            for(PhpNamedElement phpNamedElement : methodCalls) {
-                if(phpNamedElement instanceof Method) {
-                    return new ControllerAction(serviceId, (Method) phpNamedElement);
-                }
-            }
+        PhpClass phpClass = ServiceUtil.getResolvedClassDefinition(this.project, serviceId, getLazyServiceCollector(this.project));
+        if(phpClass == null) {
+            return null;
+        }
 
+        Method method = phpClass.findMethodByName(methodName);
+        if(method == null) {
+            return null;
         }
 
-        return null;
+        return new ControllerAction(serviceId, method);
     }
 
     @Nullable
@@ -190,6 +191,10 @@ public Method resolveShortcutName(String controllerName) {
         return null;
     }
 
+    private ContainerCollectionResolver.LazyServiceCollector getLazyServiceCollector(Project project) {
+        return this.lazyServiceCollector == null ? this.lazyServiceCollector = new ContainerCollectionResolver.LazyServiceCollector(project) : this.lazyServiceCollector;
+    }
+
     static public List<LookupElement> getControllerLookupElements(Project project) {
         List<LookupElement> lookupElements = new ArrayList<LookupElement>();
 

tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/RoutingDefinitionTest.java

@@ -3,6 +3,7 @@
 import com.intellij.ide.highlighter.XmlFileType;
 import fr.adrienbrault.idea.symfony2plugin.tests.SymfonyLightCodeInsightFixtureTestCase;
 import org.jetbrains.yaml.YAMLFileType;
+import java.io.File;
 
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
@@ -13,6 +14,8 @@ public class RoutingDefinitionTest extends SymfonyLightCodeInsightFixtureTestCas
     public void setUp() throws Exception {
         super.setUp();
 
+        myFixture.copyFileToProject("services.yml", "services.yml");
+
         myFixture.configureByText("classes.php", "<?php\n" +
                 "namespace AppBundle;\n" +
                 "class AppBundle extends \\Symfony\\Component\\HttpKernel\\Bundle\\Bundle {}" +
@@ -31,6 +34,10 @@ public void setUp() throws Exception {
         );
     }
 
+    protected String getTestDataPath() {
+        return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath();
+    }
+
     public void testYamlCompletion() {
 
         assertCompletionContains(YAMLFileType.YML, "foo:\n" +
@@ -59,7 +66,6 @@ public void testYamlCompletion() {
 
     }
 
-
     public void testYamlNavigation() {
 
         assertNavigationContains(YAMLFileType.YML, "foo:\n" +
@@ -87,4 +93,14 @@ public void testXmlCompletion() {
 
     }
 
+    public void testControllerAsServiceNavigation() {
+
+        assertNavigationContains(YAMLFileType.YML, "foo:\n" +
+                "    pattern: /\n" +
+                "    defaults: { _controller: app.hello_controller<caret>:indexAction }\n"
+            , "AppBundle\\Controller\\DefaultController::indexAction"
+        );
+
+    }
+
 }

tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/services.yml

@@ -0,0 +1,3 @@
+services:
+    app.hello_controller:
+        class: AppBundle\Controller\DefaultController