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

rename: ignore refactoring conflicts in tests based on property

Browse Source
This commit is contained in:
Anna.Kozlova
2018-07-11 09:20:19 +02:00
parent ce6705393f
commit 5e3e81045f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java
+2 -1
View File
@@ -136,7 +136,8 @@ public class RenameProcessor extends BaseRefactoringProcessor {
.conflictsDetected("refactoring.rename", conflictData);
if (ApplicationManager.getApplication().isUnitTestMode()) {
throw new ConflictsInTestsException(conflicts.values());
if (!ConflictsInTestsException.isTestIgnore()) throw new ConflictsInTestsException(conflicts.values());
return true;
}
ConflictsDialog conflictsDialog = prepareConflictsDialog(conflicts, refUsages.get());
if (!conflictsDialog.showAndGet()) {