From ebc1e7092d63be522654ad04b4a246701dabd12f Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 11 Oct 2020 19:44:00 -0400 Subject: [PATCH] tools/lsp: restore flycheck-checker fix #3989 Removed in 22b6eaed0. --- modules/tools/lsp/+lsp.el | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/tools/lsp/+lsp.el b/modules/tools/lsp/+lsp.el index 30aa1af64..7cca32a17 100644 --- a/modules/tools/lsp/+lsp.el +++ b/modules/tools/lsp/+lsp.el @@ -52,6 +52,15 @@ Can be a list of backends; accepts any value `company-backends' accepts.") :type-definition #'lsp-find-type-definition :references #'lsp-find-references) + (defadvice! +lsp--respect-user-defined-checkers-a (orig-fn &rest args) + "Ensure user-defined `flycheck-checker' isn't overwritten by `lsp'." + :around #'lsp-diagnostics--flycheck-enable + (if flycheck-checker + (let ((old-checker flycheck-checker)) + (apply orig-fn args) + (setq-local flycheck-checker old-checker)) + (apply orig-fn args))) + (add-hook! 'lsp-mode-hook (defun +lsp-display-guessed-project-root-h () "Log what LSP things is the root of the current project."