Merge pull request #1560 from Haehnchen/feature/bind-resource

support autowired resources services inside "argument bind" navigation

Author: Haehnchen

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

@@ -514,38 +514,14 @@ public static Collection<PsiElement> getClassesForServiceKey(@NotNull YAMLKeyVal
         //   resource: '....'
         //   exclude: '....'
         if (valueText.endsWith("\\")) {
-            Collection<String> resource = YamlHelper.getYamlKeyValueStringOrArray(yamlKeyValue, "resource");
-            if (!resource.isEmpty()) {
-                Collection<String> exclude = YamlHelper.getYamlKeyValueStringOrArray(yamlKeyValue, "exclude");
-                targets.addAll(getPhpClassFromResources(yamlKeyValue.getProject(), valueText, yamlKeyValue.getContainingFile().getVirtualFile(), resource, exclude));
-            }
+            targets.addAll(YamlHelper.getNamespaceResourcesClasses(yamlKeyValue));
         }
 
         targets.addAll(PhpElementsUtil.getClassesInterface(yamlKeyValue.getProject(), valueText));
 
         return targets;
     }
 
-    @NotNull
-    private static Collection<PhpClass> getPhpClassFromResources(@NotNull Project project, @NotNull String namespace, @NotNull VirtualFile source, @NotNull Collection<String> resource, @NotNull Collection<String> exclude) {
-        Collection<PhpClass> phpClasses = new HashSet<>();
-
-        for (PhpClass phpClass : PhpIndexUtil.getPhpClassInsideNamespace(project, "\\" + StringUtils.strip(namespace, "\\"))) {
-            boolean classMatchesGlob = ServiceIndexUtil.matchesResourcesGlob(
-                source,
-                phpClass.getContainingFile().getVirtualFile(),
-                resource,
-                exclude
-            );
-
-            if (classMatchesGlob) {
-                phpClasses.add(phpClass);
-            }
-        }
-
-        return phpClasses;
-    }
-
     @Nullable
     @Override
     public String getActionText(DataContext dataContext) {

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

@@ -27,6 +27,7 @@
 import fr.adrienbrault.idea.symfony2plugin.dic.container.dict.ServiceTypeHint;
 import fr.adrienbrault.idea.symfony2plugin.dic.container.visitor.ServiceConsumer;
 import fr.adrienbrault.idea.symfony2plugin.stubs.ContainerCollectionResolver;
+import fr.adrienbrault.idea.symfony2plugin.stubs.ServiceIndexUtil;
 import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.ContainerIdUsagesStubIndex;
 import fr.adrienbrault.idea.symfony2plugin.util.*;
 import fr.adrienbrault.idea.symfony2plugin.util.dict.ServiceUtil;
@@ -821,6 +822,33 @@ public static Collection<String> getContainerFiles(@NotNull Project project) {
             );
     }
 
+    /**
+     * All class that matched against this pattern
+     *
+     * My<caret>Class\:
+     *  resource: '....'
+     *  exclude: '....'
+     */
+    @NotNull
+    public static Collection<PhpClass> getPhpClassFromResources(@NotNull Project project, @NotNull String namespace, @NotNull VirtualFile containerFile, @NotNull Collection<String> resource, @NotNull Collection<String> exclude) {
+        Collection<PhpClass> phpClasses = new HashSet<>();
+
+        for (PhpClass phpClass : PhpIndexUtil.getPhpClassInsideNamespace(project, "\\" + StringUtils.strip(namespace, "\\"))) {
+            boolean classMatchesGlob = ServiceIndexUtil.matchesResourcesGlob(
+                containerFile,
+                phpClass.getContainingFile().getVirtualFile(),
+                resource,
+                exclude
+            );
+
+            if (classMatchesGlob) {
+                phpClasses.add(phpClass);
+            }
+        }
+
+        return phpClasses;
+    }
+
     /**
      * Find possible compiled service file with seconds cache
      *

src/main/java/fr/adrienbrault/idea/symfony2plugin/util/yaml/YamlHelper.java

@@ -1263,7 +1263,7 @@ public boolean accepts(@NotNull PsiElement psiElement, ProcessingContext process
 
     @NotNull
     public static Collection<PhpClass> getPhpClassesInYamlFile(@NotNull YAMLFile yamlFile, @NotNull ContainerCollectionResolver.LazyServiceCollector lazyServiceCollector) {
-        Collection<PhpClass> phpClasses = new HashSet<>();
+        Collection<PhpClass> phpClasses = new HashSet<>(); //TODO
 
         for (YAMLKeyValue keyValue : YamlHelper.getQualifiedKeyValuesInFile(yamlFile, "services")) {
             YAMLValue value = keyValue.getValue();
@@ -1277,6 +1277,10 @@ public static Collection<PhpClass> getPhpClassesInYamlFile(@NotNull YAMLFile yam
                         phpClasses.add(serviceClass);
                     }
                 }
+
+                // My<caret>Class\:
+                //    resource: ...
+                phpClasses.addAll(YamlHelper.getNamespaceResourcesClasses(keyValue));
             } else if(value instanceof YAMLPlainTextImpl) {
                 // Foo\Bar: ~
                 String text = keyValue.getKeyText();
@@ -1290,6 +1294,32 @@ public static Collection<PhpClass> getPhpClassesInYamlFile(@NotNull YAMLFile yam
         return phpClasses;
     }
 
+    /**
+     * My<caret>Class\:
+     *  resource: '....'
+     *  exclude: '....'
+     */
+    @NotNull
+    public static Collection<PhpClass> getNamespaceResourcesClasses(@NotNull YAMLKeyValue yamlKeyValue) {
+        String valueText = yamlKeyValue.getKeyText();
+        if (StringUtils.isBlank(valueText)) {
+            return Collections.emptyList();
+        }
+
+        Collection<PhpClass> phpClasses = new HashSet<>();
+
+        if (valueText.endsWith("\\")) {
+            Collection<String> resource = YamlHelper.getYamlKeyValueStringOrArray(yamlKeyValue, "resource");
+            if (!resource.isEmpty()) {
+                phpClasses.addAll(ServiceContainerUtil.getPhpClassFromResources(
+                    yamlKeyValue.getProject(), valueText, yamlKeyValue.getContainingFile().getVirtualFile(), resource, YamlHelper.getYamlKeyValueStringOrArray(yamlKeyValue, "exclude"))
+                );
+            }
+        }
+
+        return phpClasses;
+    }
+
     /**
      * key: !my_tag <caret>
      */