migrate all index key collectors to project filtering ones

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/stubs/ContainerCollectionResolver.java

@@ -4,7 +4,6 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.util.indexing.FileBasedIndexImpl;
-import fr.adrienbrault.idea.symfony2plugin.Symfony2InterfacesUtil;
 import fr.adrienbrault.idea.symfony2plugin.config.component.parser.ParameterServiceParser;
 import fr.adrienbrault.idea.symfony2plugin.dic.ContainerParameter;
 import fr.adrienbrault.idea.symfony2plugin.dic.ContainerService;
@@ -147,7 +146,10 @@ public Map<String, ContainerService> getServices() {
             }
 
             if(this.sources.contains(Source.INDEX)) {
-                for(String serviceName: FileBasedIndexImpl.getInstance().getAllKeys(ServicesDefinitionStubIndex.KEY, project)) {
+                SymfonyProcessors.CollectProjectUniqueKeysStrong projectUniqueKeysStrong = new SymfonyProcessors.CollectProjectUniqueKeysStrong(project, ServicesDefinitionStubIndex.KEY, this.services.keySet());
+                FileBasedIndexImpl.getInstance().processAllKeys(ServicesDefinitionStubIndex.KEY, projectUniqueKeysStrong, project);
+
+                for(String serviceName: projectUniqueKeysStrong.getResult()) {
 
                     // we have higher priority on compiler, which already has safe value
                     if(!this.services.containsKey(serviceName)) {
@@ -239,7 +241,9 @@ private Set<String> getNames() {
             }
 
             if(this.sources.contains(Source.INDEX)) {
-                serviceNames.addAll(FileBasedIndexImpl.getInstance().getAllKeys(ServicesDefinitionStubIndex.KEY, project));
+                SymfonyProcessors.CollectProjectUniqueKeysStrong projectUniqueKeysStrong = new SymfonyProcessors.CollectProjectUniqueKeysStrong(project, ServicesDefinitionStubIndex.KEY, serviceNames);
+                FileBasedIndexImpl.getInstance().processAllKeys(ServicesDefinitionStubIndex.KEY, projectUniqueKeysStrong, project);
+                serviceNames.addAll(projectUniqueKeysStrong.getResult());
             }
 
             return serviceNames;
@@ -314,8 +318,10 @@ private Map<String, ContainerParameter> getParameters() {
             }
 
             if(this.sources.contains(Source.INDEX)) {
+                SymfonyProcessors.CollectProjectUniqueKeysStrong projectUniqueKeysStrong = new SymfonyProcessors.CollectProjectUniqueKeysStrong(project, ContainerParameterStubIndex.KEY, this.containerParameterMap.keySet());
+                FileBasedIndexImpl.getInstance().processAllKeys(ContainerParameterStubIndex.KEY, projectUniqueKeysStrong, project);
 
-                for(String parameterName: FileBasedIndexImpl.getInstance().getAllKeys(ContainerParameterStubIndex.KEY, project)) {
+                for(String parameterName: projectUniqueKeysStrong.getResult()) {
 
                     // indexes is weak stuff, dont overwrite compiled ones
                     if(!this.containerParameterMap.containsKey(parameterName)) {
@@ -354,7 +360,9 @@ private Set<String> getNames() {
             }
 
             if(this.sources.contains(Source.INDEX)) {
-                parameterNames.addAll(FileBasedIndexImpl.getInstance().getAllKeys(ContainerParameterStubIndex.KEY, project));
+                SymfonyProcessors.CollectProjectUniqueKeysStrong projectUniqueKeysStrong = new SymfonyProcessors.CollectProjectUniqueKeysStrong(project, ContainerParameterStubIndex.KEY, parameterNames);
+                FileBasedIndexImpl.getInstance().processAllKeys(ContainerParameterStubIndex.KEY, projectUniqueKeysStrong, project);
+                parameterNames.addAll(projectUniqueKeysStrong.getResult());
             }
 
             return parameterNames;

src/fr/adrienbrault/idea/symfony2plugin/translation/dict/TranslationUtil.java

@@ -12,6 +12,8 @@
 import com.intellij.util.Processor;
 import com.intellij.util.indexing.FileBasedIndexImpl;
 import com.jetbrains.php.PhpIndex;
+import fr.adrienbrault.idea.symfony2plugin.stubs.SymfonyProcessors;
+import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.ServicesDefinitionStubIndex;
 import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.YamlTranslationStubIndex;
 import fr.adrienbrault.idea.symfony2plugin.translation.TranslationIndex;
 import fr.adrienbrault.idea.symfony2plugin.translation.TranslatorLookupElement;
@@ -181,8 +183,11 @@ public static List<LookupElement> getTranslationDomainLookupElements(Project pro
             lookupElements.add(new TranslatorLookupElement(domainKey, domainKey));
         }
 
+        SymfonyProcessors.CollectProjectUniqueKeysStrong projectUniqueKeysStrong = new SymfonyProcessors.CollectProjectUniqueKeysStrong(project, YamlTranslationStubIndex.KEY, domainList);
+        FileBasedIndexImpl.getInstance().processAllKeys(YamlTranslationStubIndex.KEY, projectUniqueKeysStrong, project);
+
         // attach index domains as weak one
-        for(String domainKey: FileBasedIndexImpl.getInstance().getAllKeys(YamlTranslationStubIndex.KEY, project)) {
+        for(String domainKey: projectUniqueKeysStrong.getResult()) {
             if(!domainList.contains(domainKey)) {
                 lookupElements.add(new TranslatorLookupElement(domainKey, domainKey, true));
             }