Skip to content

support default form types for different Symfony versions #1343

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
merged 1 commit into from
Jul 21, 2019
Merged

support default form types for different Symfony versions #1343

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
36 changes: 20 additions & 16 deletions ...main/java/fr/adrienbrault/idea/symfony2plugin/form/FormOptionGotoCompletionRegistrar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.*;

/**
* @author Daniel Espendiller <daniel@espendiller.net>
Expand Down Expand Up @@ -81,36 +79,35 @@ public GotoCompletionProvider getProvider(@NotNull PsiElement psiElement) {
return null;
}

@Nullable
private GotoCompletionProvider getMatchingOption(ParameterList parameterList, @NotNull PsiElement psiElement) {

// form name can be a string alias; also resolve on constants, properties, ...
PsiElement psiElementAt = PsiElementUtils.getMethodParameterPsiElementAt(parameterList, 1);

String formTypeName = null;
Set<String> formTypeNames = new HashSet<>();
if(psiElementAt != null) {
PhpClass phpClass = FormUtil.getFormTypeClassOnParameter(psiElementAt);
if(phpClass != null) {
formTypeName = phpClass.getFQN();
formTypeNames.add(phpClass.getFQN());
}
}

// fallback to form
if(formTypeName == null) {
formTypeName = "form";
if(formTypeNames.size() == 0) {
formTypeNames.add("form"); // old Symfony systems
formTypeNames.add("Symfony\\Component\\Form\\Extension\\Core\\Type\\FormType");
}

return new FormReferenceCompletionProvider(psiElement, formTypeName);
return new FormReferenceCompletionProvider(psiElement, formTypeNames);
}
}

private static class FormReferenceCompletionProvider extends GotoCompletionProvider {
@NotNull
private final Collection<String> formTypes;

private final String formType;

FormReferenceCompletionProvider(@NotNull PsiElement element, @NotNull String formType) {
FormReferenceCompletionProvider(@NotNull PsiElement element, @NotNull Collection<String> formTypes) {
super(element);
this.formType = formType;
this.formTypes = formTypes;
}

@NotNull
Expand All @@ -127,14 +124,21 @@ public Collection<PsiElement> getPsiTargets(PsiElement psiElement) {
}

final Collection<PsiElement> psiElements = new ArrayList<>();
FormOptionsUtil.visitFormOptions(getProject(), formType, new FormOptionTargetVisitor(value, psiElements));
for (String formType : formTypes) {
FormOptionsUtil.visitFormOptions(getProject(), formType, new FormOptionTargetVisitor(value, psiElements));
}

return psiElements;
}

@NotNull
public Collection<LookupElement> getLookupElements() {
Collection<LookupElement> lookupElements = new ArrayList<>();
FormOptionsUtil.visitFormOptions(getProject(), formType, new FormOptionLookupVisitor(lookupElements));

for (String formType : formTypes) {
FormOptionsUtil.visitFormOptions(getProject(), formType, new FormOptionLookupVisitor(lookupElements));
}

return lookupElements;
}
}
Expand Down