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

refactor: rename orig-fn arg in advice to fn

Browse source 
A minor tweak to our naming conventions for the first argument of an
:around advice.
This commit is contained in:
Henrik Lissner 2021-08-04 01:18:06 -04:00
parent 12732be155
commit 06392a723f
51 changed files with 223 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/tools/lsp/+eglot.el
View file

@ -27,7 +27,7 @@
(after! flycheck
(load! "autoload/flycheck-eglot")))
(defadvice! +lsp--defer-server-shutdown-a (orig-fn &optional server)
(defadvice! +lsp--defer-server-shutdown-a (fn &optional server)
"Defer server shutdown for a few seconds.
This gives the user a chance to open other project files before the server is
auto-killed (which is a potentially expensive process). It also prevents the
@ -45,4 +45,4 @@ server getting expensively restarted when reverting buffers."
(prog1 (funcall eglot-shutdown server)
(+lsp-optimization-mode -1))))
server)))
(funcall orig-fn server))))
(funcall fn server))))

20
modules/tools/lsp/+lsp.el
View file

@ -73,14 +73,14 @@ about it (it will be logged to *Messages* however).")
:implementations '(lsp-find-implementation :async t)
:type-definition #'lsp-find-type-definition)
(defadvice! +lsp--respect-user-defined-checkers-a (orig-fn &rest args)
(defadvice! +lsp--respect-user-defined-checkers-a (fn &rest args)
"Ensure user-defined `flycheck-checker' isn't overwritten by `lsp'."
:around #'lsp-diagnostics-flycheck-enable
(if flycheck-checker
(let ((old-checker flycheck-checker))
(apply orig-fn args)
(apply fn args)
(setq-local flycheck-checker old-checker))
(apply orig-fn args)))
(apply fn args)))
(add-hook! 'lsp-mode-hook
(defun +lsp-display-guessed-project-root-h ()
@ -102,7 +102,7 @@ about it (it will be logged to *Messages* however).")
(remq 'company-capf company-backends))))))))
(defvar +lsp--deferred-shutdown-timer nil)
(defadvice! +lsp-defer-server-shutdown-a (orig-fn &optional restart)
(defadvice! +lsp-defer-server-shutdown-a (fn &optional restart)
"Defer server shutdown for a few seconds.
This gives the user a chance to open other project files before the server is
auto-killed (which is a potentially expensive process). It also prevents the
@ -112,7 +112,7 @@ server getting expensively restarted when reverting buffers."
restart
(null +lsp-defer-shutdown)
(= +lsp-defer-shutdown 0))
(prog1 (funcall orig-fn restart)
(prog1 (funcall fn restart)
(+lsp-optimization-mode -1))
(when (timerp +lsp--deferred-shutdown-timer)
(cancel-timer +lsp--deferred-shutdown-timer))
@ -123,11 +123,11 @@ server getting expensively restarted when reverting buffers."
(with-lsp-workspace workspace
(unless (lsp--workspace-buffers workspace)
(let ((lsp-restart 'ignore))
(funcall orig-fn))
(funcall fn))
(+lsp-optimization-mode -1))))
lsp--cur-workspace))))
(defadvice! +lsp-dont-prompt-to-install-servers-maybe-a (orig-fn &rest args)
(defadvice! +lsp-dont-prompt-to-install-servers-maybe-a (fn &rest args)
:around #'lsp
(when (buffer-file-name)
(require 'lsp-mode)
@ -136,7 +136,7 @@ server getting expensively restarted when reverting buffers."
(-andfn #'lsp--matching-clients?
#'lsp--server-binary-present?))
(not (memq +lsp-prompt-to-install-server '(nil quiet))))
(apply orig-fn args)
(apply fn args)
;; HACK `lsp--message' overrides `inhibit-message', so use `quiet!'
(let ((doom-debug-p
(or doom-debug-p
@ -169,12 +169,12 @@ server getting expensively restarted when reverting buffers."
(use-package! lsp-ui
:hook (lsp-mode . lsp-ui-mode)
:init
(defadvice! +lsp--use-hook-instead-a (orig-fn &rest args)
(defadvice! +lsp--use-hook-instead-a (fn &rest args)
"Change `lsp--auto-configure' to not force `lsp-ui-mode' on us. Using a hook
instead is more sensible."
:around #'lsp--auto-configure
(letf! ((#'lsp-ui-mode #'ignore))
(apply orig-fn args)))
(apply fn args)))
:config
(when (featurep! +peek)