variadic support also for completion and navigation inside doctrine querybuilder Haehnchen#357

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/util/MatcherUtil.java

@@ -10,11 +10,14 @@ public class MatcherUtil {
  private static MethodMatcher.CallToSignature[] SELECT_FIELDS = new MethodMatcher.CallToSignature[] {
  new MethodMatcher.CallToSignature("\\Doctrine\\ORM\\QueryBuilder", "orderBy"),
  new MethodMatcher.CallToSignature("\\Doctrine\\ORM\\QueryBuilder", "addOrderBy"),
+ new MethodMatcher.CallToSignature("\\Doctrine\\ORM\\QueryBuilder", "set"),
+ };
+
+ private static MethodMatcher.CallToSignature[] SELECT_FIELDS_VARIADIC = new MethodMatcher.CallToSignature[] {
  new MethodMatcher.CallToSignature("\\Doctrine\\ORM\\QueryBuilder", "select"),
  new MethodMatcher.CallToSignature("\\Doctrine\\ORM\\QueryBuilder", "addSelect"),
  new MethodMatcher.CallToSignature("\\Doctrine\\ORM\\QueryBuilder", "groupBy"),
  new MethodMatcher.CallToSignature("\\Doctrine\\ORM\\QueryBuilder", "addGroupBy"),
- new MethodMatcher.CallToSignature("\\Doctrine\\ORM\\QueryBuilder", "set"),
  };
 
  @Nullable
@@ -24,10 +27,16 @@ public static MethodMatcher.MethodMatchParameter matchPropertyField(PsiElement p
  return null;
  }
 
- MethodMatcher.MethodMatchParameter methodMatchParameter = new MethodMatcher.StringParameterMatcher(psiElement, 0)
+ MethodMatcher.MethodMatchParameter methodMatchParameter = new MethodMatcher.StringParameterAnyMatcher(psiElement)
  .withSignature(SELECT_FIELDS)
  .match();
 
+ if(methodMatchParameter == null) {
+ methodMatchParameter = new MethodMatcher.StringParameterAnyMatcher(psiElement)
+ .withSignature(SELECT_FIELDS_VARIADIC)
+ .match();
+ }
+
  if(methodMatchParameter == null) {
  methodMatchParameter = new MethodMatcher.ArrayParameterMatcher(psiElement, 0)
  .withSignature(SELECT_FIELDS)

src/fr/adrienbrault/idea/symfony2plugin/util/MethodMatcher.java

@@ -123,6 +123,35 @@ public MethodMatchParameter match() {
 
  }
 
+ public static class StringParameterAnyMatcher extends AbstractMethodParameterMatcher {
+
+ public StringParameterAnyMatcher(PsiElement psiElement) {
+ super(psiElement, -1);
+ }
+
+ @Nullable
+ public MethodMatchParameter match() {
+
+ if (!Symfony2ProjectComponent.isEnabled(psiElement)) {
+ return null;
+ }
+
+
+ MethodReferenceBag bag = PhpElementsUtil.getMethodParameterReferenceBag(psiElement);
+ if(bag == null) {
+ return null;
+ }
+
+ CallToSignature matchedMethodSignature = this.isCallTo(bag.getMethodReference());
+ if(matchedMethodSignature == null) {
+ return null;
+ }
+
+ return new MethodMatchParameter(matchedMethodSignature, bag.getParameterBag(), bag.getParameterList().getParameters(), bag.getMethodReference());
+ }
+
+ }
+
  public static class StringParameterRecursiveMatcher extends AbstractMethodParameterMatcher {
 
  public StringParameterRecursiveMatcher(PsiElement psiElement, int parameterIndex) {