Skip to content

Drop diagnostics on callback if disabled #577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
renkun-ken merged 1 commit into from
Oct 13, 2022
Merged

Drop diagnostics on callback if disabled #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion R/diagnostics.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions R/handlers-workspace.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down