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 automatic renamer should not cancel rename itself (IDEA-145351)

Browse Source
This commit is contained in:
Anna Kozlova
2015-09-21 20:35:36 +03:00
parent 9aa17c7454
commit f04dbbdffe
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java
+5 -2
View File
@@ -230,9 +230,12 @@ public class RenameProcessor extends BaseRefactoringProcessor {
}
private boolean findRenamedVariables(final List<UsageInfo> variableUsages) {
for (final AutomaticRenamer automaticVariableRenamer : myRenamers) {
for (Iterator<AutomaticRenamer> iterator = myRenamers.iterator(); iterator.hasNext(); ) {
AutomaticRenamer automaticVariableRenamer = iterator.next();
if (!automaticVariableRenamer.hasAnythingToRename()) continue;
if (!showAutomaticRenamingDialog(automaticVariableRenamer)) return false;
if (!showAutomaticRenamingDialog(automaticVariableRenamer)) {
iterator.remove();
}
}
final Runnable runnable = new Runnable() {
platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
+1 -1
View File
@@ -241,7 +241,7 @@ public class VariableInplaceRenamer extends InplaceRefactoring {
if (!ApplicationManager.getApplication().isUnitTestMode()) {
final AutomaticRenamingDialog renamingDialog = new AutomaticRenamingDialog(myProject, renamer);
if (!renamingDialog.showAndGet()) {
return;
continue;
}
}