Merge pull request #1992 from Haehnchen/feature/1984-tagged-locator

#1984 support parameter inside "TaggedLocator" attribute

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/util/ServiceContainerUtil.java

@@ -71,7 +71,8 @@ public class ServiceContainerUtil {
     };
 
     public static final String AUTOWIRE_ATTRIBUTE_CLASS = "\\Symfony\\Component\\DependencyInjection\\Attribute\\Autowire";
-    public static final String TAGGET_ITERATOR_ATTRIBUTE_CLASS = "\\Symfony\\Component\\DependencyInjection\\Attribute\\TaggedIterator";
+    public static final String TAGGED_ITERATOR_ATTRIBUTE_CLASS = "\\Symfony\\Component\\DependencyInjection\\Attribute\\TaggedIterator";
+    public static final String TAGGED_LOCATOR_ATTRIBUTE_CLASS = "\\Symfony\\Component\\DependencyInjection\\Attribute\\TaggedLocator";
 
     @NotNull
     public static Collection<ServiceSerializable> getServicesInFile(@NotNull PsiFile psiFile) {

src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/registrar/DicGotoCompletionRegistrar.java

@@ -3,8 +3,6 @@
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.patterns.PlatformPatterns;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementResolveResult;
-import com.intellij.psi.ResolveResult;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.jetbrains.php.lang.psi.elements.PhpAttribute;
 import com.jetbrains.php.lang.psi.elements.PhpClass;
@@ -92,10 +90,13 @@ public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
         );
 
         // #[TaggedIterator('app.handler')] iterable $handlers
+        // #[TaggedLocator('app.handler')] ContainerInterface $handlers
         registrar.register(
             PlatformPatterns.or(
-                PhpElementsUtil.getFirstAttributeStringPattern(ServiceContainerUtil.TAGGET_ITERATOR_ATTRIBUTE_CLASS),
-                PhpElementsUtil.getAttributeNamedArgumentStringPattern(ServiceContainerUtil.TAGGET_ITERATOR_ATTRIBUTE_CLASS, "tag")
+                PhpElementsUtil.getFirstAttributeStringPattern(ServiceContainerUtil.TAGGED_ITERATOR_ATTRIBUTE_CLASS),
+                PhpElementsUtil.getAttributeNamedArgumentStringPattern(ServiceContainerUtil.TAGGED_ITERATOR_ATTRIBUTE_CLASS, "tag"),
+                PhpElementsUtil.getFirstAttributeStringPattern(ServiceContainerUtil.TAGGED_LOCATOR_ATTRIBUTE_CLASS),
+                PhpElementsUtil.getAttributeNamedArgumentStringPattern(ServiceContainerUtil.TAGGED_LOCATOR_ATTRIBUTE_CLASS, "tag")
             ), psiElement -> {
                 PsiElement context = psiElement.getContext();
                 if (!(context instanceof StringLiteralExpression)) {

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/registrar/DicGotoCompletionRegistrarTest.java

@@ -167,6 +167,42 @@ public void testTagContributorForTaggedIterator() {
         );
     }
 
+    public void testTagContributorForTaggedLocator() {
+        assertCompletionContains(PhpFileType.INSTANCE, "<?php\n" +
+                "use Symfony\\Component\\DependencyInjection\\Attribute\\TaggedLocator;\n" +
+                "\n" +
+                "class HandlerCollection\n" +
+                "    public function __construct(\n" +
+                "        #[TaggedLocator('<caret>')] ContainerInterface $handlers\n" +
+                "    ) {}\n" +
+                "}",
+            "yaml_type_tag"
+        );
+
+        assertCompletionContains(PhpFileType.INSTANCE, "<?php\n" +
+                "use Symfony\\Component\\DependencyInjection\\Attribute\\TaggedLocator;\n" +
+                "\n" +
+                "class HandlerCollection\n" +
+                "    public function __construct(\n" +
+                "        #[TaggedLocator(tag: '<caret>')] ContainerInterface $handlers\n" +
+                "    ) {}\n" +
+                "}",
+            "yaml_type_tag"
+        );
+
+        assertNavigationMatch(PhpFileType.INSTANCE, "<?php\n" +
+                "use Symfony\\Component\\DependencyInjection\\Attribute\\TaggedLocator;\n" +
+                "\n" +
+                "class HandlerCollection\n" +
+                "{\n" +
+                "    public function __construct(\n" +
+                "        #[TaggedLocator('yaml_t<caret>ype_tag')] ContainerInterface $handlers\n" +
+                "    ) {}\n" +
+                "}",
+            PlatformPatterns.psiElement()
+        );
+    }
+
     public void testServiceContributorForNamedAttribute() {
         assertCompletionContains(PhpFileType.INSTANCE, "<?php\n" +
                 "use Symfony\\Component\\DependencyInjection\\Attribute\\Autowire;\n" +

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/registrar/fixtures/classes.php

@@ -35,6 +35,18 @@ public function __construct(
             public string|array $exclude = [],
         ) {}
     }
+
+    class TaggedLocator
+    {
+        public function __construct(
+            public string $tag,
+            public ?string $indexAttribute = null,
+            public ?string $defaultIndexMethod = null,
+            public ?string $defaultPriorityMethod = null,
+            public string|array $exclude = [],
+        ) {
+        }
+    }
 }
 
 namespace