From 35dcdfe389e63343a9b3f18bd04838a41b740137 Mon Sep 17 00:00:00 2001 From: tastytea Date: Sun, 27 Oct 2019 21:08:30 +0100 Subject: [PATCH] Turn whitespace-mode off when enabling lsp-ui-peek-mode, and turn it back on afterwards. --- init/basics/appearance.el | 1 - init/programming/c++.el | 10 +++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/init/basics/appearance.el b/init/basics/appearance.el index b2be495..1150f73 100644 --- a/init/basics/appearance.el +++ b/init/basics/appearance.el @@ -151,7 +151,6 @@ (prog-mode . my/ws-load-local-vars-first) (conf-mode . my/ws-load-local-vars-first) (text-mode . my/ws-load-local-vars-first) - (lsp-ui-peek-mode . my/whitespace-mode-off) ; Dots in wrong color. :custom-face (whitespace-space ((nil :foreground "gray18"))) diff --git a/init/programming/c++.el b/init/programming/c++.el index 2200401..89ab55e 100644 --- a/init/programming/c++.el +++ b/init/programming/c++.el @@ -1,6 +1,6 @@ ;;; c++.el --- C++ settings. -*- lexical-binding: t; -*- -;; Time-stamp: <2019-10-14T13:34:51+00:00> +;; Time-stamp: <2019-10-27T20:06:26+00:00> ;;; Commentary: @@ -80,6 +80,7 @@ ;; Client for Language Server Protocol servers. (use-package lsp-mode :if (executable-find "clangd") + :after (whitespace) :custom (lsp-prefer-flymake nil) ; Disable flymake. @@ -87,9 +88,16 @@ (lsp-clients-clangd-args '("-compile-commands-dir=build")) (lsp-eldoc-render-all t) ; Display all eldoc information. + :config + (defun my/lsp-ws-toggle () + (if lsp-ui-peek-mode + (my/whitespace-mode-off) + (my/whitespace-mode-on))) + :hook (c++-mode . lsp) (c-mode . lsp) + (lsp-ui-peek-mode . my/lsp-ws-toggle) ; Dots in wrong color. ) ;; Eye-candy and flycheck support for lsp-mode.