Skip to content

Commit e0d5bb9

Browse files
committed
use central parameter naming as its now highly optimized
1 parent 2f1216b commit e0d5bb9

File tree

1 file changed

+3
-28
lines changed

1 file changed

+3
-28
lines changed

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

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ private String resolve(@Nullable String paramOrClassName) {
447447
return paramOrClassName;
448448
}
449449

450-
450+
@NotNull
451451
private Map<String, ContainerParameter> getParameters() {
452452
if(this.containerParameterMap != null) {
453453
return this.containerParameterMap;
@@ -523,34 +523,9 @@ private Map<String, ContainerParameter> getParameters() {
523523
return this.containerParameterMap = parametersMap;
524524
}
525525

526+
@NotNull
526527
private Set<String> getNames() {
527-
// use overall map if already generated
528-
if(this.containerParameterMap != null) {
529-
return this.containerParameterMap.keySet();
530-
}
531-
532-
Set<String> parameterNames = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
533-
534-
// local filesystem
535-
parameterNames.addAll(ServiceXmlParserFactory.getInstance(project, ParameterServiceParser.class).getParameterMap().keySet());
536-
537-
// index
538-
parameterNames.addAll(
539-
FileIndexCaches.getIndexKeysCache(project, SERVICE_PARAMETER_INDEX_NAMES, ContainerParameterStubIndex.KEY)
540-
);
541-
542-
// setParameter("foo") for ContainerBuilder
543-
for (ContainerBuilderCall call : FileBasedIndex.getInstance().getValues(ContainerBuilderStubIndex.KEY, "setParameter", GlobalSearchScope.allScope(project))) {
544-
Collection<String> parameter = call.getParameter();
545-
if(parameter != null) {
546-
parameterNames.addAll(parameter);
547-
}
548-
}
549-
550-
551-
return parameterNames;
528+
return getParameters().keySet();
552529
}
553-
554530
}
555-
556531
}

0 commit comments

Comments
 (0)