CM-48118 - Add detection sorting by line number in addition to severity (#87)

Author: MarshalX

CHANGELOG.md

@@ -4,6 +4,10 @@
 
 ## [Unreleased]
 
+## [2.6.0] - 2025-05-12
+
+- Add detection sorting by line number in addition to severity
+
 ## [2.5.0] - 2025-02-24
 
 - Add proper support for disabled modules
@@ -147,6 +151,8 @@
 
 The first public release of the plugin.
 
+[2.6.0]: https://github.com/cycodehq/intellij-platform-plugin/releases/tag/v2.6.0
+
 [2.5.0]: https://github.com/cycodehq/intellij-platform-plugin/releases/tag/v2.5.0
 
 [2.4.1]: https://github.com/cycodehq/intellij-platform-plugin/releases/tag/v2.4.1
@@ -207,4 +213,4 @@ The first public release of the plugin.
 
 [1.0.0]: https://github.com/cycodehq/intellij-platform-plugin/releases/tag/v1.0.0
 
-[Unreleased]: https://github.com/cycodehq/intellij-platform-plugin/compare/v2.5.0...HEAD
+[Unreleased]: https://github.com/cycodehq/intellij-platform-plugin/compare/v2.6.0...HEAD

CODEOWNERS

@@ -1 +1 @@
-* @MarshalX @MichalBor @MaorDavidzon @artem-fedorov @elsapet @gotbadger @cfabianski
+* @MarshalX @elsapet @gotbadger @cfabianski

gradle.properties

@@ -4,11 +4,11 @@ pluginGroup = com.cycode.plugin
 pluginName = Cycode
 pluginRepositoryUrl = https://github.com/cycodehq/intellij-platform-plugin
 # SemVer format -> https://semver.org
-pluginVersion = 2.5.0
+pluginVersion = 2.6.0
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 231
-pluginUntilBuild = 251.*
+pluginUntilBuild = 252.*
 
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 platformType = IC

src/main/kotlin/com/cycode/plugin/annotators/annotationAppliers/IacApplier.kt

@@ -34,7 +34,7 @@ class IacApplier(private val scanResults: ScanResultsService) : AnnotationApplie
             val severity = convertSeverity(detection.severity)
 
             // IaC doesn't provide start and end positions, so we have to calculate them from the line number
-            val line = detection.detectionDetails.lineInFile - 1
+            val line = detection.detectionDetails.getLineNumber() - 1
             val startOffset = psiFile.text.lines().take(line).sumOf { it.length + 1 }
             val endOffset = startOffset + psiFile.text.lines()[line].length
 

src/main/kotlin/com/cycode/plugin/annotators/annotationAppliers/SastApplier.kt

@@ -33,7 +33,7 @@ class SastApplier(private val scanResults: ScanResultsService) : AnnotationAppli
             val severity = convertSeverity(detection.severity)
 
             // SAST doesn't provide start and end positions, so we have to calculate them from the line number
-            val line = detection.detectionDetails.lineInFile - 1
+            val line = detection.detectionDetails.getLineNumber() - 1
             val startOffset = psiFile.text.lines().take(line).sumOf { it.length + 1 }
             val endOffset = startOffset + psiFile.text.lines()[line].length
 

src/main/kotlin/com/cycode/plugin/annotators/annotationAppliers/ScaApplier.kt

@@ -44,7 +44,7 @@ class ScaApplier(private val scanResults: ScanResultsService) : AnnotationApplie
             val severity = convertSeverity(detection.severity)
 
             // SCA doesn't provide start and end positions, so we have to calculate them from the line number
-            val line = detection.detectionDetails.lineInFile - 1
+            val line = detection.detectionDetails.getLineNumber() - 1
             val startOffset = psiFile.text.lines().take(line).sumOf { it.length + 1 }
             val endOffset = startOffset + psiFile.text.lines()[line].length
 

src/main/kotlin/com/cycode/plugin/cli/models/scanResult/ScanDetectionDetailsBase.kt

@@ -2,4 +2,9 @@ package com.cycode.plugin.cli.models.scanResult
 
 interface ScanDetectionDetailsBase {
     fun getFilepath(): String
+    /**
+     * Gets the line number.
+     * @return The 1-based line number (first line is 1, not 0)
+     */
+    fun getLineNumber(): Int
 }

src/main/kotlin/com/cycode/plugin/cli/models/scanResult/iac/IacDetection.kt

@@ -21,6 +21,6 @@ data class IacDetection(
     }
 
     override fun getFormattedNodeTitle(): String {
-        return CycodeBundle.message("iacNodeTitle", detectionDetails.lineInFile, getFormattedMessage())
+        return CycodeBundle.message("iacNodeTitle", detectionDetails.getLineNumber(), getFormattedMessage())
     }
 }

src/main/kotlin/com/cycode/plugin/cli/models/scanResult/iac/IacDetectionDetails.kt

@@ -19,4 +19,8 @@ data class IacDetectionDetails(
     override fun getFilepath(): String {
         return fileName
     }
+
+    override fun getLineNumber(): Int {
+        return lineInFile
+    }
 }

src/main/kotlin/com/cycode/plugin/cli/models/scanResult/sast/SastDetection.kt

@@ -21,6 +21,6 @@ data class SastDetection(
     }
 
     override fun getFormattedNodeTitle(): String {
-        return CycodeBundle.message("sastNodeTitle", detectionDetails.lineInFile, getFormattedMessage())
+        return CycodeBundle.message("sastNodeTitle", detectionDetails.getLineNumber(), getFormattedMessage())
     }
 }