Merge pull request #498 from renkun-ken/fix-diagnostics

Unpublish diagnostics when disabled

Author: renkun-ken

R/handlers-general.R

@@ -6,7 +6,7 @@
 on_initialize <- function(self, id, params) {
     trace <- params$trace
     if (!is.null(trace) && trace %in% c("messages", "verbose")) {
-        lsp_settings$set("debug", TRUE)
+        lsp_settings$set("trace", TRUE)
     }
 
     logger$info("session: ", list(

R/handlers-protocol.R

@@ -1,8 +1,8 @@
-protocol_set_trace <- function(self, id, params) {
+protocol_set_trace <- function(self, params) {
     value <- params$value
     if (value == "off") {
-        lsp_settings$set("debug", FALSE)
+        lsp_settings$set("trace", FALSE)
     } else {
-        lsp_settings$set("debug", TRUE)
+        lsp_settings$set("trace", TRUE)
     }
 }

R/handlers-workspace.R

@@ -26,6 +26,12 @@ workspace_did_change_configuration <- function(self, params) {
     logger$info("settings ", settings)
 
     lsp_settings$update_from_workspace(settings)
+
+    if (!lsp_settings$get("diagnostics")) {
+        for (uri in self$workspace$documents$keys()) {
+            diagnostics_callback(self, uri, NULL, list())
+        }
+    }
 }
 
 #' `workspace/didChangeWatchedFiles` notification handler

R/languagebase.R

@@ -158,6 +158,7 @@ LanguageBase <- R6::R6Class("LanguageBase",
         },
 
         handle_notification = function(notification) {
+            logger$info("receive notification: ", notification)
             method <- notification$method
             params <- notification$params
             if (method %in% names(self$notification_handlers)) {

R/log.R

@@ -54,7 +54,14 @@ Logger <- R6::R6Class("Logger",
             log_write(..., log_file = lsp_settings$get("log_file"))
         },
         info = function(...) {
-            if (lsp_settings$get("debug")) log_write(..., log_file = lsp_settings$get("log_file"))
+            if (lsp_settings$get("debug") || lsp_settings$get("trace")) {
+                log_write(..., log_file = lsp_settings$get("log_file"))
+            }
+        },
+        trace = function(...) {
+            if (lsp_settings$get("trace")) {
+                log_write(..., log_file = lsp_settings$get("log_file"))
+            }
         }
     )
 )

R/settings.R

@@ -2,6 +2,7 @@ Settings <- R6::R6Class("Settings",
     private = list(
         settings = list(
             debug = FALSE,
+            trace = FALSE,
             log_file = NULL,
             diagnostics = TRUE,
             rich_documentation = TRUE,