Merge pull request #1993 from Haehnchen/feature/1991-asdecorates-attribute

#1991 support "decorates" inside "AsDecorator" attribute

Author: Haehnchen

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

@@ -73,6 +73,7 @@ public class ServiceContainerUtil {
     public static final String AUTOWIRE_ATTRIBUTE_CLASS = "\\Symfony\\Component\\DependencyInjection\\Attribute\\Autowire";
     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";
+    public static final String DECORATOR_ATTRIBUTE_CLASS = "\\Symfony\\Component\\DependencyInjection\\Attribute\\AsDecorator";
 
     @NotNull
     public static Collection<ServiceSerializable> getServicesInFile(@NotNull PsiFile psiFile) {

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

@@ -113,8 +113,13 @@ public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
         );
 
         // #[Autowire(service: 'some_service')]
+        // #[AsDecorator(decorates: 'some_service')]
         registrar.register(
-            PhpElementsUtil.getAttributeNamedArgumentStringPattern(ServiceContainerUtil.AUTOWIRE_ATTRIBUTE_CLASS, "service"),
+            PlatformPatterns.or(
+                PhpElementsUtil.getAttributeNamedArgumentStringPattern(ServiceContainerUtil.AUTOWIRE_ATTRIBUTE_CLASS, "service"),
+                PhpElementsUtil.getAttributeNamedArgumentStringPattern(ServiceContainerUtil.DECORATOR_ATTRIBUTE_CLASS, "decorates"),
+                PhpElementsUtil.getFirstAttributeStringPattern(ServiceContainerUtil.DECORATOR_ATTRIBUTE_CLASS)
+            ),
             psiElement -> {
                 PsiElement context = psiElement.getContext();
                 if (!(context instanceof StringLiteralExpression)) {

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

@@ -228,4 +228,34 @@ public void testServiceContributorForNamedAttribute() {
             PlatformPatterns.psiElement()
         );
     }
+
+    public void testServiceContributorDecoratesAttribute() {
+        assertCompletionContains(PhpFileType.INSTANCE, "<?php\n" +
+                "use Symfony\\Component\\DependencyInjection\\Attribute\\AsDecorator;\n" +
+                "#[AsDecorator('<caret>')]\n" +
+                "class HandlerCollection {}",
+            "foo_bar_service"
+        );
+
+        assertNavigationMatch(PhpFileType.INSTANCE, "<?php\n" +
+                "use Symfony\\Component\\DependencyInjection\\Attribute\\AsDecorator;\n" +
+                "#[AsDecorator(decorates: 'foo_bar<caret>_service')]\n" +
+                "class HandlerCollection {}",
+            PlatformPatterns.psiElement()
+        );
+
+        assertCompletionContains(PhpFileType.INSTANCE, "<?php\n" +
+                "use Symfony\\Component\\DependencyInjection\\Attribute\\AsDecorator;\n" +
+                "#[AsDecorator(decorates: '<caret>')]\n" +
+                "class HandlerCollection {}",
+            "foo_bar_service"
+        );
+
+        assertNavigationMatch(PhpFileType.INSTANCE, "<?php\n" +
+                "use Symfony\\Component\\DependencyInjection\\Attribute\\AsDecorator;\n" +
+                "#[AsDecorator(decorates: 'foo_bar<caret>_service')]\n" +
+                "class HandlerCollection {}",
+            PlatformPatterns.psiElement()
+        );
+    }
 }

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

@@ -47,6 +47,16 @@ public function __construct(
         ) {
         }
     }
+
+    class AsDecorator
+    {
+        public function __construct(
+            public string $decorates,
+            public int $priority = 0,
+            public int $onInvalid = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE,
+        ) {
+        }
+    }
 }
 
 namespace