Merge pull request #3256 from sei40kr/improve-lsp-flycheck

tools/lsp: Make lsp checker chained to other checkers
This commit is contained in:
Henrik Lissner 2020-05-31 06:19:17 -04:00 committed by GitHub
commit 134554dd69
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -119,12 +119,14 @@ This also logs the resolved project root, if found, so we know where we are."
((or :flymake 't)
(lsp--flymake-setup))
(:flycheck
(let ((old-checker flycheck-checker))
(lsp-flycheck-enable)
;; Ensure file/dir local `flycheck-checker' is respected
(when old-checker
(setq-local flycheck-checker old-checker)
(kill-local-variable 'flycheck-check-syntax-automatically)))))))
(unless flycheck-checker
(if (flycheck-checker-supports-major-mode-p 'lsp major-mode)
(lsp-flycheck-enable)
(let ((old-checker (flycheck-get-checker-for-buffer)))
(lsp-flycheck-enable)
(flycheck-add-next-checker 'lsp old-checker)))
(kill-local-variable 'flycheck-checker))))))
(defvar +lsp--deferred-shutdown-timer nil)
(defadvice! +lsp-defer-server-shutdown-a (orig-fn &optional restart)