Turn whitespace-mode off when enabling lsp-ui-peek-mode,

and turn it back on afterwards.
This commit is contained in:
tastytea 2019-10-27 21:08:30 +01:00
parent edc89e030f
commit 35dcdfe389
2 changed files with 9 additions and 2 deletions

View File

@ -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")))

View File

@ -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.