refactor: remove unnecessary code, centralize bulk file listening

src/main/kotlin/io/snyk/plugin/SnykBulkFileListener.kt

@@ -2,6 +2,7 @@ package io.snyk.plugin
 
 import com.intellij.ide.impl.ProjectUtil
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.roots.ProjectFileIndex
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.vfs.isFile
 import com.intellij.openapi.vfs.newvfs.BulkFileListener
@@ -49,7 +50,6 @@ import com.intellij.openapi.vfs.newvfs.events.VFilePropertyChangeEvent
  *  - addressed at `before` state, old file processed to _clean_ caches
  */
 abstract class SnykBulkFileListener : BulkFileListener {
-
     /****************************** Before **************************/
 
     override fun before(events: List<VFileEvent>) {

src/main/kotlin/io/snyk/plugin/SnykPostStartupActivity.kt

@@ -12,12 +12,10 @@ import com.intellij.openapi.startup.ProjectActivity
 import com.intellij.openapi.vfs.VirtualFileManager
 import io.snyk.plugin.extensions.SnykControllerImpl
 import io.snyk.plugin.extensions.SnykControllerManager
-import io.snyk.plugin.snykcode.SnykCodeBulkFileListener
 import io.snyk.plugin.ui.SnykBalloonNotifications
 import snyk.common.AnnotatorCommon
+import snyk.common.lsp.LanguageServerBulkFileListener
 import snyk.container.ContainerBulkFileListener
-import snyk.iac.IacBulkFileListener
-import snyk.oss.OssBulkFileListener
 import java.time.Instant
 import java.time.temporal.ChronoUnit
 import java.util.Date
@@ -43,9 +41,7 @@ class SnykPostStartupActivity : ProjectActivity {
         if (!listenersActivated) {
             val messageBusConnection = ApplicationManager.getApplication().messageBus.connect()
             // TODO: add subscription for language server messages
-            messageBusConnection.subscribe(VirtualFileManager.VFS_CHANGES, OssBulkFileListener())
-            messageBusConnection.subscribe(VirtualFileManager.VFS_CHANGES, SnykCodeBulkFileListener())
-            messageBusConnection.subscribe(VirtualFileManager.VFS_CHANGES, IacBulkFileListener())
+            messageBusConnection.subscribe(VirtualFileManager.VFS_CHANGES, LanguageServerBulkFileListener())
             messageBusConnection.subscribe(VirtualFileManager.VFS_CHANGES, ContainerBulkFileListener())
             messageBusConnection.subscribe(ProjectManager.TOPIC, SnykProjectManagerListener())
             listenersActivated = true

src/main/kotlin/io/snyk/plugin/SnykProjectManagerListener.kt

@@ -22,7 +22,6 @@ class SnykProjectManagerListener : ProjectManagerListener {
                 // limit clean up to TIMEOUT
                 try {
                     threadPool.submit {
-                        // lets all running ProgressIndicators release MUTEX first
                         val ls = LanguageServerWrapper.getInstance()
                         if (ls.isInitialized) {
                             ls.updateWorkspaceFolders(emptySet(), ls.getWorkspaceFolders(project))

src/main/kotlin/io/snyk/plugin/events/SnykScanListener.kt

@@ -13,10 +13,6 @@ interface SnykScanListener {
 
     fun scanningStarted()
 
-    fun scanningIacFinished(iacResult: IacResult)
-
-    fun scanningIacError(snykError: SnykError)
-
     fun scanningContainerFinished(containerResult: ContainerResult)
 
     fun scanningContainerError(snykError: SnykError)

src/main/kotlin/io/snyk/plugin/ui/UIUtils.kt

@@ -253,7 +253,7 @@ fun descriptionHeaderPanel(
         2 + // CVSS
         2 + // Snyk description
         customLabels.size * 2 // Labels with `|`
-    panel.layout = GridLayoutManager(1, columnCount, Insets(0, 0, 0, 0), 5, 0)
+    panel.layout = GridLayoutManager(1, columnCount, JBUI.emptyInsets(), 5, 0)
 
     panel.add(
         JLabel(issueNaming).apply { font = font14 },

src/main/kotlin/io/snyk/plugin/ui/toolwindow/SnykToolWindowPanel.kt

@@ -78,8 +78,6 @@ import snyk.container.ui.ContainerIssueTreeNode
 import snyk.iac.IacIssue
 import snyk.iac.IacResult
 import snyk.iac.ignorableErrorCodes
-import snyk.iac.ui.toolwindow.IacFileTreeNode
-import snyk.iac.ui.toolwindow.IacIssueTreeNode
 import java.awt.BorderLayout
 import java.util.Objects.nonNull
 import javax.swing.JPanel
@@ -189,16 +187,6 @@ class SnykToolWindowPanel(
                         }
                     }
 
-                    override fun scanningIacFinished(iacResult: IacResult) {
-                        ApplicationManager.getApplication().invokeLater {
-                            displayIacResults(iacResult)
-                        }
-                        if (iacResult.getVisibleErrors().isNotEmpty()) {
-                            notifyAboutErrorsIfNeeded(ProductType.IAC, iacResult)
-                        }
-                        refreshAnnotationsForOpenFiles(project)
-                    }
-
                     override fun scanningContainerFinished(containerResult: ContainerResult) {
                         ApplicationManager.getApplication().invokeLater {
                             displayContainerResults(containerResult)
@@ -225,24 +213,6 @@ class SnykToolWindowPanel(
                         }
                     }
 
-                    override fun scanningIacError(snykError: SnykError) {
-                        var iacResultsCount: Int? = null
-                        if (snykError.code != null && ignorableErrorCodes.contains(snykError.code)) {
-                            iacResultsCount = NODE_NOT_SUPPORTED_STATE
-                        } else {
-                            SnykBalloonNotificationHelper.showError(snykError.message, project)
-                            if (snykError.message.startsWith(AUTH_FAILED_TEXT)) {
-                                pluginSettings().token = null
-                            }
-                        }
-                        ApplicationManager.getApplication().invokeLater {
-                            removeAllChildren(listOf(rootIacIssuesTreeNode))
-                            updateTreeRootNodesPresentation(iacResultsCount = iacResultsCount)
-                            chooseMainPanelToDisplay()
-                        }
-                        refreshAnnotationsForOpenFiles(project)
-                    }
-
                     override fun scanningContainerError(snykError: SnykError) {
                         var containerResultsCount: Int? = null
                         if (snykError == ContainerService.NO_IMAGES_TO_SCAN_ERROR) {
@@ -295,7 +265,6 @@ class SnykToolWindowPanel(
 
                         val snykCachedResults = getSnykCachedResults(project) ?: return
                         ApplicationManager.getApplication().invokeLater {
-                            snykCachedResults.currentIacResult?.let { displayIacResults(it) }
                             snykCachedResults.currentContainerResult?.let { displayContainerResults(it) }
                         }
                     }
@@ -721,57 +690,6 @@ class SnykToolWindowPanel(
         revalidate()
     }
 
-    fun displayIacResults(iacResult: IacResult) {
-        val userObjectsForExpandedChildren = userObjectsForExpandedNodes(rootIacIssuesTreeNode)
-        val selectedNodeUserObject = TreeUtil.findObjectInPath(vulnerabilitiesTree.selectionPath, Any::class.java)
-
-        rootIacIssuesTreeNode.removeAllChildren()
-
-        fun navigateToIaCIssue(
-            virtualFile: VirtualFile?,
-            lineStartOffset: Int,
-        ): () -> Unit =
-            {
-                if (virtualFile?.isValid == true) {
-                    navigateToSource(project, virtualFile, lineStartOffset)
-                }
-            }
-
-        val settings = pluginSettings()
-        if (settings.iacScanEnabled && settings.treeFiltering.iacResults) {
-            iacResult.allCliIssues?.forEach { iacVulnerabilitiesForFile ->
-                if (iacVulnerabilitiesForFile.infrastructureAsCodeIssues.isNotEmpty()) {
-                    val fileTreeNode = IacFileTreeNode(iacVulnerabilitiesForFile, project)
-                    rootIacIssuesTreeNode.add(fileTreeNode)
-
-                    iacVulnerabilitiesForFile.infrastructureAsCodeIssues
-                        .filter { settings.hasSeverityEnabledAndFiltered(it.getSeverity()) }
-                        .sortedByDescending { it.getSeverity() }
-                        .forEach {
-                            val navigateToSource =
-                                navigateToIaCIssue(
-                                    iacVulnerabilitiesForFile.virtualFile,
-                                    it.lineStartOffset,
-                                )
-                            fileTreeNode.add(IacIssueTreeNode(it, project, navigateToSource))
-                        }
-                }
-            }
-            iacResult.getVisibleErrors().forEach { snykError ->
-                rootIacIssuesTreeNode.add(
-                    ErrorTreeNode(snykError, project, navigateToIaCIssue(snykError.virtualFile, 0)),
-                )
-            }
-        }
-
-        updateTreeRootNodesPresentation(
-            iacResultsCount = iacResult.issuesCount,
-            addHMLPostfix = buildHMLpostfix(iacResult),
-        )
-
-        smartReloadRootNode(rootIacIssuesTreeNode, userObjectsForExpandedChildren, selectedNodeUserObject)
-    }
-
     fun displayContainerResults(containerResult: ContainerResult) {
         val userObjectsForExpandedChildren = userObjectsForExpandedNodes(rootContainerIssuesTreeNode)
         val selectedNodeUserObject = TreeUtil.findObjectInPath(vulnerabilitiesTree.selectionPath, Any::class.java)
@@ -949,12 +867,6 @@ class SnykToolWindowPanel(
         }
     }
 
-    fun selectNodeAndDisplayDescription(iacIssue: IacIssue) =
-        selectAndDisplayNodeWithIssueDescription { treeNode ->
-            treeNode is IacIssueTreeNode &&
-                (treeNode.userObject as IacIssue) == iacIssue
-        }
-
     fun selectNodeAndDisplayDescription(issuesForImage: ContainerIssuesForImage) =
         selectAndDisplayNodeWithIssueDescription { treeNode ->
             treeNode is ContainerImageTreeNode &&

src/main/kotlin/io/snyk/plugin/ui/toolwindow/SnykTreeCellRenderer.kt

@@ -29,11 +29,6 @@ import snyk.container.ContainerIssue
 import snyk.container.ContainerIssuesForImage
 import snyk.container.ui.ContainerImageTreeNode
 import snyk.container.ui.ContainerIssueTreeNode
-import snyk.iac.IacIssue
-import snyk.iac.IacIssuesForFile
-import snyk.iac.ui.toolwindow.IacFileTreeNode
-import snyk.iac.ui.toolwindow.IacIssueTreeNode
-import java.util.Locale
 import javax.swing.Icon
 import javax.swing.JTree
 import javax.swing.tree.DefaultMutableTreeNode

src/main/kotlin/io/snyk/plugin/ui/toolwindow/panels/JCEFDescriptionPanel.kt

@@ -3,11 +3,11 @@ package io.snyk.plugin.ui.toolwindow.panels
 import com.intellij.openapi.editor.colors.EditorColors
 import com.intellij.openapi.editor.colors.EditorColorsManager
 import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.openapi.vfs.VirtualFileManager
 import com.intellij.uiDesigner.core.GridLayoutManager
 import com.intellij.util.ui.JBUI
 import com.intellij.util.ui.UIUtil
 import io.snyk.plugin.SnykFile
+import io.snyk.plugin.toVirtualFile
 import io.snyk.plugin.ui.DescriptionHeaderPanel
 import io.snyk.plugin.ui.SnykBalloonNotificationHelper
 import io.snyk.plugin.ui.baseGridConstraintsAnchorWest
@@ -26,7 +26,6 @@ import snyk.common.lsp.ScanIssue
 import stylesheets.SnykStylesheets
 import java.awt.BorderLayout
 import java.awt.Font
-import java.nio.file.Paths
 import javax.swing.JLabel
 import javax.swing.JPanel
 import kotlin.collections.set
@@ -43,65 +42,60 @@ class SuggestionDescriptionPanelFromLS(
         "Snyk encountered an issue while rendering the vulnerability description. Please try again, or contact support if the problem persists. We apologize for any inconvenience caused."
 
     init {
-        if (issue.canLoadSuggestionPanelFromHTML()) {
-            val loadHandlerGenerators: MutableList<LoadHandlerGenerator> =
-                emptyList<LoadHandlerGenerator>().toMutableList()
+        val loadHandlerGenerators: MutableList<LoadHandlerGenerator> =
+            emptyList<LoadHandlerGenerator>().toMutableList()
 
-            // TODO: replace directly in HTML instead of JS
-            loadHandlerGenerators += {
-                ThemeBasedStylingGenerator().generate(it)
-            }
+        // TODO: replace directly in HTML instead of JS
+        loadHandlerGenerators += {
+            ThemeBasedStylingGenerator().generate(it)
+        }
 
-            when (issue.filterableIssueType) {
-                ScanIssue.CODE_QUALITY, ScanIssue.CODE_SECURITY -> {
-                    val virtualFiles = LinkedHashMap<String, VirtualFile?>()
-                    for (dataFlow in issue.additionalData.dataFlow) {
-                        virtualFiles[dataFlow.filePath] =
-                            VirtualFileManager.getInstance().findFileByNioPath(Paths.get(dataFlow.filePath))
-                    }
+        when (issue.filterableIssueType) {
+            ScanIssue.CODE_QUALITY, ScanIssue.CODE_SECURITY -> {
+                val virtualFiles = LinkedHashMap<String, VirtualFile?>()
+                for (dataFlow in issue.additionalData.dataFlow) {
+                    virtualFiles[dataFlow.filePath] = dataFlow.filePath.toVirtualFile()
+                }
 
-                    val openFileLoadHandlerGenerator = OpenFileLoadHandlerGenerator(snykFile.project, virtualFiles)
-                    loadHandlerGenerators += {
-                        openFileLoadHandlerGenerator.generate(it)
-                    }
+                val openFileLoadHandlerGenerator = OpenFileLoadHandlerGenerator(snykFile.project, virtualFiles)
+                loadHandlerGenerators += {
+                    openFileLoadHandlerGenerator.generate(it)
+                }
 
-                    val generateAIFixHandler = GenerateAIFixHandler()
-                    loadHandlerGenerators += {
-                        generateAIFixHandler.generateAIFixCommand(it)
-                    }
+                val generateAIFixHandler = GenerateAIFixHandler()
+                loadHandlerGenerators += {
+                    generateAIFixHandler.generateAIFixCommand(it)
+                }
 
-                    val applyFixHandler = ApplyFixHandler(snykFile.project)
-                    loadHandlerGenerators += {
-                        applyFixHandler.generateApplyFixCommand(it)
-                    }
+                val applyFixHandler = ApplyFixHandler(snykFile.project)
+                loadHandlerGenerators += {
+                    applyFixHandler.generateApplyFixCommand(it)
                 }
             }
-            val html = this.getCustomCssAndScript()
-            val jbCefBrowserComponent =
-                JCEFUtils.getJBCefBrowserComponentIfSupported(html, loadHandlerGenerators)
-            if (jbCefBrowserComponent == null) {
-                val statePanel = StatePanel(SnykToolWindowPanel.SELECT_ISSUE_TEXT)
-                this.add(wrapWithScrollPane(statePanel), BorderLayout.CENTER)
-                SnykBalloonNotificationHelper.showError(unexpectedErrorMessage, null)
-            } else {
-                val lastRowToAddSpacer = 5
-                val panel =
-                    JPanel(
-                        GridLayoutManager(lastRowToAddSpacer + 1, 1, JBUI.insets(0, 10, 20, 10), -1, 20),
-                    ).apply {
-                        this.add(
-                            jbCefBrowserComponent,
-                            panelGridConstraints(1),
-                        )
-                    }
-                this.add(
-                    wrapWithScrollPane(panel),
-                    BorderLayout.CENTER,
-                )
-                this.add(panel)
-            }
+        }
+        val html = this.getCustomCssAndScript()
+        val jbCefBrowserComponent =
+            JCEFUtils.getJBCefBrowserComponentIfSupported(html, loadHandlerGenerators)
+        if (jbCefBrowserComponent == null) {
+            val statePanel = StatePanel(SnykToolWindowPanel.SELECT_ISSUE_TEXT)
+            this.add(wrapWithScrollPane(statePanel), BorderLayout.CENTER)
+            SnykBalloonNotificationHelper.showError(unexpectedErrorMessage, null)
         } else {
-            createUI()
+            val lastRowToAddSpacer = 5
+            val panel =
+                JPanel(
+                    GridLayoutManager(lastRowToAddSpacer + 1, 1, JBUI.insets(0, 10, 20, 10), -1, 20),
+                ).apply {
+                    this.add(
+                        jbCefBrowserComponent,
+                        panelGridConstraints(1),
+                    )
+                }
+            this.add(
+                wrapWithScrollPane(panel),
+                BorderLayout.CENTER,
+            )
+            this.add(panel)
         }
     }
 

src/main/kotlin/snyk/common/SnykCachedResults.kt

@@ -50,8 +50,6 @@ class SnykCachedResults(
         get() = if (field?.isExpired() == false) field else null
 
     val currentIacResultsLS: MutableMap<SnykFile, List<ScanIssue>> = ConcurrentMap()
-    var currentIacResult: IacResult? = null
-        get() = if (field?.isExpired() == false) field else null
 
     var currentOssError: SnykError? = null
     var currentContainerError: SnykError? = null
@@ -60,7 +58,6 @@ class SnykCachedResults(
 
     fun cleanCaches() {
         currentContainerResult = null
-        currentIacResult = null
         currentOssError = null
         currentContainerError = null
         currentIacError = null
@@ -83,24 +80,10 @@ class SnykCachedResults(
                     currentContainerError = null
                 }
 
-                override fun scanningIacFinished(iacResult: IacResult) {
-                    currentIacResult = iacResult
-                }
-
                 override fun scanningContainerFinished(containerResult: ContainerResult) {
                     currentContainerResult = containerResult
                 }
 
-                override fun scanningIacError(snykError: SnykError) {
-                    currentIacResult = null
-                    currentIacError =
-                        when {
-                            snykError.message.startsWith(SnykToolWindowPanel.NO_IAC_FILES) -> null
-                            snykError.message.startsWith(SnykToolWindowPanel.AUTH_FAILED_TEXT) -> null
-                            else -> snykError
-                        }
-                }
-
                 override fun scanningContainerError(snykError: SnykError) {
                     currentContainerResult = null
                     currentContainerError =