provide "form" fallback on unknown from type and support nested strings Haehnchen#325

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/form/FormOptionGotoCompletionRegistrar.java

@@ -65,8 +65,8 @@ public GotoCompletionProvider getProvider(@Nullable PsiElement psiElement) {
  @Nullable
  private GotoCompletionProvider getMatchingOption(ParameterList parameterList, @NotNull PsiElement psiElement) {
 
- // form name can be a string alias
- String formTypeName = PsiElementUtils.getMethodParameterAt(parameterList, 1);
+ // form name can be a string alias; also resolve on constants, properties, ...
+ String formTypeName = PhpElementsUtil.getStringValue(PsiElementUtils.getMethodParameterPsiElementAt(parameterList, 1));
 
  // formtype is not a string, so try to find php class types
  if(formTypeName == null) {
@@ -76,6 +76,11 @@ private GotoCompletionProvider getMatchingOption(ParameterList parameterList, @N
  }
  }
 
+ // fallback to form
+ if(formTypeName == null) {
+ formTypeName = "form";
+ }
+
  return new FormReferenceCompletionProvider(psiElement, formTypeName);
  }