From e71a340f8d116b2fa79f5106d597e3ceb2bb23e9 Mon Sep 17 00:00:00 2001 From: Roman Vasiliev Date: Thu, 17 Oct 2024 16:22:21 +0200 Subject: [PATCH] [evaluation-plugin] LME-66 Update conflict dataset format GitOrigin-RevId: 0058454d22e9353fb1155e6a53586b570acfd28c --- .../conflictResolution/ConflictEnvironment.kt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/plugins/evaluation-plugin/src/com/intellij/cce/evaluable/conflictResolution/ConflictEnvironment.kt b/plugins/evaluation-plugin/src/com/intellij/cce/evaluable/conflictResolution/ConflictEnvironment.kt index d73d96c55af5..cd035b96f08e 100644 --- a/plugins/evaluation-plugin/src/com/intellij/cce/evaluable/conflictResolution/ConflictEnvironment.kt +++ b/plugins/evaluation-plugin/src/com/intellij/cce/evaluable/conflictResolution/ConflictEnvironment.kt @@ -9,6 +9,7 @@ import com.intellij.cce.interpreter.InterpretFilter import com.intellij.cce.interpreter.InterpretationHandler import com.intellij.cce.interpreter.InterpretationOrder import java.nio.file.Path +import kotlin.io.path.isDirectory import kotlin.io.path.listDirectoryEntries import kotlin.io.path.name import kotlin.io.path.readText @@ -34,7 +35,7 @@ class ConflictEnvironment( ) : EvaluationChunk { override val name: String = "${fileConflict.hash} - ${fileConflict.fileName}" override val datasetName: String = datasetRef.name - override val presentationText: String = readText("result") + override val presentationText: String = readText("target") override fun evaluate( handler: InterpretationHandler, @@ -46,7 +47,7 @@ class ConflictEnvironment( base = readText("base"), parent1 = readText("parent1"), parent2 = readText("parent2"), - target = readText("result"), + target = readText("target"), ) val resolvedConflicts = conflictResolver.resolveConflicts(props) @@ -125,12 +126,12 @@ ${conflicts.text(TextLabel.PARENT_2, conflictIndex).trimEnd()} private fun Path.conflicts() = listDirectoryEntries() .flatMap { repoDir -> - repoDir.listDirectoryEntries().map { - val (hash, conflictCount, fileName) = it.name.split(" - ") + repoDir.listDirectoryEntries().filter { it.isDirectory() }.map { + val (hash, fileName, conflictCount) = it.name.split(" - ") FileConflict(hash, fileName, conflictCount.toInt(), it) } } - .sortedBy { "${it.hash} ${it.fileName}" } + .sortedBy { "${it.path.parent.name} ${it.hash} ${it.fileName}" } private data class FileConflict(val hash: String, val fileName: String, val conflictCount: Int, val path: Path) }