lang/emacs-lisp: reformat & autoload functions
This commit is contained in:
Henrik Lissner
parent
6b7f97f4fc
commit
4acb3f29ab
2 changed files with 99 additions and 78 deletions
|
|
@ -1,24 +1,9 @@
|
||||||
;;; lang/emacs-lisp/autoload.el -*- lexical-binding: t; -*-
|
;;; lang/emacs-lisp/autoload.el -*- lexical-binding: t; -*-
|
||||||
|
|
||||||
;;;###autoload
|
|
||||||
(autoload 'overseer-test "overseer" nil t)
|
|
||||||
|
|
||||||
|
|
||||||
;;
|
;;
|
||||||
;; Library
|
;; Library
|
||||||
;;
|
;;
|
||||||
|
|
||||||
;;;###autoload
|
|
||||||
(defun +emacs-lisp/repl ()
|
|
||||||
"Open the Emacs Lisp REPL (`ielm')."
|
|
||||||
(interactive)
|
|
||||||
(pop-to-buffer
|
|
||||||
(or (get-buffer "*ielm*")
|
|
||||||
(progn (ielm)
|
|
||||||
(let ((buf (get-buffer "*ielm*")))
|
|
||||||
(bury-buffer buf)
|
|
||||||
buf)))))
|
|
||||||
|
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(defun +emacs-lisp-eval (beg end)
|
(defun +emacs-lisp-eval (beg end)
|
||||||
"Evaluate a region and print it to the echo area (if one line long), otherwise
|
"Evaluate a region and print it to the echo area (if one line long), otherwise
|
||||||
|
|
@ -44,3 +29,94 @@ to a pop up buffer."
|
||||||
(t
|
(t
|
||||||
(message "%s" (buffer-substring (point-min) (point-max)))
|
(message "%s" (buffer-substring (point-min) (point-max)))
|
||||||
(kill-buffer buf))))))
|
(kill-buffer buf))))))
|
||||||
|
|
||||||
|
(defvar +emacs-lisp--face nil)
|
||||||
|
;;;###autoload
|
||||||
|
(defun +emacs-lisp-highlight-vars-and-faces (end)
|
||||||
|
"Match defined variables and functions.
|
||||||
|
|
||||||
|
Functions are differentiated into special forms, built-in functions and
|
||||||
|
library/userland functions"
|
||||||
|
(catch 'matcher
|
||||||
|
(while (re-search-forward "\\_<.+?\\_>" end t)
|
||||||
|
(unless (save-excursion
|
||||||
|
(let ((ppss (syntax-ppss)))
|
||||||
|
(or (nth 3 ppss) (nth 4 ppss))))
|
||||||
|
(let ((symbol (intern-soft (match-string-no-properties 0))))
|
||||||
|
(and (cond ((null symbol) nil)
|
||||||
|
((eq symbol t) nil)
|
||||||
|
((special-variable-p symbol)
|
||||||
|
(setq +emacs-lisp--face 'font-lock-variable-name-face))
|
||||||
|
((and (fboundp symbol)
|
||||||
|
(eq (char-before (match-beginning 0)) ?\())
|
||||||
|
(let ((unaliased (indirect-function symbol)))
|
||||||
|
(unless (or (macrop unaliased)
|
||||||
|
(special-form-p unaliased))
|
||||||
|
(let (unadvised)
|
||||||
|
(while (not (eq (setq unadvised (ad-get-orig-definition unaliased))
|
||||||
|
(setq unaliased (indirect-function unadvised)))))
|
||||||
|
unaliased)
|
||||||
|
(setq +emacs-lisp--face
|
||||||
|
(if (subrp unaliased)
|
||||||
|
'font-lock-constant-face
|
||||||
|
'font-lock-function-name-face))))))
|
||||||
|
(throw 'matcher t)))))
|
||||||
|
nil))
|
||||||
|
|
||||||
|
;; `+emacs-lisp-highlight-vars-and-faces' is a potentially expensive function
|
||||||
|
;; and should be byte-compiled, no matter what, to ensure it runs as fast as
|
||||||
|
;; possible:
|
||||||
|
(eval-when-compile
|
||||||
|
(with-no-warnings
|
||||||
|
(byte-compile #'+emacs-lisp-highlight-vars-and-faces)))
|
||||||
|
|
||||||
|
|
||||||
|
;;
|
||||||
|
;; Commands
|
||||||
|
;;
|
||||||
|
|
||||||
|
;;;###autoload
|
||||||
|
(defun +emacs-lisp/repl ()
|
||||||
|
"Open the Emacs Lisp REPL (`ielm')."
|
||||||
|
(interactive)
|
||||||
|
(pop-to-buffer
|
||||||
|
(or (get-buffer "*ielm*")
|
||||||
|
(progn (ielm)
|
||||||
|
(let ((buf (get-buffer "*ielm*")))
|
||||||
|
(bury-buffer buf)
|
||||||
|
buf)))))
|
||||||
|
|
||||||
|
|
||||||
|
;;
|
||||||
|
;; Hooks
|
||||||
|
;;
|
||||||
|
|
||||||
|
;;;###autoload
|
||||||
|
(defun +emacs-lisp|extend-imenu ()
|
||||||
|
"Improve imenu support with better expression regexps and Doom-specific forms."
|
||||||
|
(setq imenu-generic-expression
|
||||||
|
'(("Evil Commands" "^\\s-*(evil-define-\\(?:command\\|operator\\|motion\\) +\\(\\_<[^ ()\n]+\\_>\\)" 1)
|
||||||
|
("Unit tests" "^\\s-*(\\(?:ert-deftest\\|describe\\) +\"\\([^\")]+\\)\"" 1)
|
||||||
|
("Package" "^\\s-*(\\(?:def-\\)?package! +\\(\\_<[^ ()\n]+\\_>\\)" 1)
|
||||||
|
("Settings" "^\\s-*(def-setting! +\\([^ ()\n]+\\)" 1)
|
||||||
|
("Major modes" "^\\s-*(define-derived-mode +\\([^ ()\n]+\\)" 1)
|
||||||
|
("Modelines" "^\\s-*(def-modeline! +\\([^ ()\n]+\\)" 1)
|
||||||
|
("Modeline Segments" "^\\s-*(def-modeline-segment! +\\([^ ()\n]+\\)" 1)
|
||||||
|
("Advice" "^\\s-*(def\\(?:\\(?:ine-\\)?advice\\))")
|
||||||
|
("Modes" "^\\s-*(define-\\(?:global\\(?:ized\\)?-minor\\|generic\\|minor\\)-mode +\\([^ ()\n]+\\)" 1)
|
||||||
|
("Macros" "^\\s-*(\\(?:cl-\\)?def\\(?:ine-compile-macro\\|macro\\) +\\([^ )\n]+\\)" 1)
|
||||||
|
("Inline Functions" "\\s-*(\\(?:cl-\\)?defsubst +\\([^ )\n]+\\)" 1)
|
||||||
|
("Functions" "^\\s-*(\\(?:cl-\\)?def\\(?:un\\|un\\*\\|method\\|generic\\|-memoized!\\) +\\([^ ,)\n]+\\)" 1)
|
||||||
|
("Variables" "^\\s-*(\\(def\\(?:c\\(?:onst\\(?:ant\\)?\\|ustom\\)\\|ine-symbol-macro\\|parameter\\|var\\(?:-local\\)?\\)\\)\\s-+\\(\\(?:\\sw\\|\\s_\\|\\\\.\\)+\\)" 2)
|
||||||
|
("Types" "^\\s-*(\\(cl-def\\(?:struct\\|type\\)\\|def\\(?:class\\|face\\|group\\|ine-\\(?:condition\\|error\\|widget\\)\\|package\\|struct\\|t\\(?:\\(?:hem\\|yp\\)e\\)\\)\\)\\s-+'?\\(\\(?:\\sw\\|\\s_\\|\\\\.\\)+\\)" 2))))
|
||||||
|
|
||||||
|
;;;###autoload
|
||||||
|
(defun +emacs-lisp|disable-flycheck-maybe ()
|
||||||
|
"Disable flycheck-mode if in emacs.d."
|
||||||
|
(when (and (bound-and-true-p flycheck-mode)
|
||||||
|
(eq major-mode 'emacs-lisp-mode)
|
||||||
|
(or (not buffer-file-name)
|
||||||
|
(cl-loop for dir in (list doom-emacs-dir doom-private-dir)
|
||||||
|
if (file-in-directory-p buffer-file-name dir)
|
||||||
|
return t)))
|
||||||
|
(flycheck-mode -1)))
|
||||||
|
|
|
||||||
|
|
@ -54,41 +54,11 @@
|
||||||
;; fontification
|
;; fontification
|
||||||
rainbow-delimiters-mode highlight-quoted-mode
|
rainbow-delimiters-mode highlight-quoted-mode
|
||||||
;; initialization
|
;; initialization
|
||||||
+emacs-lisp|init-imenu))
|
+emacs-lisp|extend-imenu))
|
||||||
|
|
||||||
(defvar +emacs-lisp--face nil)
|
;; Flycheck produces a *lot* of false positives in emacs configs, so disable
|
||||||
(defun +emacs-lisp-highlight-vars-and-faces (end)
|
;; it when you're editing them
|
||||||
"Match defined variables and functions.
|
(add-hook 'flycheck-mode-hook #'+emacs-lisp|disable-flycheck-maybe)
|
||||||
|
|
||||||
Functions are differentiated into special forms, built-in functions and
|
|
||||||
library/userland functions"
|
|
||||||
(catch 'matcher
|
|
||||||
(while (re-search-forward "\\_<.+?\\_>" end t)
|
|
||||||
(unless (save-excursion
|
|
||||||
(let ((ppss (syntax-ppss)))
|
|
||||||
(or (nth 3 ppss) (nth 4 ppss))))
|
|
||||||
(let ((symbol (intern-soft (match-string-no-properties 0))))
|
|
||||||
(and (cond ((null symbol) nil)
|
|
||||||
((eq symbol t) nil)
|
|
||||||
((special-variable-p symbol)
|
|
||||||
(setq +emacs-lisp--face 'font-lock-variable-name-face))
|
|
||||||
((and (fboundp symbol)
|
|
||||||
(eq (char-before (match-beginning 0)) ?\())
|
|
||||||
(let ((unaliased (indirect-function symbol t)))
|
|
||||||
(unless (or (macrop unaliased)
|
|
||||||
(special-form-p unaliased))
|
|
||||||
(let (unadvised)
|
|
||||||
(while (not (eq (setq unadvised (ad-get-orig-definition unaliased))
|
|
||||||
(setq unaliased (indirect-function unadvised t)))))
|
|
||||||
unaliased)
|
|
||||||
(setq +emacs-lisp--face
|
|
||||||
(if (subrp unaliased)
|
|
||||||
'font-lock-constant-face
|
|
||||||
'font-lock-function-name-face))))))
|
|
||||||
(throw 'matcher t)))))
|
|
||||||
nil))
|
|
||||||
(eval-when-compile
|
|
||||||
(byte-compile #'+emacs-lisp-highlight-vars-and-faces))
|
|
||||||
|
|
||||||
;; Special fontification for doom
|
;; Special fontification for doom
|
||||||
(font-lock-add-keywords
|
(font-lock-add-keywords
|
||||||
|
|
@ -98,35 +68,6 @@ library/userland functions"
|
||||||
;; highlight defined, special variables & functions
|
;; highlight defined, special variables & functions
|
||||||
(+emacs-lisp-highlight-vars-and-faces . +emacs-lisp--face))))
|
(+emacs-lisp-highlight-vars-and-faces . +emacs-lisp--face))))
|
||||||
|
|
||||||
(defun +emacs-lisp|init-imenu ()
|
|
||||||
"Improve imenu support with better expression regexps and Doom-specific forms."
|
|
||||||
(setq imenu-generic-expression
|
|
||||||
'(("Evil Commands" "^\\s-*(evil-define-\\(?:command\\|operator\\|motion\\) +\\(\\_<[^ ()\n]+\\_>\\)" 1)
|
|
||||||
("Unit tests" "^\\s-*(\\(?:ert-deftest\\|describe\\) +\"\\([^\")]+\\)\"" 1)
|
|
||||||
("Package" "^\\s-*(\\(?:def-\\)?package! +\\(\\_<[^ ()\n]+\\_>\\)" 1)
|
|
||||||
("Settings" "^\\s-*(def-setting! +\\([^ ()\n]+\\)" 1)
|
|
||||||
("Major modes" "^\\s-*(define-derived-mode +\\([^ ()\n]+\\)" 1)
|
|
||||||
("Modelines" "^\\s-*(def-modeline! +\\([^ ()\n]+\\)" 1)
|
|
||||||
("Modeline Segments" "^\\s-*(def-modeline-segment! +\\([^ ()\n]+\\)" 1)
|
|
||||||
("Advice" "^\\s-*(def\\(?:\\(?:ine-\\)?advice\\))")
|
|
||||||
("Modes" "^\\s-*(define-\\(?:global\\(?:ized\\)?-minor\\|generic\\|minor\\)-mode +\\([^ ()\n]+\\)" 1)
|
|
||||||
("Macros" "^\\s-*(\\(?:cl-\\)?def\\(?:ine-compile-macro\\|macro\\) +\\([^ )\n]+\\)" 1)
|
|
||||||
("Inline Functions" "\\s-*(\\(?:cl-\\)?defsubst +\\([^ )\n]+\\)" 1)
|
|
||||||
("Functions" "^\\s-*(\\(?:cl-\\)?def\\(?:un\\|un\\*\\|method\\|generic\\|-memoized!\\) +\\([^ ,)\n]+\\)" 1)
|
|
||||||
("Variables" "^\\s-*(\\(def\\(?:c\\(?:onst\\(?:ant\\)?\\|ustom\\)\\|ine-symbol-macro\\|parameter\\|var\\(?:-local\\)?\\)\\)\\s-+\\(\\(?:\\sw\\|\\s_\\|\\\\.\\)+\\)" 2)
|
|
||||||
("Types" "^\\s-*(\\(cl-def\\(?:struct\\|type\\)\\|def\\(?:class\\|face\\|group\\|ine-\\(?:condition\\|error\\|widget\\)\\|package\\|struct\\|t\\(?:\\(?:hem\\|yp\\)e\\)\\)\\)\\s-+'?\\(\\(?:\\sw\\|\\s_\\|\\\\.\\)+\\)" 2))))
|
|
||||||
|
|
||||||
(defun +emacs-lisp|disable-flycheck-maybe ()
|
|
||||||
"Disable flycheck-mode if in emacs.d."
|
|
||||||
(when (and flycheck-mode
|
|
||||||
(eq major-mode 'emacs-lisp-mode)
|
|
||||||
(or (not buffer-file-name)
|
|
||||||
(cl-loop for dir in (list doom-emacs-dir doom-private-dir)
|
|
||||||
if (file-in-directory-p buffer-file-name dir)
|
|
||||||
return t)))
|
|
||||||
(flycheck-mode -1)))
|
|
||||||
(add-hook 'flycheck-mode-hook #'+emacs-lisp|disable-flycheck-maybe)
|
|
||||||
|
|
||||||
;; Recenter window after following definition
|
;; Recenter window after following definition
|
||||||
(advice-add #'elisp-def :after #'doom*recenter))
|
(advice-add #'elisp-def :after #'doom*recenter))
|
||||||
|
|
||||||
|
|
@ -165,6 +106,10 @@ library/userland functions"
|
||||||
(add-hook 'macrostep-mode-hook #'evil-normalize-keymaps)))
|
(add-hook 'macrostep-mode-hook #'evil-normalize-keymaps)))
|
||||||
|
|
||||||
|
|
||||||
|
;; `overseer'
|
||||||
|
(autoload 'overseer-test "overseer" nil t)
|
||||||
|
|
||||||
|
|
||||||
(def-package! flycheck-cask
|
(def-package! flycheck-cask
|
||||||
:when (featurep! :feature syntax-checker)
|
:when (featurep! :feature syntax-checker)
|
||||||
:defer t
|
:defer t
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue