Merge pull request #1974 from Haehnchen/feature/tagged-iterator

provide complete for tag name of yaml "!tagged_iterator"

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlElementPatternHelper.java

@@ -857,6 +857,13 @@ public boolean accepts(@NotNull YAMLKeyValue yamlKeyValue, ProcessingContext con
         return PlatformPatterns.or(argumentPattern, incompleteCodePattern, incompleteCodePattern2);
     }
 
+    public static ElementPattern<PsiElement> getTaggedIteratorTagNamePattern() {
+        return PlatformPatterns.psiElement().afterLeafSkipping(
+            PlatformPatterns.psiElement(PsiWhiteSpace.class),
+            PlatformPatterns.psiElement().withElementType(YAMLTokenTypes.TAG).withText("!tagged_iterator")
+        );
+    }
+
     /**
      * Match elements types
      */

src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlGoToDeclarationHandler.java

@@ -194,19 +194,11 @@ public PsiElement[] getGotoDeclarationTargets(PsiElement psiElement, int i, Edit
             targets.addAll(attachResourceOrExcludeGlobNamespaceElements(psiElement));
         }
 
-        // !tagged_iterator app.handler
-        if (PlatformPatterns.psiElement(YAMLTokenTypes.TEXT).accepts(psiElement) || PlatformPatterns.psiElement(YAMLTokenTypes.TAG).accepts(psiElement)) {
+        // !tagged_iterator
+        if (PlatformPatterns.psiElement(YAMLTokenTypes.TAG).accepts(psiElement)) {
             targets.addAll(attachTaggedIteratorClasses(psiElement));
         }
 
-        // !tagged_iterator { tag: app.handler, default_priority_method: getPriority }
-        if (YamlElementPatternHelper.getSingleLineScalarKey("tag").accepts(psiElement)) {
-            String tag = psiElement.getText();
-            if (StringUtils.isNotBlank(tag)) {
-                targets.addAll(ServiceUtil.getTaggedClassesWithCompiled(psiElement.getProject(), tag));
-            }
-        }
-
         return targets.toArray(new PsiElement[0]);
     }
 
@@ -528,23 +520,13 @@ private Collection<PsiElement> attachResourceOnPathGoto(@NotNull PsiElement psiE
     }
 
     /**
-     * Both elements are clickable, as parent element does not allow navigation
+     * Click on "tagged_iterator"
      *
      * "!tagged_iterator app.handler"
      */
     @NotNull
     private Collection<PsiElement> attachTaggedIteratorClasses(@NotNull PsiElement psiElement) {
-        if (psiElement.getNode().getElementType() == YAMLTokenTypes.TEXT) {
-            PsiElement prevLeaf = PsiTreeUtil.prevCodeLeaf(psiElement);
-            if (prevLeaf != null && prevLeaf.getNode().getElementType() == YAMLTokenTypes.TAG) {
-                if ("!tagged_iterator".equals(prevLeaf.getText())) {
-                    String tag = psiElement.getText();
-                    if (StringUtils.isNotBlank(tag)) {
-                        return new ArrayList<>(ServiceUtil.getTaggedClassesWithCompiled(psiElement.getProject(), tag));
-                    }
-                }
-            }
-        } else if (psiElement.getNode().getElementType() == YAMLTokenTypes.TAG) {
+        if (psiElement.getNode().getElementType() == YAMLTokenTypes.TAG) {
             // - !tagged_iterator ...
 
             if ("!tagged_iterator".equals(psiElement.getText())) {

src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/TaggedParameterGotoCompletionRegistrar.java

@@ -30,6 +30,8 @@ public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
         registrar.register(
             PlatformPatterns.or(
                 YamlElementPatternHelper.getTaggedServicePattern(),
+                YamlElementPatternHelper.getSingleLineScalarKey("tag"),
+                YamlElementPatternHelper.getTaggedIteratorTagNamePattern(),
                 XmlPatterns.psiElement().withParent(XmlHelper.getTypeTaggedTagAttribute())
             ),
             new MyTagGotoCompletionContributor()

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlGoToDeclarationHandlerTest.java

@@ -172,13 +172,6 @@ public void testNavigateToTaggedIteratorServices() {
     }
 
     public void testNavigateToTagInsideHash() {
-        assertNavigationMatch(YAMLFileType.YML, "" +
-                "App\\HandlerCollection:\n" +
-                "   arguments:\n" +
-                "       - !tagged_iterator { tag: my_ni<caret>ce_tag, default_priority_method: getPriority }\n",
-            PlatformPatterns.psiElement(PhpClass.class)
-        );
-
         assertNavigationMatch(YAMLFileType.YML, "" +
                 "App\\HandlerCollection:\n" +
                 "   arguments:\n" +

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/TaggedParameterGotoCompletionRegistrarTest.java

@@ -26,6 +26,24 @@ public void testThatYamlTaggedParameterProvidesNavigation() {
             "arguments: [!tagged foo<caret>bar]",
             PlatformPatterns.psiElement()
         );
+
+        assertNavigationMatch(
+            YAMLFileType.YML,
+            "services:\n" +
+                "    App\\HandlerCollection:\n" +
+                "        arguments:\n" +
+                "            - !tagged_iterator { tag: foo<caret>bar, default_priority_method: getPriority }",
+            PlatformPatterns.psiElement()
+        );
+
+        assertNavigationMatch(
+            YAMLFileType.YML,
+            "services:\n" +
+                "    App\\HandlerCollection:\n" +
+                "        arguments:\n" +
+                "            - !tagged_iterator foo<caret>bar",
+            PlatformPatterns.psiElement()
+        );
     }
 
     public void testThatYamlTaggedParameterProvidesCompletion() {
@@ -34,6 +52,22 @@ public void testThatYamlTaggedParameterProvidesCompletion() {
             "arguments: [!tagged <caret>]",
             "foobar"
         );
+
+        assertCompletionContains(YAMLFileType.YML, "" +
+                "services:\n" +
+                "    App\\HandlerCollection:\n" +
+                "        arguments:\n" +
+                "            - !tagged_iterator { tag: <caret>, default_priority_method: getPriority }",
+            "foobar"
+        );
+
+        assertCompletionContains(YAMLFileType.YML, "" +
+                "services:\n" +
+                "    App\\HandlerCollection:\n" +
+                "        arguments:\n" +
+                "            - !tagged_iterator <caret>",
+            "foobar"
+        );
     }
 
     public void testThatXmlTaggedParameterProvidesNavigation() {