Controller::redirectToRoute should provide routing auto completion #614

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/routing/PhpRouteReferenceContributor.java

@@ -18,8 +18,9 @@
 public class PhpRouteReferenceContributor extends PsiReferenceContributor {
 
     public static MethodMatcher.CallToSignature[] GENERATOR_SIGNATURES = new MethodMatcher.CallToSignature[] {
-        new MethodMatcher.CallToSignature("\\Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface", "generate"),
         new MethodMatcher.CallToSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller", "generateUrl"),
+        new MethodMatcher.CallToSignature("\\Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller", "redirectToRoute"),
+        new MethodMatcher.CallToSignature("\\Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface", "generate"),
     };
 
     private static MethodMatcher.CallToSignature[] FORWARD_SIGNATURES = new MethodMatcher.CallToSignature[] {

tests/fr/adrienbrault/idea/symfony2plugin/tests/SymfonyLightCodeInsightFixtureTestCase.java

@@ -285,7 +285,12 @@ public void assertPhpReferenceResolveTo(LanguageFileType languageFileType, Strin
             fail("Element is not PhpReference.");
         }
 
-        assertTrue(pattern.accepts(((PhpReference) psiElement).resolve()));
+        PsiElement resolve = ((PhpReference) psiElement).resolve();
+        if(!pattern.accepts(resolve)) {
+            fail(String.format("failed pattern matches element of '%s'", resolve == null ? "null" : resolve.toString()));
+        }
+
+        assertTrue(pattern.accepts(resolve));
     }
 
     public void assertPhpReferenceNotResolveTo(LanguageFileType languageFileType, String configureByText, ElementPattern<?> pattern) {

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

@@ -0,0 +1,36 @@
+package fr.adrienbrault.idea.symfony2plugin.tests.routing;
+
+import com.intellij.patterns.PlatformPatterns;
+import com.jetbrains.php.lang.PhpFileType;
+import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocComment;
+import com.jetbrains.php.lang.psi.PhpFile;
+import com.jetbrains.php.lang.psi.elements.Method;
+import fr.adrienbrault.idea.symfony2plugin.tests.SymfonyLightCodeInsightFixtureTestCase;
+
+import java.io.File;
+
+/**
+ * @author Daniel Espendiller <daniel@espendiller.net>
+ *
+ * @see fr.adrienbrault.idea.symfony2plugin.routing.PhpRouteReferenceContributor
+ */
+public class PhpRouteReferenceContributorTest extends SymfonyLightCodeInsightFixtureTestCase {
+
+
+    public void setUp() throws Exception {
+        super.setUp();
+
+        myFixture.configureFromExistingVirtualFile(myFixture.copyFileToProject("PhpRouteReferenceContributor.php"));
+    }
+
+    protected String getTestDataPath() {
+        return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath();
+    }
+
+    public void testGenerateUrlProvidesNavigation() {
+        assertCompletionContains(PhpFileType.INSTANCE, "<?php\n" +
+            "/** @var $f \\Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface */\n" +
+            "$f->generate('<caret>')"
+        , "foo_bar");
+    }
+}

tests/fr/adrienbrault/idea/symfony2plugin/tests/routing/fixtures/PhpRouteReferenceContributor.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Sensio\Bundle\FrameworkExtraBundle\Configuration
+{
+    interface Route
+    {
+    }
+}
+
+namespace Foo\Route
+{
+    use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+
+    class MyController
+    {
+
+        /**
+         * @Route("/foo/{bar}", name = "foo_bar")
+         */
+        public function myAction($bar)
+        {
+        }
+    }
+}
+
+namespace Symfony\Component\Routing\Generator
+{
+    interface UrlGeneratorInterface {
+        public function generate();
+    };
+}