MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

Inlining action: : minor fixes (IDEA-CR-42043)

Browse Source 
1. MultiMap.empty() instead of new instance
2. don't process conflicts in test when ignored
This commit is contained in:
Artemiy Sartakov
2019-02-01 15:21:39 +07:00
parent 4b5b6574aa
commit 3971cd929b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java
View File

@@ -382,7 +382,8 @@ public abstract class BaseRefactoringProcessor implements Runnable {
public static boolean processConflicts(@NotNull Project project, @NotNull MultiMap<PsiElement, String> conflicts) {
if (conflicts.isEmpty()) return true;
if (ApplicationManager.getApplication().isUnitTestMode() && !BaseRefactoringProcessor.ConflictsInTestsException.isTestIgnore()) {
if (ApplicationManager.getApplication().isUnitTestMode()) {
if (BaseRefactoringProcessor.ConflictsInTestsException.isTestIgnore()) return true;
throw new BaseRefactoringProcessor.ConflictsInTestsException(conflicts.values());
}