improve completion support for FQCN::method routes #1231 #1159

Author: Haehnchen

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

@@ -13,6 +13,7 @@
 import fr.adrienbrault.idea.symfony2plugin.util.SymfonyBundleUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.dict.ServiceUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.dict.SymfonyBundle;
+import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -31,6 +32,7 @@ public ControllerIndex(@NotNull Project project) {
        this.project = project;
     }
 
+    @NotNull
     public Collection<ControllerAction> getActions() {
         Collection<ControllerAction> actions = new ArrayList<>();
 
@@ -65,8 +67,8 @@ public ControllerAction getControllerActionOnService(String shortcutName) {
         return new ControllerAction(serviceId, method);
     }
 
-    private List<ControllerAction> getActionMethods(SymfonyBundle symfonyBundle) {
-
+    @NotNull
+    private Collection<ControllerAction> getActionMethods(@NotNull SymfonyBundle symfonyBundle) {
         String namespaceName = symfonyBundle.getNamespaceName();
         if(!namespaceName.startsWith("\\")) {
             namespaceName = "\\" + namespaceName;
@@ -81,12 +83,15 @@ private List<ControllerAction> getActionMethods(SymfonyBundle symfonyBundle) {
         List<ControllerAction> actions = new ArrayList<>();
 
         for (PhpClass phpClass : PhpIndexUtil.getPhpClassInsideNamespace(this.project, namespaceName)) {
-
             if(!phpClass.getName().endsWith("Controller")) {
                 continue;
             }
 
             String presentableFQN = phpClass.getPresentableFQN();
+            if(presentableFQN.contains("\\Test\\") || presentableFQN.contains("\\Tests\\") || presentableFQN.startsWith("Test\\") || presentableFQN.startsWith("\\Test\\")) {
+                continue;
+            }
+
             if(!presentableFQN.startsWith("\\")) {
                 presentableFQN = "\\" + presentableFQN;
             }
@@ -100,13 +105,22 @@ private List<ControllerAction> getActionMethods(SymfonyBundle symfonyBundle) {
 
             for(Method method : phpClass.getMethods()) {
                 String methodName = method.getName();
-                if(methodName.endsWith("Action") && method.getAccess().isPublic()) {
+                if(!method.getAccess().isPublic() || (method.getName().startsWith("__") && !method.getName().equals("__invoke"))) {
+                    continue;
+                }
+
+                if(methodName.endsWith("Action")) {
                     String shortcutName = symfonyBundle.getName() + ":" + ns.replace("/", "\\") + ':' + methodName.substring(0, methodName.length() - 6);
                     actions.add(new ControllerAction(shortcutName, method));
                 }
 
+                String shortcutName = StringUtils.stripStart(phpClass.getPresentableFQN(), "\\");
+                if(methodName.equals("__invoke")) {
+                    actions.add(new ControllerAction(shortcutName, method));
+                } else {
+                    actions.add(new ControllerAction(shortcutName + "::" + method.getName(), method));
+                }
             }
-
         }
 
         return actions;

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlCompletionContributorTest.java

@@ -87,7 +87,7 @@ public void testRouteControllerActionCompletion() {
                 "foo:\n" +
                 "    pattern:  /hello/{name}\n" +
                 "    defaults: { _controller: <caret> }",
-            "FooBundle:Foo:foo"
+            "FooBundle:Foo:foo", "FooBundle\\Controller\\FooController::fooAction", "FooBundle\\Controller\\FooBarController"
         );
     }
 

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/fixtures/YamlCompletionContributor.php

@@ -12,4 +12,8 @@ class FooBundle implements \Symfony\Component\HttpKernel\Bundle\Bundle {}
     class FooController {
         public function fooAction() {}
     }
+
+    class FooBarController {
+        public function __invoke() {}
+    }
 }