From 899c4b8117095571438e54059baa55ffb253fa00 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 24 Feb 2019 13:52:36 -0500 Subject: [PATCH] Disable +flycheck-popup-mode in lsp-ui-mode #1192 As its redundant with lsp-ui's sideline feature. --- modules/tools/flycheck/autoload.el | 8 ++++++++ modules/tools/flycheck/config.el | 7 +++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/modules/tools/flycheck/autoload.el b/modules/tools/flycheck/autoload.el index ccbaa1c94..0d4e3e54e 100644 --- a/modules/tools/flycheck/autoload.el +++ b/modules/tools/flycheck/autoload.el @@ -42,3 +42,11 @@ flycheck-popup-tip-old-display-function nil) (dolist (hook hooks) (remove-hook hook '+flycheck-cleanup-popup t)))))) + +;;;###autoload +(defun +flycheck|disable-popup-mode-for-lsp () + "Disable `+flycheck-popup-mode' if `lsp-ui-mode' and `lsp-ui-sideline-enable' +are non-nil." + (when (and (bound-and-true-p lsp-ui-mode) + lsp-ui-sideline-enable) + (+flycheck-popup-mode -1))) diff --git a/modules/tools/flycheck/config.el b/modules/tools/flycheck/config.el index 0d1cf2af8..610b42c3f 100644 --- a/modules/tools/flycheck/config.el +++ b/modules/tools/flycheck/config.el @@ -32,8 +32,11 @@ (def-package! flycheck-popup-tip :commands (flycheck-popup-tip-show-popup flycheck-popup-tip-delete-popup) - :init (add-hook 'flycheck-mode-hook #'+flycheck-popup-mode) - :config (setq flycheck-popup-tip-error-prefix "✕ ")) + :init + (add-hook 'flycheck-mode-hook #'+flycheck-popup-mode) + (add-hook '+flycheck-popup-mode-hook #'+flycheck|disable-popup-mode-for-lsp) + :config + (setq flycheck-popup-tip-error-prefix "✕ ")) (def-package! flycheck-posframe