emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

💥 revise hook/var fns naming convention (2/2)

Browse source 
This is second of three big naming convention changes. In this commit,
we change the naming conventions for hook functions and variable
functions:

1. Replace the bar | to indicate a hook function with a -h suffix, e.g.

     doom|init-ui -> doom-init-ui-h
     doom|run-local-var-hooks -> doom-run-local-var-hooks-h

2. And add a -fn suffix for functions meant to be set on variables,
   e.g.

     (setq magit-display-buffer-function #'+magit-display-buffer-fn)

See ccf327f8 for the reasoning behind these changes.
This commit is contained in:
Henrik Lissner 2019-07-18 15:27:20 +02:00
parent 51d3b1b424
commit 149b2617b0
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
58 changed files with 521 additions and 517 deletions
Download patch file Download diff file Expand all files Collapse all files

30
modules/tools/lsp/config.el
View file

@ -23,15 +23,15 @@
(def-package! lsp-ui
:hook (lsp-mode . lsp-ui-mode)
:init
(defun +lsp|init-ui-flycheck-or-flymake ()
"Sets up flymake-mode or flycheck-mode, depending on `lsp-prefer-flymake'."
(unless (eq :none lsp-prefer-flymake)
(if (and (not (version< emacs-version "26.1"))
lsp-prefer-flymake)
(lsp--flymake-setup))
(require 'lsp-ui-flycheck)
(lsp-ui-flycheck-enable t)))
(add-hook 'lsp-ui-mode-hook #'+lsp|init-ui-flycheck-or-flymake)
(add-hook 'lsp-ui-mode-hook
(defun +lsp-init-ui-flycheck-or-flymake-h ()
"Sets up flymake-mode or flycheck-mode, depending on `lsp-prefer-flymake'."
(unless (eq :none lsp-prefer-flymake)
(if (and (not (version< emacs-version "26.1"))
lsp-prefer-flymake)
(lsp--flymake-setup))
(require 'lsp-ui-flycheck)
(lsp-ui-flycheck-enable t))))
:config
(setq lsp-prefer-flymake nil
lsp-ui-doc-max-height 8
@ -52,11 +52,11 @@
:init
;; Make sure that `company-capf' is disabled since it is incompatible with
;; `company-lsp' (see lsp-mode#884)
(defun +lsp|init-company ()
(if (not (bound-and-true-p company-mode))
(add-hook 'company-mode-hook #'+lsp|init-company t t)
(setq-local company-backends
(add-hook 'lsp-mode-hook
(defun +lsp-init-company-h ()
(if (not (bound-and-true-p company-mode))
(add-hook 'company-mode-hook #'+lsp-init-company-h t t)
(setq-local company-backends
(cons 'company-lsp
(remq 'company-capf company-backends)))
(remove-hook 'company-mode-hook #'+lsp|init-company t)))
(add-hook 'lsp-mode-hook #'+lsp|init-company))
(remove-hook 'company-mode-hook #'+lsp-init-company-h t)))))