Merge pull request #1926 from Haehnchen/feature/empty-annotation

#1029 fix route not indexed if the annotation is empty
Haehnchen · May 9, 2022 · 9c6bc14 · 9c6bc14
2 parents 0da8a46 + 4e48d57
commit 9c6bc14
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/...rault/idea/symfony2plugin/stubs/indexes/visitor/AnnotationRouteElementWalkingVisitor.java b/...rault/idea/symfony2plugin/stubs/indexes/visitor/AnnotationRouteElementWalkingVisitor.java
@@ -76,11 +76,6 @@ private void visitPhpDocTag(@NotNull PhpDocTag phpDocTag) {
             return;
         }
 
-        PsiElement phpDocAttributeList = PsiElementUtils.getChildrenOfType(phpDocTag, PlatformPatterns.psiElement(PhpDocElementTypes.phpDocAttributeList));
-        if(!(phpDocAttributeList instanceof PhpPsiElement)) {
-            return;
-        }
-
         String routeName = AnnotationUtil.getPropertyValue(phpDocTag, "name");
         if(routeName == null) {
             routeName = AnnotationBackportUtil.getRouteByMethod(phpDocTag);
@@ -104,11 +99,14 @@ private void visitPhpDocTag(@NotNull PhpDocTag phpDocTag) {
             }
 
             // extract method path @Route("/foo") => "/foo"
-            PhpPsiElement firstPsiChild = ((PhpPsiElement) phpDocAttributeList).getFirstPsiChild();
-            if(firstPsiChild instanceof StringLiteralExpression) {
-                String contents = ((StringLiteralExpression) firstPsiChild).getContents();
-                if(StringUtils.isNotBlank(contents)) {
-                    path += contents;
+            PsiElement phpDocAttributeList = PsiElementUtils.getChildrenOfType(phpDocTag, PlatformPatterns.psiElement(PhpDocElementTypes.phpDocAttributeList));
+            if (phpDocAttributeList != null) {
+                PhpPsiElement firstPsiChild = ((PhpPsiElement) phpDocAttributeList).getFirstPsiChild();
+                if(firstPsiChild instanceof StringLiteralExpression) {
+                    String contents = ((StringLiteralExpression) firstPsiChild).getContents();
+                    if(StringUtils.isNotBlank(contents)) {
+                        path += contents;
+                    }
                 }
             }
 

diff --git a/...est/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/RoutesStubIndexTest.java b/...est/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/RoutesStubIndexTest.java
@@ -31,7 +31,8 @@ public String getTestDataPath() {
     public void testRouteIdIndex() {
         assertIndexContains(RoutesStubIndex.KEY,
             "foo_yaml_pattern", "foo_yaml_path", "foo_yaml_path_only",
-            "foo_xml_pattern", "foo_xml_path", "foo_xml_id_only", "attributes_action", "app_my_default_attributeswithoutname"
+            "foo_xml_pattern", "foo_xml_path", "foo_xml_id_only", "attributes_action", "app_my_default_attributeswithoutname",
+            "my_post_emptyannotation", "myattributesprefix_prefixdefaultparameter_emptyattribute"
         );
 
         assertIndexNotContains(RoutesStubIndex.KEY,

diff --git a/...java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/RoutesStubIndex.php b/...java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/RoutesStubIndex.php
@@ -34,6 +34,13 @@ public function getHeadAction()
         {
         }
 
+        /**
+         * @Route
+         */
+        public function emptyAnnotation()
+        {
+        }
+
         /**
          * @Route("/")
          */
@@ -236,6 +243,11 @@ class PrefixDefaultParameterController
         public function editAction()
         {
         }
+
+        #[Route]
+        public function emptyAttribute()
+        {
+        }
     }
 }