From 95e4dc18a583d433d7a5686ce4a2108bbda23832 Mon Sep 17 00:00:00 2001
From: Daniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Date: Thu, 3 Dec 2015 18:37:55 +0300
Subject: [PATCH] [groovy] do as less comparisons as possible when filtering
 methods in MethodResolverProcessor

---
 .../processors/MethodResolverProcessor.java        | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/MethodResolverProcessor.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/MethodResolverProcessor.java
index dac59b075ba5..a92a3ea05c1b 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/MethodResolverProcessor.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/MethodResolverProcessor.java
@@ -203,20 +203,24 @@ public class MethodResolverProcessor extends ResolverProcessor<GroovyMethodResul
    *        -1 if first is more preferable
    */
   private int compareMethods(@NotNull GroovyMethodResult result1, @NotNull GroovyMethodResult result2) {
-    PsiMethod method1 = result1.getElement();
-    PsiMethod method2 = result2.getElement();
+    final PsiMethod method1 = result1.getElement();
+    final PsiMethod method2 = result2.getElement();
 
     if (!method1.getName().equals(method2.getName())) return 0;
 
-    if (secondMethodIsPreferable(result1, result2)) {
-      if (secondMethodIsPreferable(result2, result1)) {
+    boolean firstIsPreferable = secondMethodIsPreferable(result2, result1);
+    boolean secondIsPreferable = secondMethodIsPreferable(result1, result2);
+
+    if (secondIsPreferable) {
+      if (firstIsPreferable) {
         if (method2 instanceof GrGdkMethod && !(method1 instanceof GrGdkMethod)) {
           return -1;
         }
       }
       return 1;
     }
-    if (secondMethodIsPreferable(result2, result1)) {
+
+    if (firstIsPreferable) {
       return -1;
     }