From 4db07b2dedd08e2ba1dea61edefb1aee8641949c Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 11 May 2012 21:07:31 +0400
Subject: [PATCH] move initial name down in suggestions list (IDEA-85812)

---
 .../rename/JavaNameSuggestionProvider.java    | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/rename/JavaNameSuggestionProvider.java b/java/java-impl/src/com/intellij/refactoring/rename/JavaNameSuggestionProvider.java
index ca963ae53b93..9719658cca2e 100644
--- a/java/java-impl/src/com/intellij/refactoring/rename/JavaNameSuggestionProvider.java
+++ b/java/java-impl/src/com/intellij/refactoring/rename/JavaNameSuggestionProvider.java
@@ -80,20 +80,10 @@ public class JavaNameSuggestionProvider implements NameSuggestionProvider {
       }
     }
     final String[] strings = info != null ? info.names : ArrayUtil.EMPTY_STRING_ARRAY;
-    ArrayList<String> list = new ArrayList<String>(Arrays.asList(strings));
+    final ArrayList<String> list = new ArrayList<String>(Arrays.asList(strings));
     final String[] properlyCased = suggestProperlyCasedName(element);
-    if (!list.contains(initialName)) {
-      list.add(0, initialName);
-    }
-    else {
-      int i = list.indexOf(initialName);
-      list.remove(i);
-      list.add(0, initialName);
-    }
     if (properlyCased != null) {
-      for (String properlyCasedSuggestion : properlyCased) {
-        list.add(1, properlyCasedSuggestion);
-      }
+      Collections.addAll(list, properlyCased);
     }
     if (parameterName != null && !list.contains(parameterName)) {
       list.add(parameterName);
@@ -101,6 +91,14 @@ public class JavaNameSuggestionProvider implements NameSuggestionProvider {
     if (superMethodName != null && !list.contains(superMethodName)) {
       list.add(0, superMethodName);
     }
+    if (!list.contains(initialName)) {
+      list.add(initialName);
+    }
+    else {
+      int i = list.indexOf(initialName);
+      list.remove(i);
+      list.add(initialName);
+    }
     ContainerUtil.removeDuplicates(list);
     result.addAll(list);
     return info;