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

IDEA-86405 "Implement methods" fails to alpha-rename type variables that conflict with class type parameters fixed

Browse Source
This commit is contained in:
Danila Ponomarenko
2012-06-15 15:19:05 +04:00
parent 1abe4e0842
commit 9da692026b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersUtil.java
+6 -6
View File
@@ -305,13 +305,13 @@ public class GenerateMembersUtil {
@NotNull
private static String suggestUniqueTypeParameterName(@NonNls String baseName, @NotNull PsiTypeParameterList typeParameterList, @Nullable PsiClass targetClass) {
String newName = baseName;
int index = 0;
while ((!checkUniqueTypeParameterName(newName, typeParameterList)) || (targetClass != null && !checkUniqueTypeParameterName(newName, targetClass.getTypeParameterList()))) {
newName = baseName + ++index;
int i =0;
while (true) {
final String newName = baseName + ++i;
if (checkUniqueTypeParameterName(newName, typeParameterList) && (targetClass == null || checkUniqueTypeParameterName(newName, targetClass.getTypeParameterList()))){
return newName;
}
}
return newName;
}