Skip to content

Optimize service collector and component index pattern #2764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Haehnchen merged 1 commit into from
Apr 26, 2026
Merged

Optimize service collector and component index pattern #2764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 36 additions & 9 deletions src/main/java/fr/adrienbrault/idea/symfony2plugin/config/ServiceLineMarkerProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,22 +67,31 @@ public void collectSlowLineMarkers(@NotNull List<? extends PsiElement> psiElemen
var classNamePattern = PhpElementsUtil.getClassNamePattern();
var classMethodNamePattern = PhpElementsUtil.getClassMethodNamePattern();
var constraintMessagePattern = ConstraintMessageGotoCompletionRegistrar.getConstraintPropertyMessagePattern();
Supplier<ContainerCollectionResolver.ServiceCollector> serviceCollectorSupplier = null;

for(PsiElement psiElement: psiElements) {
if(methodReturnPattern.accepts(psiElement)) {
this.formNameMarker(psiElement, results);
}

if(classNamePattern.accepts(psiElement)) {
this.classNameMarker(project, psiElement, results);
if (serviceCollectorSupplier == null) {
serviceCollectorSupplier = new LazyServiceCollector(project);
}

this.classNameMarker(project, psiElement, results, serviceCollectorSupplier);
this.entityClassMarker(project, psiElement, results);
this.repositoryClassMarker(project, psiElement, results);
this.validatorClassMarker(project, psiElement, results);
this.constraintValidatorClassMarker(project, psiElement, results);
}

if(classMethodNamePattern.accepts(psiElement)) {
this.autowireConstructorMarker(project, psiElement, results);
if (serviceCollectorSupplier == null) {
serviceCollectorSupplier = new LazyServiceCollector(project);
}

this.autowireConstructorMarker(project, psiElement, results, serviceCollectorSupplier);
}

// public $message = 'This value should not be blank.';
Expand All @@ -92,21 +101,21 @@ public void collectSlowLineMarkers(@NotNull List<? extends PsiElement> psiElemen
}
}

private void classNameMarker(@NotNull Project project, @NotNull PsiElement psiElement, Collection<? super RelatedItemLineMarkerInfo<?>> result) {
private void classNameMarker(@NotNull Project project, @NotNull PsiElement psiElement, Collection<? super RelatedItemLineMarkerInfo<?>> result, @NotNull Supplier<ContainerCollectionResolver.ServiceCollector> serviceCollectorSupplier) {
PsiElement phpClassContext = psiElement.getContext();
if(!(phpClassContext instanceof PhpClass) || ((PhpClass) phpClassContext).isAbstract()) {
return;
}

Icon serviceLineMarker = ExternalSystemIcons.Task;
Collection<ClassServiceDefinitionTargetLazyValue> targets = new ArrayList<>();
Collection<String> tags = new HashSet<>();
ContainerCollectionResolver.ServiceCollector serviceCollector = ContainerCollectionResolver.ServiceCollector.create(project);
ContainerCollectionResolver.ServiceCollector serviceCollector = serviceCollectorSupplier.get();
Set<String> serviceNames = serviceCollector.convertClassNameToServices(((PhpClass) phpClassContext).getFQN());
if (serviceNames.isEmpty()) {
return;
}

Icon serviceLineMarker = ExternalSystemIcons.Task;
Collection<ClassServiceDefinitionTargetLazyValue> targets = new ArrayList<>();
Collection<String> tags = new HashSet<>();
targets.add(new ClassServiceDefinitionTargetLazyValue(project, ((PhpClass) phpClassContext).getFQN()));

if (hasResourcePrototypeMetadata(serviceNames, serviceCollector)) {
Expand Down Expand Up @@ -283,7 +292,7 @@ private void constraintValidatorClassMarker(@NotNull Project project, PsiElement
results.add(builder.createLineMarkerInfo(psiElement));
}

private void autowireConstructorMarker(@NotNull Project project, @NotNull PsiElement psiElement, Collection<? super LineMarkerInfo<?>> results) {
private void autowireConstructorMarker(@NotNull Project project, @NotNull PsiElement psiElement, Collection<? super LineMarkerInfo<?>> results, @NotNull Supplier<ContainerCollectionResolver.ServiceCollector> serviceCollectorSupplier) {
PsiElement method = psiElement.getParent();
if (!(method instanceof Method)) {
return;
Expand All @@ -301,7 +310,7 @@ private void autowireConstructorMarker(@NotNull Project project, @NotNull PsiEle
boolean isAutowire = false;

Collection<ClassServiceDefinitionTargetLazyValue> targets = new ArrayList<>();
ContainerCollectionResolver.ServiceCollector serviceCollector = ContainerCollectionResolver.ServiceCollector.create(project);
ContainerCollectionResolver.ServiceCollector serviceCollector = serviceCollectorSupplier.get();
for (String convertClassNameToService : serviceCollector.convertClassNameToServices(phpClass.getFQN())) {
ContainerService containerService = serviceCollector.getServices().get(convertClassNameToService);
if (containerService == null) {
Expand Down Expand Up @@ -366,4 +375,22 @@ public Collection<? extends PsiElement> get() {
return myTargets;
}
}

private static final class LazyServiceCollector implements Supplier<ContainerCollectionResolver.ServiceCollector> {
private final Project project;
private ContainerCollectionResolver.ServiceCollector serviceCollector;

private LazyServiceCollector(@NotNull Project project) {
this.project = project;
}

@Override
public @NotNull ContainerCollectionResolver.ServiceCollector get() {
if (serviceCollector == null) {
serviceCollector = ContainerCollectionResolver.ServiceCollector.create(project);
}

return serviceCollector;
}
}
}
2 changes: 1 addition & 1 deletion ...n/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigComponentUsageStubIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ private static Collection<Usage> getComponentUsages(@NotNull TwigFile twigFile)
twigFile.acceptChildren(new PsiRecursiveElementVisitor() {
@Override
public void visitElement(@NotNull PsiElement element) {
if (componentPattern.accepts(element)) {
if (element.getNode() != null && element.getNode().getElementType() == TwigTokenTypes.STRING_TEXT && componentPattern.accepts(element)) {
String componentName = PsiElementUtils.trimQuote(element.getText());
if (StringUtils.isNotBlank(componentName)) {
usages.add(new Usage(componentName, element, UsageType.FUNCTION));
Expand Down
Loading