Merge branch 'main' into bug-modules

Author: adrienpessu

.github/workflows/build.yml

@@ -88,7 +88,7 @@ jobs:
 
       # Store already-built plugin as an artifact for downloading
       - name: Upload artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: ${{ steps.artifact.outputs.filename }}
           path: ./build/distributions/content/*/*
@@ -124,7 +124,7 @@ jobs:
       # Collect Tests Result of failed tests
       - name: Collect Tests Result
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: tests-result
           path: ${{ github.workspace }}/build/reports/tests
@@ -146,13 +146,6 @@ jobs:
       pull-requests: write
     steps:
 
-      # Free GitHub Actions Environment Disk Space
-      - name: Maximize Build Space
-        uses: jlumbroso/free-disk-space@main
-        with:
-          tool-cache: false
-          large-packages: false
-
       # Check out current repository
       - name: Fetch Sources
         uses: actions/checkout@v6
@@ -166,7 +159,7 @@ jobs:
 
       # Run Qodana inspections
       - name: Qodana - Code Inspection
-        uses: JetBrains/qodana-action@v2025.2.1
+        uses: JetBrains/qodana-action@v2025.3.1
         with:
           cache-default-branch-only: true
 
@@ -177,13 +170,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      # Free GitHub Actions Environment Disk Space
-      - name: Maximize Build Space
-        uses: jlumbroso/free-disk-space@main
-        with:
-          tool-cache: false
-          large-packages: false
-
       # Check out current repository
       - name: Fetch Sources
         uses: actions/checkout@v6
@@ -197,13 +183,13 @@ jobs:
 
       # Setup Gradle
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v3.4.2
+        uses: gradle/gradle-build-action@v3.5.0
         with:
           gradle-home-cache-cleanup: true
 
       # Cache Plugin Verifier IDEs
       - name: Setup Plugin Verifier IDEs Cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ needs.build.outputs.pluginVerifierHomeDir }}/ides
           key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }}
@@ -215,7 +201,7 @@ jobs:
       # Collect Plugin Verifier Result
       - name: Collect Plugin Verifier Result
         if: ${{ always() }}
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: pluginVerifier-result
           path: ${{ github.workspace }}/build/reports/pluginVerifier

.github/workflows/codeql.yml

@@ -44,7 +44,7 @@ jobs:
       matrix:
         include:
         - language: java-kotlin
-          build-mode: autobuild
+          build-mode: manual
         # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
         # Use `c-cpp` to analyze code written in C, C++ or both
         # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
@@ -79,12 +79,7 @@ jobs:
     - if: matrix.build-mode == 'manual'
       shell: bash
       run: |
-        echo 'If you are using a "manual" build mode for one or more of the' \
-          'languages you are analyzing, replace this with the commands to build' \
-          'your code, for example:'
-        echo '  make bootstrap'
-        echo '  make release'
-        exit 1
+        ./gradlew compileKotlin
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v4

build.gradle.kts

@@ -26,7 +26,7 @@ dependencies {
 //    implementation(libs.annotations)
     implementation("com.contrastsecurity:java-sarif:2.0")
     constraints {
-        implementation("com.fasterxml.jackson.core:jackson-databind:2.20.0")
+        implementation("com.fasterxml.jackson.core:jackson-databind:2.20.1")
     }
     testImplementation("org.assertj:assertj-core:3.27.6")
 }

gradle/libs.versions.toml

@@ -3,7 +3,7 @@
 annotations = "26.0.2-1"
 
 # plugins
-changelog = "2.4.0"
+changelog = "2.5.0"
 kotlin = "2.2.21"
 gradleIntelliJPlugin = "1.17.4"
 qodana = "0.1.13"

src/main/kotlin/com/github/adrienpessu/sarifviewer/SarifFileType.kt

@@ -0,0 +1,46 @@
+package com.github.adrienpessu.sarifviewer
+
+import com.github.adrienpessu.sarifviewer.toolWindow.SarifViewerWindowFactory
+import com.intellij.json.JsonFileType
+import com.intellij.openapi.fileTypes.INativeFileType
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.openapi.wm.ToolWindowManager
+import com.intellij.ui.IconManager
+import com.intellij.ui.components.JBPanel
+import javax.swing.Icon
+
+object SarifFileType :  JsonFileType(), INativeFileType {
+    override fun getName() = "SARIF"
+    override fun getDescription() = "SARIF file"
+    override fun getDefaultExtension() = "sarif"
+    override fun getIcon(): Icon = load("com.github.adrienpessu.sarifviewer/sarif.svg", -2129886975, 0);
+
+
+    override fun openFileInAssociatedApplication(project: Project?, file: VirtualFile): Boolean  {
+        if (project == null) return false
+
+        val toolWindow = ToolWindowManager
+            .getInstance(project)
+            .getToolWindow("Sarif viewer")
+
+
+        toolWindow?.contentManager?.selectedContent?.component
+            ?.let { component ->
+                if (component is SarifViewerWindowFactory.MyToolWindow) {
+                    component.openFile(project,file.toNioPath().toFile())
+                }
+            }
+
+        toolWindow?.show() // opens and focuses the tool window
+        return true
+    }
+
+    private fun load(path: String, cacheKey: Int, flags: Int): Icon {
+        return IconManager.getInstance()
+            .loadRasterizedIcon(path, SarifFileType.javaClass.getClassLoader(), cacheKey, flags)
+    }
+
+    override fun useNativeIcon(): Boolean = false
+
+}

src/main/kotlin/com/github/adrienpessu/sarifviewer/toolWindow/SarifViewerWindowFactory.kt

@@ -28,6 +28,8 @@ import com.intellij.openapi.project.DumbService
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.ComboBox
 import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.openapi.vfs.VirtualFileManager
+import com.intellij.openapi.ui.SimpleToolWindowPanel
 import com.intellij.openapi.wm.ToolWindow
 import com.intellij.openapi.wm.ToolWindowFactory
 import com.intellij.psi.search.FilenameIndex
@@ -79,7 +81,7 @@ class SarifViewerWindowFactory : ToolWindowFactory {
 
     override fun shouldBeAvailable(project: Project) = true
 
-    class MyToolWindow(toolWindow: ToolWindow) {
+    class MyToolWindow(toolWindow: ToolWindow) : SimpleToolWindowPanel(false, true) {
 
         init {
             val actionManager = ActionManager.getInstance()
@@ -91,8 +93,8 @@ class SarifViewerWindowFactory : ToolWindowFactory {
             val actions = ArrayList<AnAction>()
             actions.add(openLocalFileAction)
             actions.add(refreshAction)
-
             toolWindow.setTitleActions(actions)
+            //configureToolbar()
         }
 
         internal var github: GitHubInstance? = null
@@ -120,7 +122,18 @@ class SarifViewerWindowFactory : ToolWindowFactory {
         private var cacheSarif: SarifSchema210? = null
         private var currentLeaf: Leaf? = null
 
-        fun getContent() = JBPanel<JBPanel<*>>().apply {
+        public fun openFile(project : Project, file : File) {
+            val extractSarifFromFile = extractSarifFromFile(file)
+            treeBuilding(extractSarifFromFile)
+            localMode = true
+        }
+
+       override fun getContent(): JComponent? {
+            configureToolbar()
+            return this.component
+        }
+
+        private fun configureToolbar() {
 
             manageTreeIcons()
             buildSkeleton()
@@ -160,7 +173,7 @@ class SarifViewerWindowFactory : ToolWindowFactory {
             })
         }
 
-        private fun JBPanel<JBPanel<*>>.loadDataAndUI(
+        private fun loadDataAndUI(
             repository: GitRepository,
             selectedCombo: BranchItemComboBox? = null
         ) {
@@ -262,7 +275,7 @@ class SarifViewerWindowFactory : ToolWindowFactory {
             thisLogger().info(message)
         }
 
-        private fun JBPanel<JBPanel<*>>.buildSkeleton() {
+        private fun buildSkeleton() {
             steps.layout = BoxLayout(steps, BoxLayout.Y_AXIS)
             tableSteps.size = Dimension(steps.width, steps.height)
             steps.add(tableSteps)
@@ -446,7 +459,13 @@ class SarifViewerWindowFactory : ToolWindowFactory {
             myList.addTreeSelectionListener(object : TreeSelectionListener {
                 override fun valueChanged(e: TreeSelectionEvent?) {
                     if (e != null && e.isAddedPath) {
-                        val leaves = map[e.path.parentPath.lastPathComponent.toString().split(" ").first()]
+                        val key = e.path.parentPath.lastPathComponent.toString()
+                        // path (count)
+                        val leaves1 = map[key.split(" ").first()]
+                        // bug desc (count)
+                        val leaves2 = map[key.substring(0, key.lastIndexOf(' '))]
+                        val leaves = (leaves1.orEmpty() + leaves2.orEmpty()).takeIf { it.isNotEmpty() }
+
                         if (!leaves.isNullOrEmpty()) {
                             currentLeaf = try {
                                 leaves.first { it.address == ((e.path.lastPathComponent as DefaultMutableTreeNode).userObject as Leaf).address }

src/main/resources/META-INF/plugin.xml

@@ -6,6 +6,7 @@
 
     <depends>com.intellij.modules.platform</depends>
     <depends>Git4Idea</depends>
+    <depends>com.intellij.modules.json</depends>
 
     <resource-bundle>messages.MyBundle</resource-bundle>
 
@@ -32,7 +33,10 @@
         <notificationGroup id="SARIF viewer"
                            displayType="BALLOON"/>
         <codeVisionProvider language="kotlin" implementationClass="com.github.adrienpessu.sarifviewer.toolWindow.SarifCodeVisionProvider"/>
-
+        <fileType
+                name="SARIF"
+                implementationClass="com.github.adrienpessu.sarifviewer.SarifFileType"
+                extensions="sarif" fieldName="INSTANCE" language="JSON"/>
     </extensions>