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

cancel started rename: restore old name before proceed (IDEA-89001)

Browse Source
This commit is contained in:
anna
2012-07-23 21:37:33 +02:00
parent e94e2ba493
commit 816dfdcb81
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java
+9 -1
View File
@@ -104,7 +104,7 @@ public abstract class InplaceRefactoring {
protected String myAdvertisementText;
private ArrayList<RangeHighlighter> myHighlighters;
protected String myInitialName;
protected final String myOldName;
protected String myOldName;
protected RangeMarker myBeforeRevert = null;
protected String myInsertedName;
protected LinkedHashSet<String> myNameSuggestions;
@@ -273,6 +273,14 @@ public abstract class InplaceRefactoring {
return true;
}
else {
if (!ourRenamersStack.isEmpty() && ourRenamersStack.peek() == this) {
ourRenamersStack.pop();
if (!ourRenamersStack.empty()) {
myOldName = ourRenamersStack.peek().myOldName;
}
}
revertState();
final TemplateState templateState = TemplateManagerImpl.getTemplateState(InjectedLanguageUtil.getTopLevelEditor(myEditor));
if (templateState != null) {