fix/IDA-116_NullPointerException-and-error-reporting (#591)

* fix: convert line breaks to HTML in balloon notifications * fix: NPE in folder config
snyk · Sep 3, 2024 · 554a70a · 554a70a
1 parent 4d819c1
commit 554a70a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/main/kotlin/io/snyk/plugin/ui/SnykBalloonNotificationHelper.kt b/src/main/kotlin/io/snyk/plugin/ui/SnykBalloonNotificationHelper.kt
@@ -46,10 +46,11 @@ object SnykBalloonNotificationHelper {
             NotificationType.ERROR, NotificationType.WARNING -> logger.warn(message)
             else -> logger.info(message)
         }
+        val msg = message.replace("\n","<br/>")
         val notification = if (actions.isEmpty()) {
-            Notification(groupAutoHide, title, message, type)
+            Notification(groupAutoHide, title, msg, type)
         } else {
-            notificationGroup.createNotification(title, message, type).apply {
+            notificationGroup.createNotification(title, msg, type).apply {
                 actions.forEach { this.addAction(it) }
             }
         }

diff --git a/src/main/kotlin/snyk/common/lsp/SnykLanguageClient.kt b/src/main/kotlin/snyk/common/lsp/SnykLanguageClient.kt
@@ -203,9 +203,10 @@ class SnykLanguageClient :
     }
 
     @JsonNotification(value = "$/snyk.folderConfigs")
-    fun folderConfig(folderConfigParam: FolderConfigsParam) {
+    fun folderConfig(folderConfigParam: FolderConfigsParam?) {
+        val folderConfigs = folderConfigParam?.folderConfigs ?: emptyList()
         runAsync {
-            service<FolderConfigSettings>().addAll(folderConfigParam.folderConfigs)
+            service<FolderConfigSettings>().addAll(folderConfigs)
         }
     }
 

diff --git a/src/main/kotlin/snyk/common/lsp/Types.kt b/src/main/kotlin/snyk/common/lsp/Types.kt
@@ -617,7 +617,7 @@ data class OssIdentifiers(
 }
 
 data class FolderConfigsParam(
-    @SerializedName("folderConfigs") val folderConfigs: List<FolderConfig>,
+    @SerializedName("folderConfigs") val folderConfigs: List<FolderConfig>?,
 )
 
 data class FolderConfig(