rearrange querybuilder completion condition checks, to do all the stuff after method match Haehnchen#371

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderCompletionContributor.java

@@ -173,8 +173,13 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters
  return;
  }
 
- // $qb->andWhere('foo.id = ":foo_id"')
- addParameterNameCompletion(completionParameters, completionResultSet, psiElement);
+ MethodMatcher.MethodMatchParameter methodMatchParameter = new MethodMatcher.StringParameterMatcher(psiElement.getContext(), 0)
+ .withSignature(WHERES)
+ .match();
+
+ if(methodMatchParameter == null) {
+ return;
+ }
 
  // querybuilder parser is too slow longer values, and that dont make sense here at all
  // user can fire a manual completion event, when needed...
@@ -186,13 +191,8 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters
  }
  }
 
- MethodMatcher.MethodMatchParameter methodMatchParameter = new MethodMatcher.StringParameterMatcher(psiElement.getContext(), 0)
- .withSignature(WHERES)
- .match();
-
- if(methodMatchParameter == null) {
- return;
- }
+ // $qb->andWhere('foo.id = ":foo_id"')
+ addParameterNameCompletion(completionParameters, completionResultSet, psiElement);
 
  QueryBuilderMethodReferenceParser qb = getQueryBuilderParser(methodMatchParameter.getMethodReference());
  if(qb == null) {