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

automatic renames: suggestions: use user's new name if old name were the same (IDEA-70521)

Browse Source
This commit is contained in:
anna
2012-02-09 18:51:10 +01:00
parent 8313dbbbda
commit 17b2b9bbee
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/refactoring/rename/naming/AutomaticRenamer.java
+11 -6
View File
@@ -109,13 +109,18 @@ public abstract class AutomaticRenamer {
final PsiNamedElement element = myElements.get(varIndex);
final String name = element.getName();
if (!myRenames.containsKey(element)) {
String canonicalName = nameToCanonicalName(name, element);
final String newCanonicalName = suggester.suggestName(canonicalName);
if (newCanonicalName.length() == 0) {
LOG.error("oldClassName = " + oldClassName + ", newClassName = " + newClassName + ", name = " + name + ", canonicalName = " +
canonicalName + ", newCanonicalName = " + newCanonicalName);
String newName;
if (oldClassName.equals(name)) {
newName = newClassName;
} else {
String canonicalName = nameToCanonicalName(name, element);
final String newCanonicalName = suggester.suggestName(canonicalName);
if (newCanonicalName.length() == 0) {
LOG.error("oldClassName = " + oldClassName + ", newClassName = " + newClassName + ", name = " + name + ", canonicalName = " +
canonicalName + ", newCanonicalName = " + newCanonicalName);
}
newName = canonicalNameToName(newCanonicalName, element);
}
String newName = canonicalNameToName(newCanonicalName, element);
if (!newName.equals(name)) {
myRenames.put(element, newName);
}