From 2c98153c6c7a5c9428110dec79991d98c50c789c Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 18 Oct 2018 02:44:40 +0300 Subject: [PATCH] Use withIgnoredConflicts to fix compilation in 191 --- .../refactoring/AbstractMultifileRefactoringTest.kt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/AbstractMultifileRefactoringTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/AbstractMultifileRefactoringTest.kt index d61b438ddc2..ec74bc8c2df 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/AbstractMultifileRefactoringTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/AbstractMultifileRefactoringTest.kt @@ -130,14 +130,12 @@ fun runRefactoringTest( catch(e: BaseRefactoringProcessor.ConflictsInTestsException) { KotlinTestUtils.assertEqualsToFile(conflictFile, e.messages.distinct().sorted().joinToString("\n")) - BaseRefactoringProcessor.ConflictsInTestsException.setTestIgnore(true) - - // Run refactoring again with ConflictsInTestsException suppressed - action.runRefactoring(rootDir, mainPsiFile, elementsAtCaret, config) + BaseRefactoringProcessor.ConflictsInTestsException.withIgnoredConflicts { + // Run refactoring again with ConflictsInTestsException suppressed + action.runRefactoring(rootDir, mainPsiFile, elementsAtCaret, config) + } } finally { - BaseRefactoringProcessor.ConflictsInTestsException.setTestIgnore(false) - EditorFactory.getInstance()!!.releaseEditor(editor) } } \ No newline at end of file