MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

move initial name down in suggestions list (IDEA-85812)

Browse Source
This commit is contained in:
Anna Kozlova
2012-05-11 21:08:30 +04:00
parent e768be236b
commit 4db07b2ded
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/rename/JavaNameSuggestionProvider.java
+10 -12
View File
@@ -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;