Merge pull request #611 from snyk/chore/merge-hotfix

chore: back-merge 2.9.1
snyk · Sep 12, 2024 · c26cf14 · c26cf14
2 parents 4de8e11 + bf0c54f
commit c26cf14
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,10 @@
 - show code vision for Open Source also, when Snyk Code is still analysing
 - clean-up old open source scan functionality
 
+## [2.9.1]
+### Fixed
+- propagate IntelliJ environment to language server. This should mitigate the issue of not finding package managers during scans.
+
 ## [2.9.0]
 ### Changed
 - Updated the language server protocol version to 14 to support new communication model.

diff --git a/src/main/kotlin/snyk/common/lsp/LanguageServerWrapper.kt b/src/main/kotlin/snyk/common/lsp/LanguageServerWrapper.kt
@@ -131,7 +131,7 @@ class LanguageServerWrapper(
             val cmd = listOf(lsPath, "language-server", "-l", logLevel)
 
             val processBuilder = ProcessBuilder(cmd)
-            pluginSettings().token?.let { EnvironmentHelper.updateEnvironment(processBuilder.environment(), it) }
+            EnvironmentHelper.updateEnvironment(processBuilder.environment(), pluginSettings().token ?: "")
 
             process = processBuilder.start()
             launcher = LSPLauncher.createClientLauncher(languageClient, process.inputStream, process.outputStream)