From f15c836438619c12ee139e3aa2f40e800c428b52 Mon Sep 17 00:00:00 2001 From: Johannes Koenen Date: Wed, 10 Jan 2024 16:03:46 +0100 Subject: [PATCH] Review: Only compare equal version in fingerprints --- .../java/com/jetbrains/qodana/sarif/baseline/Baseline.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sarif/src/main/java/com/jetbrains/qodana/sarif/baseline/Baseline.kt b/sarif/src/main/java/com/jetbrains/qodana/sarif/baseline/Baseline.kt index 388f515..5d7997f 100644 --- a/sarif/src/main/java/com/jetbrains/qodana/sarif/baseline/Baseline.kt +++ b/sarif/src/main/java/com/jetbrains/qodana/sarif/baseline/Baseline.kt @@ -11,7 +11,10 @@ private fun Iterable?.noNulls(): Sequence = this?.asSequence().orEmpty().filterNotNull() private val Result.equalIndicators: Sequence - get() = partialFingerprints?.getValues(BaselineCalculation.EQUAL_INDICATOR)?.values.noNulls() + get() = partialFingerprints?.getValues(BaselineCalculation.EQUAL_INDICATOR)?.entries + .noNulls() + .map { (k, v) -> "$k:$v" } + .sortedDescending() // higher versions should have higher priority internal class DiffState(private val options: Options) { var new = 0