Merge branch 'master' into chore/move-ai-fix-scripts-to-ls

snyk · Feb 11, 2025 · d6fa92d · d6fa92d
2 parents f22a3be + 2f38314
commit d6fa92d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/src/main/kotlin/io/snyk/plugin/ui/ReferenceChooserComboboxDialog.kt b/src/main/kotlin/io/snyk/plugin/ui/ReferenceChooserComboboxDialog.kt
@@ -97,11 +97,8 @@ class ReferenceChooserDialog(val project: Project) : DialogWrapper(true) {
             val baseBranch = getSelectedItem(it.value) ?: ""
             val referenceFolderControl = referenceFolders[folderConfig]
             val referenceFolder = referenceFolderControl?.text ?: ""
-            if (baseBranch.isNotBlank()) {
-                folderConfigSettings.addFolderConfig(folderConfig.copy(baseBranch = baseBranch))
-            }
-            if (referenceFolder.isNotBlank()) {
-                folderConfigSettings.addFolderConfig(folderConfig.copy(referenceFolderPath = referenceFolder))
+            if (referenceFolder.isNotBlank() || baseBranch.isNotBlank()) {
+                folderConfigSettings.addFolderConfig(folderConfig.copy(baseBranch = baseBranch, referenceFolderPath = referenceFolder))
             }
         }
 

diff --git a/src/main/kotlin/io/snyk/plugin/ui/jcef/ToggleDeltaHandler.kt b/src/main/kotlin/io/snyk/plugin/ui/jcef/ToggleDeltaHandler.kt
@@ -13,8 +13,8 @@ class ToggleDeltaHandler {
     fun generate(jbCefBrowser: JBCefBrowserBase): CefLoadHandlerAdapter {
         val toggleDeltaQuery = JBCefJSQuery.create(jbCefBrowser)
         toggleDeltaQuery.addHandler {deltaEnabled ->
-            pluginSettings().setDeltaEnabled(deltaEnabled.toBoolean())
             runInBackground("Snyk: updating configuration") {
+                pluginSettings().setDeltaEnabled(deltaEnabled.toBoolean())
                 LanguageServerWrapper.getInstance().updateConfiguration()
             }
             return@addHandler JBCefJSQuery.Response("success")

diff --git a/src/main/kotlin/io/snyk/plugin/ui/toolwindow/SnykToolWindowPanel.kt b/src/main/kotlin/io/snyk/plugin/ui/toolwindow/SnykToolWindowPanel.kt
@@ -206,10 +206,7 @@ class SnykToolWindowPanel(
                                 PRODUCT_IAC -> it.currentIacResultsLS[snykFile] = issueList
                             }
                         }
-
-                        Tree(rootTreeNode).apply {
-                            this.isRootVisible = pluginSettings().isDeltaFindingsEnabled()
-                        }
+                        vulnerabilitiesTree.isRootVisible = pluginSettings().isDeltaFindingsEnabled()
                     }
 
                     override fun scanningSnykCodeFinished() = Unit