fix Doc Tag completion in class constructors

src/fr/adrienbrault/idea/symfony2plugin/util/DocHashTagReferenceContributor.java

@@ -166,11 +166,21 @@ private ArrayList<Parameter[]> getParameters() {
             return parameters;
         }
 
+        private PsiReference getElementReference(PsiElement element) {
+            if (element instanceof NewExpression) {
+                return ((NewExpression) element).getClassReference();
+            } else if (element instanceof FunctionReference) {
+                return element.getReference();
+            } else {
+                return null;
+            }
+        }
+
         public boolean isValid() {
 
             this.parameterList = PsiTreeUtil.getParentOfType(psiElement, ParameterList.class);
 
-            if (this.parameterList == null || !(this.parameterList.getContext() instanceof MethodReference)) {
+            if (this.parameterList == null) {
                 return false;
             }
 
@@ -179,18 +189,14 @@ public boolean isValid() {
                 return false;
             }
 
-            MethodReference methodReference = (MethodReference) this.parameterList.getContext();
-            if(methodReference == null) {
-                return false;
-            }
-
-            PsiReference psiReference = methodReference.getReference();
+            PsiElement parent = parameterList.getParent();
+            PsiReference psiReference = getElementReference(parent);
             if (null == psiReference) {
                 return false;
             }
 
             PsiElement resolvedReference = psiReference.resolve();
-            if (!(resolvedReference instanceof Method)) {
+            if (!(resolvedReference instanceof Function)) {
                 return false;
             }
 
@@ -209,7 +215,9 @@ public boolean isValid() {
                     Parameter parameter = implementedParameters[currentIndex.getIndex()];
                     PsiElement implementedParameterList = parameter.getContext();
 
-                    if(implementedParameterList instanceof ParameterList) {
+                    if(implementedParameterList instanceof ParameterList
+                        || implementedParameterList instanceof Method
+                    ) {
                         PhpDocParamTag phpDocParamTag = parameter.getDocTag();
                         if(phpDocParamTag != null) {
                             this.phpDocParamTags.add(phpDocParamTag);

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

@@ -0,0 +1,38 @@
+package fr.adrienbrault.idea.symfony2plugin.tests.routing;
+
+import com.jetbrains.php.lang.PhpFileType;
+import fr.adrienbrault.idea.symfony2plugin.tests.SymfonyLightCodeInsightFixtureTestCase;
+
+import java.io.File;
+
+/**
+ * @author Daniel Espendiller <daniel@espendiller.net>
+ * @see fr.adrienbrault.idea.symfony2plugin.util.DocHashTagReferenceContributor
+ */
+public class DocTagCompletionContributorTest extends SymfonyLightCodeInsightFixtureTestCase {
+
+    public void setUp() throws Exception {
+        super.setUp();
+        myFixture.copyFileToProject("classes_routing.php");
+        myFixture.configureFromExistingVirtualFile(myFixture.copyFileToProject("routing.yml"));
+        myFixture.configureFromExistingVirtualFile(myFixture.copyFileToProject("routing.xml"));
+        myFixture.configureFromExistingVirtualFile(myFixture.copyFileToProject("PhpRouteReferenceContributor.php"));
+    }
+
+    public String getTestDataPath() {
+        return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath();
+    }
+
+    public void testRouteDocTagCompletion() {
+        assertCompletionContains(PhpFileType.INSTANCE,  "<?php new TestClass('<caret>');", "route_foo");
+        assertCompletionContains(PhpFileType.INSTANCE,  "<?php new TestClass('<caret>');", "route_bar");
+        assertCompletionContains(PhpFileType.INSTANCE,  "<?php new TestClass('<caret>');", "xml_route");
+        assertCompletionContains(PhpFileType.INSTANCE,  "<?php new TestClass('<caret>');", "foo_bar");
+
+        assertCompletionContains(PhpFileType.INSTANCE,  "<?php (new TestClass())->foo('<caret>');", "route_foo");
+        assertCompletionContains(PhpFileType.INSTANCE,  "<?php (new TestClass())->foo('<caret>');", "route_bar");
+        assertCompletionContains(PhpFileType.INSTANCE,  "<?php (new TestClass())->foo('<caret>');", "xml_route");
+        assertCompletionContains(PhpFileType.INSTANCE,  "<?php (new TestClass())->foo('<caret>');", "foo_bar");
+    }
+
+}

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

@@ -0,0 +1,13 @@
+<?php
+
+class TestClass {
+    /**
+     * @param string $bar #Route
+     */
+    public function __construct($bar) {}
+
+    /**
+     * @param string $bar #Route
+     */
+    public function foo($bar) {}
+}