From a91a2efc75d34b5018f03ddea0e0bdca035466e7 Mon Sep 17 00:00:00 2001
From: Jack Zhou <univerio@gmail.com>
Date: Tue, 28 May 2013 16:57:26 -0700
Subject: [PATCH] Create from usage: Extracted method from
 getNextAvailableName.

---
 .../jet/plugin/quickfix/CreateFunctionFromUsageFix.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/CreateFunctionFromUsageFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/CreateFunctionFromUsageFix.java
index 9e679f03ccb..61cba252247 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/CreateFunctionFromUsageFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/CreateFunctionFromUsageFix.java
@@ -1128,14 +1128,18 @@ public class CreateFunctionFromUsageFix extends CreateFromUsageFixBase {
      */
     @NotNull
     private static String getNextAvailableName(@NotNull String name, @NotNull Collection<String> existingNames, @Nullable JetScope scope) {
-        if (existingNames.contains(name) || (scope != null && scope.getClassifier(Name.identifier(name)) != null)) {
+        if (isConflictingName(name, existingNames, scope)) {
             int j = 1;
-            while (existingNames.contains(name + j) || (scope != null && scope.getClassifier(Name.identifier(name + j)) != null)) j++;
+            while (isConflictingName(name + j, existingNames, scope)) j++;
             name += j;
         }
         return name;
     }
 
+    private static boolean isConflictingName(@NotNull String name, @NotNull Collection<String> existingNames, @Nullable JetScope scope) {
+        return existingNames.contains(name) || (scope != null && scope.getClassifier(Name.identifier(name)) != null);
+    }
+
     @NotNull
     private static JetType[] guessTypesForExpression(@NotNull JetExpression expr, @NotNull BindingContext context) {
         JetType type = context.get(BindingContext.EXPRESSION_TYPE, expr);