add bundle controller path to resource completion whitelist #307

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlCompletionContributor.java

@@ -112,7 +112,7 @@ public void addCompletions(@NotNull CompletionParameters parameters,
         extend(CompletionType.BASIC, YamlElementPatternHelper.getOrmSingleLineScalarKey("referencedColumnName"), new ReferencedColumnCompletionProvider());
 
         extend(CompletionType.BASIC, YamlElementPatternHelper.getSingleLineScalarKey("_controller"), new ControllerCompletionProvider());
-        extend(CompletionType.BASIC, YamlElementPatternHelper.getSingleLineScalarKey("resource"), new SymfonyBundleFileCompletionProvider("Resources/config"));
+        extend(CompletionType.BASIC, YamlElementPatternHelper.getSingleLineScalarKey("resource"), new SymfonyBundleFileCompletionProvider("Resources/config", "Controller"));
 
         extend(CompletionType.BASIC, YamlElementPatternHelper.getSuperParentArrayKey("services"), new YamlCompletionProvider(new String[] {"class", "public", "tags", "calls", "arguments", "scope"}));
 

src/fr/adrienbrault/idea/symfony2plugin/util/SymfonyBundleFileCompletionProvider.java

@@ -19,13 +19,14 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
+import java.util.List;
 
 public class SymfonyBundleFileCompletionProvider extends CompletionProvider<CompletionParameters> {
 
-    private String path;
+    private String[] paths;
 
-    public SymfonyBundleFileCompletionProvider(String path) {
-        this.path = path;
+    public SymfonyBundleFileCompletionProvider(String... paths) {
+        this.paths = paths;
     }
 
     @Override
@@ -38,22 +39,12 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters
         PhpIndex phpIndex = PhpIndex.getInstance(completionParameters.getPosition().getProject());
 
         SymfonyBundleUtil symfonyBundleUtil = new SymfonyBundleUtil(phpIndex);
-        ArrayList<BundleFile> bundleFiles = new ArrayList<BundleFile>();
+        List<BundleFile> bundleFiles = new ArrayList<BundleFile>();
 
         for(SymfonyBundle symfonyBundle : symfonyBundleUtil.getBundles()) {
-
-            VirtualFile virtualFile = symfonyBundle.getRelative(this.path);
-            if(virtualFile != null) {
-                final BundleContentIterator bundleContentIterator = new BundleContentIterator(symfonyBundle, bundleFiles, completionParameters.getPosition().getProject());
-                VfsUtil.visitChildrenRecursively(virtualFile, new VirtualFileVisitor() {
-                    @Override
-                    public boolean visitFile(@NotNull VirtualFile virtualFile) {
-                        bundleContentIterator.processFile(virtualFile);
-                        return super.visitFile(virtualFile);
-                    }
-                });
+            for(String path: this.paths) {
+                visitPath(completionParameters, bundleFiles, symfonyBundle, path);
             }
-
         }
 
         for(BundleFile bundleFile : bundleFiles) {
@@ -62,13 +53,31 @@ public boolean visitFile(@NotNull VirtualFile virtualFile) {
 
     }
 
+    private void visitPath(CompletionParameters completionParameters, List<BundleFile> bundleFiles, SymfonyBundle symfonyBundle, String path) {
+
+        VirtualFile virtualFile = symfonyBundle.getRelative(path);
+        if(virtualFile == null) {
+            return;
+        }
+
+        final BundleContentIterator bundleContentIterator = new BundleContentIterator(symfonyBundle, bundleFiles, completionParameters.getPosition().getProject());
+        VfsUtil.visitChildrenRecursively(virtualFile, new VirtualFileVisitor() {
+            @Override
+            public boolean visitFile(@NotNull VirtualFile virtualFile) {
+                bundleContentIterator.processFile(virtualFile);
+                return super.visitFile(virtualFile);
+            }
+        });
+
+    }
+
     private class BundleContentIterator implements ContentIterator{
 
         private SymfonyBundle symfonyBundle;
-        private ArrayList<BundleFile> bundleFiles;
+        private List<BundleFile> bundleFiles;
         private Project project;
 
-        public BundleContentIterator(SymfonyBundle symfonyBundle, ArrayList<BundleFile> bundleFiles, Project project) {
+        public BundleContentIterator(SymfonyBundle symfonyBundle, List<BundleFile> bundleFiles, Project project) {
             this.symfonyBundle = symfonyBundle;
             this.bundleFiles = bundleFiles;
             this.project = project;