From 988e51ec3f17cb43cf0412b4002507f1255e8ef6 Mon Sep 17 00:00:00 2001 From: Roman Vasiliev Date: Thu, 10 Oct 2024 14:01:57 +0200 Subject: [PATCH] [evaluation-plugin] LME-66 Remove redundant session count in chunks GitOrigin-RevId: b13b5d73d5944c0eb97e460b0a5814c70eb1ed60 --- .../src/com/intellij/cce/actions/CsvDataset.kt | 3 +-- .../src/com/intellij/cce/actions/EvaluationDataset.kt | 1 - .../src/com/intellij/cce/actions/ProjectActionsDataset.kt | 1 - .../cce/evaluable/conflictResolution/ConflictDataset.kt | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/plugins/evaluation-plugin/src/com/intellij/cce/actions/CsvDataset.kt b/plugins/evaluation-plugin/src/com/intellij/cce/actions/CsvDataset.kt index 67099c244055..283729386ea1 100644 --- a/plugins/evaluation-plugin/src/com/intellij/cce/actions/CsvDataset.kt +++ b/plugins/evaluation-plugin/src/com/intellij/cce/actions/CsvDataset.kt @@ -67,7 +67,6 @@ class CsvDataset( result += object : EvaluationDatasetChunk { override val datasetName: String = this@CsvDataset.datasetRef.name override val name: String = "$datasetName:${offset - rows.size + 1}-${offset}" - override val sessionCount: Int = calls.size override val presentationText: String = presentationText.toString() override fun evaluate( @@ -87,7 +86,7 @@ class CsvDataset( val session = featureInvoker.callFeature(call.expectedText, call.offset, call.nodeProperties) sessions += session sessionHandler(session) - if (handler.onSessionFinished(name, sessionCount - sessions.size)) { + if (handler.onSessionFinished(name, calls.size - sessions.size)) { break } } diff --git a/plugins/evaluation-plugin/src/com/intellij/cce/actions/EvaluationDataset.kt b/plugins/evaluation-plugin/src/com/intellij/cce/actions/EvaluationDataset.kt index 8c7906fac164..5c0dd126b745 100644 --- a/plugins/evaluation-plugin/src/com/intellij/cce/actions/EvaluationDataset.kt +++ b/plugins/evaluation-plugin/src/com/intellij/cce/actions/EvaluationDataset.kt @@ -28,7 +28,6 @@ interface EvaluationDataset { // FIXME with implicit invoker inside it may make interface EvaluationDatasetChunk { val datasetName: String val name: String - val sessionCount: Int val presentationText: String fun evaluate( diff --git a/plugins/evaluation-plugin/src/com/intellij/cce/actions/ProjectActionsDataset.kt b/plugins/evaluation-plugin/src/com/intellij/cce/actions/ProjectActionsDataset.kt index a138ea02f16c..edcc47d383dd 100644 --- a/plugins/evaluation-plugin/src/com/intellij/cce/actions/ProjectActionsDataset.kt +++ b/plugins/evaluation-plugin/src/com/intellij/cce/actions/ProjectActionsDataset.kt @@ -235,7 +235,6 @@ open class ProjectActionsDataset( ) : EvaluationDatasetChunk { override val datasetName: String = config.projectName override val name: String = fileActions.path - override val sessionCount: Int = fileActions.sessionsCount override fun evaluate( handler: InterpretationHandler, diff --git a/plugins/evaluation-plugin/src/com/intellij/cce/evaluable/conflictResolution/ConflictDataset.kt b/plugins/evaluation-plugin/src/com/intellij/cce/evaluable/conflictResolution/ConflictDataset.kt index 19904c8bb445..618586618855 100644 --- a/plugins/evaluation-plugin/src/com/intellij/cce/evaluable/conflictResolution/ConflictDataset.kt +++ b/plugins/evaluation-plugin/src/com/intellij/cce/evaluable/conflictResolution/ConflictDataset.kt @@ -36,7 +36,6 @@ class ConflictDataset( private inner class ConflictChunk( private val conflictPath: Path, - override val sessionCount: Int = 1 // FIXME we should pre-calculate it? ) : EvaluationDatasetChunk { override val datasetName: String = datasetRef.name override val name: String = conflictPath.fileName.toString()