Merge pull request #577 from renkun-ken/drop-diagnostics

Drop diagnostics on callback if disabled

Author: renkun-ken

R/diagnostics.R

@@ -97,7 +97,8 @@ diagnose_file <- function(uri, content, is_rmarkdown = FALSE, globals = NULL, ca
 }
 
 diagnostics_callback <- function(self, uri, version, diagnostics) {
-    if (is.null(diagnostics) || !self$workspace$documents$has(uri)) return(NULL)
+    if (is.null(diagnostics) || !self$workspace$documents$has(uri) || !lsp_settings$get("diagnostics")) return(NULL)
+
     logger$info("diagnostics_callback called:", list(
         uri = uri,
         version = version,

R/handlers-workspace.R

@@ -20,8 +20,8 @@ workspace_did_change_configuration <- function(self, params) {
     settings <- params$settings
 
     # flatten vscode r-lsp settings
-    vscode_setting <- tryCatch(settings$r$lsp, error = function(e) NULL)
-    settings <- if (is.null(vscode_setting)) settings else vscode_setting
+    vscode_settings <- settings$r$lsp
+    settings <- if (is.null(vscode_settings)) settings else vscode_settings
 
     logger$info("settings ", settings)