1 files changed, 2 insertions, 13 deletions

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GrMethodMergingContributor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GrMethodMergingContributor.java
index e84361b0f57d..2c05dd7a3589 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GrMethodMergingContributor.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GrMethodMergingContributor.java
@@ -21,7 +21,6 @@ import com.intellij.codeInsight.lookup.LookupItem;
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.PsiParameter;
 import com.intellij.psi.PsiType;
-import com.intellij.psi.ResolveResult;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions.TypesUtil;
 import org.jetbrains.plugins.groovy.lang.psi.util.GroovyCommonClassNames;
@@ -46,13 +45,9 @@ public class GrMethodMergingContributor extends CompletionContributor {
     final LookupElement[] items = context.getItems();
     if (items.length > 1) {
       String commonName = null;
-      LookupElement best = null;
       final ArrayList<PsiMethod> allMethods = new ArrayList<PsiMethod>();
       for (LookupElement item : items) {
-        Object o = item.getObject();
-        if (o instanceof ResolveResult) {
-          o = ((ResolveResult)o).getElement();
-        }
+        Object o = item.getPsiElement();
         if (item.getUserData(LookupItem.FORCE_SHOW_SIGNATURE_ATTR) != null || !(o instanceof PsiMethod)) {
           return AutoCompletionDecision.SHOW_LOOKUP;
         }
@@ -76,17 +71,11 @@ public class GrMethodMergingContributor extends CompletionContributor {
           return AutoCompletionDecision.SHOW_LOOKUP;
         }
 
-        if (best == null && method.getParameterList().getParametersCount() > 0) {
-          best = item;
-        }
         commonName = name;
         allMethods.add(method);
         item.putUserData(JavaCompletionUtil.ALL_METHODS_ATTRIBUTE, allMethods);
       }
-      if (best == null) {
-        best = items[0];
-      }
-      return AutoCompletionDecision.insertItem(best);
+      return AutoCompletionDecision.insertItem(JavaMethodMergingContributor.findBestOverload(items));
     }
 
     return super.handleAutoCompletionPossibility(context);