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

kotlin: better diagnostics in tests

Browse Source 
GitOrigin-RevId: 8434b60093f7972d3a4d86e10d43466cb7e1f17a
This commit is contained in:
Max Medvedev
2025-07-10 14:50:22 +00:00
committed by intellij-monorepo-bot
parent 3fa0978993
commit 191ae630ce
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/AbstractMultifileRefactoringTest.kt
+3 -3
View File
@@ -99,10 +99,10 @@ fun runRefactoringTest(
) {
val mainFilePath = config.getNullableString("mainFile") ?: config.getAsJsonArray("filesToMove").first().asString
val conflictFile = alternativeConflicts
val conflictFile = (alternativeConflicts
?.let { File(File(path).parentFile, alternativeConflicts) }?.takeIf { it.exists() }
?: File(File(path).parentFile, "conflicts.k2.txt").takeIf { KotlinPluginModeProvider.isK2Mode() && it.exists() }
?: File(File(path).parentFile, "conflicts.txt")
?: File(File(path).parentFile, "conflicts.txt")).normalize()
val mainFile = rootDir.findFileByRelativePath(mainFilePath)!!
val mainPsiFile = PsiManager.getInstance(project).findFile(mainFile)!!
@@ -121,7 +121,7 @@ fun runRefactoringTest(
try {
action.runRefactoring(rootDir, mainPsiFile, elementsAtCaret, config)
assert(!conflictFile.exists())
assert(!conflictFile.exists()) { "Conflict file $conflictFile should not exist" }
} catch (e: BaseRefactoringProcessor.ConflictsInTestsException) {
KotlinTestUtils.assertEqualsToFile(conflictFile, e.messages.sorted().joinToString("\n"))