provide autocompletion for DIC parameters defined dynamically Haehnchen#478

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/dic/ContainerParameter.java

@@ -4,8 +4,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 
 public class ContainerParameter {
 
@@ -18,8 +18,12 @@ public ContainerParameter(@NotNull String name, @Nullable String value) {
  this(name, value, false);
  }
 
+ public ContainerParameter(@NotNull String name, boolean isWeak) {
+ this(name, Collections.emptyList(), isWeak);
+ }
+
  public ContainerParameter(@NotNull String name, @Nullable String value, boolean isWeak) {
- this(name, Arrays.asList(value), isWeak);
+ this(name, Collections.singletonList(value), isWeak);
  }
 
  public ContainerParameter(@NotNull String name, Collection<String> values, boolean isWeak) {

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

@@ -4,14 +4,17 @@
 import com.intellij.openapi.util.Key;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.CachedValue;
+import com.intellij.util.indexing.FileBasedIndexImpl;
 import fr.adrienbrault.idea.symfony2plugin.config.component.parser.ParameterServiceParser;
 import fr.adrienbrault.idea.symfony2plugin.dic.ContainerParameter;
 import fr.adrienbrault.idea.symfony2plugin.dic.ContainerService;
 import fr.adrienbrault.idea.symfony2plugin.dic.XmlServiceParser;
 import fr.adrienbrault.idea.symfony2plugin.dic.container.ServiceInterface;
+import fr.adrienbrault.idea.symfony2plugin.dic.container.dict.ContainerBuilderCall;
 import fr.adrienbrault.idea.symfony2plugin.dic.webDeployment.ServiceContainerRemoteFileStorage;
 import fr.adrienbrault.idea.symfony2plugin.routing.webDeployment.RoutingRemoteFileStorage;
 import fr.adrienbrault.idea.symfony2plugin.stubs.cache.FileIndexCaches;
+import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.ContainerBuilderStubIndex;
 import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.ContainerParameterStubIndex;
 import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.ServicesDefinitionStubIndex;
 import fr.adrienbrault.idea.symfony2plugin.util.service.ServiceXmlParserFactory;
@@ -371,7 +374,7 @@ private Map<String, ContainerParameter> getParameters() {
  return this.containerParameterMap;
  }
 
- this.containerParameterMap = new TreeMap<String, ContainerParameter>(String.CASE_INSENSITIVE_ORDER);
+ this.containerParameterMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
 
  if(this.sources.contains(Source.COMPILER)) {
  // local filesystem
@@ -400,6 +403,23 @@ private Map<String, ContainerParameter> getParameters() {
  }
  }
 
+ // setParameter("foo") for ContainerBuilder
+ for (ContainerBuilderCall call : FileBasedIndexImpl.getInstance().getValues(ContainerBuilderStubIndex.KEY, "setParameter", GlobalSearchScope.allScope(project))) {
+ Collection<String> parameters = call.getParameter();
+ if(parameters == null || parameters.size() == 0) {
+ continue;
+ }
+
+ for (String parameter : parameters) {
+ if(this.containerParameterMap.containsKey(parameter)) {
+ continue;
+ }
+
+ this.containerParameterMap.put(parameter, new ContainerParameter(parameter, true));
+ }
+
+ }
+
  }
 
  return this.containerParameterMap;
@@ -413,7 +433,7 @@ private Set<String> getNames() {
  return this.containerParameterMap.keySet();
  }
 
- Set<String> parameterNames = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
+ Set<String> parameterNames = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
 
  if(this.sources.contains(Source.COMPILER)) {
  // local filesystem
@@ -424,11 +444,17 @@ private Set<String> getNames() {
  parameterNames.addAll(
  FileIndexCaches.getIndexKeysCache(project, SERVICE_PARAMETER_INDEX_NAMES, ContainerParameterStubIndex.KEY)
  );
+
+ // setParameter("foo") for ContainerBuilder
+ for (ContainerBuilderCall call : FileBasedIndexImpl.getInstance().getValues(ContainerBuilderStubIndex.KEY, "setParameter", GlobalSearchScope.allScope(project))) {
+ Collection<String> parameter = call.getParameter();
+ if(parameter != null) {
+ parameterNames.addAll(parameter);
+ }
+ }
  }
 
  return parameterNames;
-
-
  }
 
  }

tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/ContainerCollectionResolverTest.java

@@ -1,10 +1,12 @@
 package fr.adrienbrault.idea.symfony2plugin.tests.stubs;
 
+import fr.adrienbrault.idea.symfony2plugin.dic.ContainerParameter;
 import fr.adrienbrault.idea.symfony2plugin.dic.ContainerService;
 import fr.adrienbrault.idea.symfony2plugin.stubs.ContainerCollectionResolver;
 import fr.adrienbrault.idea.symfony2plugin.tests.SymfonyLightCodeInsightFixtureTestCase;
 import org.jetbrains.yaml.YAMLFileType;
 
+import java.io.File;
 import java.util.Set;
 
 /**
@@ -50,6 +52,12 @@ public void setUp() throws Exception {
  " foo_datetime:\n" +
  " class: %bar%\n"
  );
+
+ myFixture.copyFileToProject("ContainerBuilder.php");
+ }
+
+ public String getTestDataPath() {
+ return new File(this.getClass().getResource("fixtures").getFile()).getAbsolutePath();
  }
 
  public void testCaseInsensitiveService() {
@@ -94,4 +102,11 @@ public void testThatAliasedServiceIsEqualWithMainService() {
  assertEquals("DateTime", ContainerCollectionResolver.getService(getProject(), "foo_as_alias").getClassName());
  assertEquals("DateTime", ContainerCollectionResolver.getService(getProject(), "foo").getClassName());
  }
+
+ public void testThatContainerBuilderParameterAreCollected() {
+ assertContainsElements(ContainerCollectionResolver.getParameterNames(getProject()), "container.builder.parameter");
+ ContainerParameter containerParameter = ContainerCollectionResolver.getParameters(getProject()).get("container.builder.parameter");
+ assertNotNull(containerParameter);
+ assertTrue(containerParameter.isWeak());
+ }
 }

tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/fixtures/ContainerBuilder.php

@@ -0,0 +1,10 @@
+<?php
+
+class Foo
+{
+ public function process(\Symfony\Component\DependencyInjection\ContainerBuilder $c)
+ {
+ $c->setParameter('container.builder.parameter');
+ }
+
+}