fix possible npe in yaml parameter completion Haehnchen#359

Author: Haehnchen

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

@@ -1,6 +1,7 @@
 package fr.adrienbrault.idea.symfony2plugin.dic;
 
 
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Arrays;
@@ -13,20 +14,21 @@ public class ContainerParameter {
  final private Collection<String> values;
 
  @Deprecated
- public ContainerParameter(String name, @Nullable String value) {
+ public ContainerParameter(@NotNull String name, @Nullable String value) {
  this(name, value, false);
  }
 
- public ContainerParameter(String name, @Nullable String value, boolean isWeak) {
+ public ContainerParameter(@NotNull String name, @Nullable String value, boolean isWeak) {
  this(name, Arrays.asList(value), isWeak);
  }
 
- public ContainerParameter(String name, Collection<String> values, boolean isWeak) {
+ public ContainerParameter(@NotNull String name, Collection<String> values, boolean isWeak) {
  this.name = name;
  this.values = values;
  this.isWeak = isWeak;
  }
 
+ @NotNull
  public String getName() {
  return name;
  }

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

@@ -11,6 +11,7 @@
 import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.ContainerParameterStubIndex;
 import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.ServicesDefinitionStubIndex;
 import fr.adrienbrault.idea.symfony2plugin.util.service.ServiceXmlParserFactory;
+import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.yaml.YAMLFileType;
@@ -318,7 +319,13 @@ private Map<String, ContainerParameter> getParameters() {
 
  if(this.sources.contains(Source.COMPILER)) {
  for(Map.Entry<String, String> Entry: ServiceXmlParserFactory.getInstance(project, ParameterServiceParser.class).getParameterMap().entrySet()) {
- this.containerParameterMap.put(Entry.getKey(), new ContainerParameter(Entry.getKey(), Entry.getValue()));
+
+ // user input here; secure nullable values
+ String key = Entry.getKey();
+ if(key != null) {
+ this.containerParameterMap.put(key, new ContainerParameter(key, Entry.getValue()));
+ }
+
  }
  }
 
@@ -328,6 +335,11 @@ private Map<String, ContainerParameter> getParameters() {
 
  for(String parameterName: projectUniqueKeysStrong.getResult()) {
 
+ // just for secure
+ if(parameterName == null) {
+ continue;
+ }
+
  // indexes is weak stuff, dont overwrite compiled ones
  if(!this.containerParameterMap.containsKey(parameterName)) {
  List<String> parameterValues = FileBasedIndexImpl.getInstance().getValues(ContainerParameterStubIndex.KEY, parameterName, getSearchScope(project));