azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use withIgnoredConflicts to fix compilation in 191

Browse Source
This commit is contained in:
Nikolay Krasko
2018-10-18 02:44:40 +03:00
parent e3d7edb6ce
commit 2c98153c6c
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/refactoring/AbstractMultifileRefactoringTest.kt
+4 -6
View File
@@ -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<Throwable> {
// Run refactoring again with ConflictsInTestsException suppressed
action.runRefactoring(rootDir, mainPsiFile, elementsAtCaret, config)
}
}
finally {
BaseRefactoringProcessor.ConflictsInTestsException.setTestIgnore(false)
EditorFactory.getInstance()!!.releaseEditor(editor)
}
}