Merge pull request #1976 from Haehnchen/feature/tag-string-iterator-support

tags can also be strings

Author: Haehnchen

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

@@ -532,11 +532,11 @@ private Collection<PsiElement> attachTaggedIteratorClasses(@NotNull PsiElement p
             if ("!tagged_iterator".equals(psiElement.getText())) {
                 PsiElement nextLeaf = PsiTreeUtil.nextCodeLeaf(psiElement);
 
-                if (nextLeaf != null && nextLeaf.getNode().getElementType() == YAMLTokenTypes.TEXT) {
+                if (nextLeaf != null && (nextLeaf.getNode().getElementType() == YAMLTokenTypes.TEXT || nextLeaf.getNode().getElementType() == YAMLTokenTypes.SCALAR_STRING)) {
                     // - !tagged_iterator app.handler
-                    String tag = nextLeaf.getText();
+                    String tag = PsiElementUtils.trimQuote(nextLeaf.getText());
                     if (StringUtils.isNotBlank(tag)) {
-                        return new ArrayList<>(ServiceUtil.getTaggedClassesWithCompiled(psiElement.getProject(), tag));
+                        return new ArrayList<>(ServiceUtil.getTaggedClasses(psiElement.getProject(), tag));
                     }
                 } else {
                     // - !tagged_iterator { tag: app.handler, default_priority_method: getPriority }
@@ -547,9 +547,9 @@ private Collection<PsiElement> attachTaggedIteratorClasses(@NotNull PsiElement p
                         .orElse(null);
 
                     if (tagKeyValue != null) {
-                        String tag = tagKeyValue.getValueText();
+                        String tag = PsiElementUtils.trimQuote(tagKeyValue.getValueText());
                         if (StringUtils.isNotBlank(tag)) {
-                            return new ArrayList<>(ServiceUtil.getTaggedClassesWithCompiled(psiElement.getProject(), tag));
+                            return new ArrayList<>(ServiceUtil.getTaggedClasses(psiElement.getProject(), tag));
                         }
                     }
                 }
@@ -576,7 +576,7 @@ private Collection<PsiElement> getTagClassesGoto(@NotNull PsiElement psiElement)
             return Collections.emptyList();
         }
 
-        return new ArrayList<>(ServiceUtil.getTaggedClassesWithCompiled(psiElement.getProject(), tagName));
+        return new ArrayList<>(ServiceUtil.getTaggedClasses(psiElement.getProject(), tagName));
     }
 
     private Collection<PsiElement> getEventGoto(@NotNull PsiElement psiElement) {

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

@@ -29,7 +29,7 @@ public TagReference(@NotNull StringLiteralExpression element) {
     @NotNull
     @Override
     public ResolveResult[] multiResolve(boolean incompleteCode) {
-        return PsiElementResolveResult.createResults(ServiceUtil.getTaggedClassesWithCompiled(getElement().getProject(), this.tagName));
+        return PsiElementResolveResult.createResults(ServiceUtil.getTaggedClasses(getElement().getProject(), this.tagName));
     }
 
     @NotNull

src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/ServiceUtil.java

@@ -316,7 +316,7 @@ public static Set<String> getServiceTags(@NotNull Project project, @NotNull Stri
         return service;
     }
 
-    public static Collection<PhpClass> getTaggedClasses(@NotNull Project project, @NotNull String tagName) {
+    private static Collection<PhpClass> getTaggedClassesOnIndex(@NotNull Project project, @NotNull String tagName) {
 
         List<PhpClass> phpClasses = new ArrayList<>();
 
@@ -340,17 +340,17 @@ public static Collection<PhpClass> getTaggedClasses(@NotNull Project project, @N
     }
 
     public static boolean isPhpClassTaggedWith(@NotNull PhpClass phpClass, @NotNull String tagName) {
-        return ServiceUtil.getTaggedClasses(phpClass.getProject(), tagName).stream()
+        return ServiceUtil.getTaggedClassesOnIndex(phpClass.getProject(), tagName).stream()
             .anyMatch(phpClass1 -> phpClass1.getFQN().equalsIgnoreCase(phpClass1.getFQN()));
     }
 
     @NotNull
-    public static Collection<PhpClass> getTaggedClassesWithCompiled(@NotNull Project project, @NotNull String tagName) {
+    public static Collection<PhpClass> getTaggedClasses(@NotNull Project project, @NotNull String tagName) {
 
         Set<String> uniqueClass = new HashSet<>();
 
         Collection<PhpClass> taggedClasses = new ArrayList<>();
-        for(PhpClass phpClass: getTaggedClasses(project, tagName)) {
+        for(PhpClass phpClass: getTaggedClassesOnIndex(project, tagName)) {
             String presentableFQN = phpClass.getPresentableFQN();
             if(!uniqueClass.contains(presentableFQN)) {
                 uniqueClass.add(presentableFQN);

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

@@ -169,6 +169,13 @@ public void testNavigateToTaggedIteratorServices() {
                 "       - !tagged_<caret>iterator my_nice_tag\n",
             PlatformPatterns.psiElement(PhpClass.class)
         );
+
+        assertNavigationMatch(YAMLFileType.YML, "" +
+                "App\\HandlerCollection:\n" +
+                "   arguments:\n" +
+                "       - !tagged_<caret>iterator 'my_nice_tag'\n",
+            PlatformPatterns.psiElement(PhpClass.class)
+        );
     }
 
     public void testNavigateToTagInsideHash() {
@@ -178,6 +185,13 @@ public void testNavigateToTagInsideHash() {
                 "       - !tagged_it<caret>erator { tag: my_nice_tag, default_priority_method: getPriority }\n",
             PlatformPatterns.psiElement(PhpClass.class)
         );
+
+        assertNavigationMatch(YAMLFileType.YML, "" +
+                "App\\HandlerCollection:\n" +
+                "   arguments:\n" +
+                "       - !tagged_it<caret>erator { tag: 'my_nice_tag', default_priority_method: getPriority }\n",
+            PlatformPatterns.psiElement(PhpClass.class)
+        );
     }
 
     public void testNavigateToTaggedServicesForSymfony33Shortcut() {