Major optimization refactor, across the board
+ enable lexical-scope everywhere (lexical-binding = t): ~5-10% faster startup; ~5-20% general boost + reduce consing, function calls & garbage collection by preferring cl-loop & dolist over lambda closures (for mapc[ar], add-hook, and various cl-lib filter/map/reduce functions) -- where possible + prefer functions with dedicated opcodes, like assq (see byte-defop's in bytecomp.el for more) + prefer pcase & cond (faster) over cl-case + general refactor for code readability + ensure naming & style conventions are adhered to + appease byte-compiler by marking unused variables with underscore + defer minor mode activation to after-init, emacs-startup or window-setup hooks; a customization opportunity for users + ensures custom functionality won't interfere with startup.
This commit is contained in:
Henrik Lissner
parent
64a142b3fc
commit
c7254e7bdc
154 changed files with 1101 additions and 1118 deletions
|
|
@ -1,4 +1,4 @@
|
|||
;;; company.el
|
||||
;;; completion/company/autoload.el -*- lexical-binding: t; -*-
|
||||
|
||||
;;;###autoload
|
||||
(defun +company/complete ()
|
||||
|
|
@ -15,17 +15,18 @@
|
|||
C-x C-l."
|
||||
(interactive (list 'interactive))
|
||||
(require 'company)
|
||||
(unless (bound-and-true-p company-mode) (company-mode))
|
||||
(let ((lines (split-string
|
||||
(replace-regexp-in-string
|
||||
"^[\t\s]+" ""
|
||||
(concat (buffer-substring-no-properties (point-min) (line-beginning-position))
|
||||
(buffer-substring-no-properties (line-end-position) (point-max))))
|
||||
"\\(\r\n\\|[\n\r]\\)" t)))
|
||||
(cl-case command
|
||||
(interactive (company-begin-backend '+company/whole-lines))
|
||||
(prefix (company-grab-line "^[\t\s]*\\(.+\\)" 1))
|
||||
(candidates (all-completions arg lines)))))
|
||||
(pcase command
|
||||
('interactive (company-begin-backend '+company/whole-lines))
|
||||
('prefix (company-grab-line "^[\t\s]*\\(.+\\)" 1))
|
||||
('candidates
|
||||
(all-completions
|
||||
arg
|
||||
(split-string
|
||||
(replace-regexp-in-string
|
||||
"^[\t\s]+" ""
|
||||
(concat (buffer-substring-no-properties (point-min) (line-beginning-position))
|
||||
(buffer-substring-no-properties (line-end-position) (point-max))))
|
||||
"\\(\r\n\\|[\n\r]\\)" t)))))
|
||||
|
||||
;;;###autoload
|
||||
(defun +company/dict-or-keywords ()
|
||||
|
|
|
|||
|
|
@ -1,12 +1,11 @@
|
|||
;;; completion/company/config.el
|
||||
;;; completion/company/config.el -*- lexical-binding: t; -*-
|
||||
|
||||
(def-setting! :company-backend (modes backends)
|
||||
"Register company BACKENDS to MODES."
|
||||
(let* ((modes (if (listp modes) modes (list modes)))
|
||||
(backends (if (listp backends) backends (list backends)))
|
||||
(def-name (intern (format "doom--init-company-%s"
|
||||
(mapconcat #'identity (mapcar #'symbol-name modes) "-"))))
|
||||
(quoted (eq (car-safe backends) 'quote)))
|
||||
(mapconcat #'identity (mapcar #'symbol-name modes) "-")))))
|
||||
;; TODO more type checks
|
||||
`(prog1
|
||||
(defun ,def-name ()
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
;;; emacs/ido/config.el
|
||||
;;; completion/ido/config.el -*- lexical-binding: t; -*-
|
||||
|
||||
(def-package! ido
|
||||
:init
|
||||
:config
|
||||
(setq ido-ignore-buffers
|
||||
'("\\` " "^\\*ESS\\*" "^\\*Messages\\*" "^\\*Help\\*" "^\\*Buffer"
|
||||
"^\\*.*Completions\\*$" "^\\*Ediff" "^\\*tramp" "^\\*cvs-"
|
||||
|
|
@ -16,7 +16,6 @@
|
|||
ido-enable-last-directory-history t
|
||||
ido-save-directory-list-file (concat doom-cache-dir "ido.last"))
|
||||
|
||||
:config
|
||||
(push "\\`.DS_Store$" ido-ignore-files)
|
||||
(push "Icon\\?$" ido-ignore-files)
|
||||
|
||||
|
|
@ -24,15 +23,15 @@
|
|||
(ido-everywhere 1)
|
||||
(require 'ido-ubiquitous)
|
||||
|
||||
(add-hook! ido-setup
|
||||
(defun +ido|init ()
|
||||
(require 'ido-vertical-mode)
|
||||
(require 'flx-ido)
|
||||
(require 'crm-custom)
|
||||
|
||||
(map! :map (ido-common-completion-map ido-completion-map ido-file-completion-map)
|
||||
"C-n" #'ido-next-match
|
||||
"C-p" #'ido-prev-match
|
||||
"C-w" #'ido-delete-backward-word-updir))
|
||||
(add-hook 'ido-setup-hook #'+ido|init)
|
||||
|
||||
(defun +ido*sort-mtime ()
|
||||
"Sort ido filelist by mtime instead of alphabetically."
|
||||
|
|
@ -43,16 +42,16 @@
|
|||
(sixth (file-attributes (concat ido-current-directory b)))
|
||||
(sixth (file-attributes (concat ido-current-directory a)))))))
|
||||
(ido-to-end ;; move . files to end (again)
|
||||
(delq nil (mapcar
|
||||
(lambda (x) (and (char-equal (string-to-char x) ?.) x))
|
||||
ido-temp-list))))
|
||||
(cl-loop for x in ido-temp-list
|
||||
if (char-equal (string-to-char x) ?.)
|
||||
collect x)))
|
||||
(advice-add #'ido-sort-mtime :override #'+ido*sort-mtime)
|
||||
(add-hook! (ido-make-file-list ido-make-dir-list) #'+ido*sort-mtime)
|
||||
|
||||
(defun +ido|setup-home-keybind ()
|
||||
"Go to $HOME with ~"
|
||||
(define-key ido-file-completion-map (kbd "~")
|
||||
(λ! (if (looking-back "/")
|
||||
(λ! (if (looking-back "/" (point-min))
|
||||
(insert "~/")
|
||||
(call-interactively #'self-insert-command)))))
|
||||
(add-hook 'ido-setup-hook #'+ido|setup-home-keybind))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; emacs/ido/packages.el
|
||||
;;; completion/ido/packages.el
|
||||
|
||||
(package! flx-ido)
|
||||
(package! ido-ubiquitous)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
;;; completion/ivy/autoload/evil.el
|
||||
;;; completion/ivy/autoload/evil.el -*- lexical-binding: t; -*-
|
||||
|
||||
;;;###autoload (autoload '+ivy:swiper "completion/ivy/autoload/evil" nil t)
|
||||
(evil-define-command +ivy:swiper (&optional search)
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
(defvar +ivy--file-search-recursion-p t)
|
||||
(defvar +ivy--file-search-all-files-p nil)
|
||||
|
||||
(defun +ivy--file-search (engine beg end query &optional directory prompt)
|
||||
(defun +ivy--file-search (engine beg end query &optional directory)
|
||||
(let* ((directory (or directory (doom-project-root)))
|
||||
(recursion-p +ivy--file-search-recursion-p)
|
||||
(all-files-p +ivy--file-search-all-files-p)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
;;; completion/ivy/autoload/ivy.el
|
||||
;;; completion/ivy/autoload/ivy.el -*- lexical-binding: t; -*-
|
||||
|
||||
;; Show more information in ivy-switch-buffer; and only display
|
||||
;; workgroup-relevant buffers.
|
||||
|
|
@ -6,33 +6,35 @@
|
|||
(let ((min-name 5)
|
||||
(min-mode 5)
|
||||
(proot (doom-project-root)))
|
||||
(mapcar
|
||||
(lambda (b) (format (format "%%-%ds %%-%ds %%s" min-name min-mode)
|
||||
(nth 0 b)
|
||||
(nth 1 b)
|
||||
(or (nth 2 b) "")))
|
||||
(mapcar (lambda (b)
|
||||
(with-current-buffer b
|
||||
(let ((buffer-name (buffer-name b))
|
||||
(mode-name (symbol-name major-mode)))
|
||||
(when (> (length buffer-name) min-name)
|
||||
(setq min-name (+ (length buffer-name) 15)))
|
||||
(when (> (length mode-name) min-mode)
|
||||
(setq min-mode (+ (length mode-name) 3)))
|
||||
(list (concat
|
||||
(propertize buffer-name
|
||||
'face (cond ((string-match-p "^ ?\\*" buffer-name)
|
||||
'font-lock-comment-face)
|
||||
((not (string= proot (doom-project-root)))
|
||||
'font-lock-keyword-face)
|
||||
(buffer-read-only
|
||||
'error)))
|
||||
(when (and buffer-file-name (buffer-modified-p))
|
||||
(propertize "[+]" 'face 'doom-modeline-buffer-modified)))
|
||||
(propertize mode-name 'face 'font-lock-constant-face)
|
||||
(when buffer-file-name
|
||||
(abbreviate-file-name (file-name-directory buffer-file-name)))))))
|
||||
(or buffer-list (doom-buffer-list))))))
|
||||
(cl-loop for buf in (or buffer-list (doom-buffer-list))
|
||||
collect
|
||||
(destructuring-bind (type mode path)
|
||||
(+ivy--get-buffer-attrs buf proot)
|
||||
(format (format "%%-%ds %%-%ds %%s" min-name min-mode)
|
||||
type mode (or path ""))))))
|
||||
|
||||
(defun +ivy--get-buffer-attrs (b &optional project-root)
|
||||
(with-current-buffer b
|
||||
(let ((buffer-name (buffer-name b))
|
||||
(mode-name (symbol-name major-mode)))
|
||||
(when (> (length buffer-name) min-name)
|
||||
(setq min-name (+ (length buffer-name) 15)))
|
||||
(when (> (length mode-name) min-mode)
|
||||
(setq min-mode (+ (length mode-name) 3)))
|
||||
(list (concat
|
||||
(propertize buffer-name
|
||||
'face (cond ((string-match-p "^ ?\\*" buffer-name)
|
||||
'font-lock-comment-face)
|
||||
((and project-root
|
||||
(not (string= project-root (doom-project-root))))
|
||||
'font-lock-keyword-face)
|
||||
(buffer-read-only
|
||||
'error)))
|
||||
(when (and buffer-file-name (buffer-modified-p))
|
||||
(propertize "[+]" 'face 'doom-modeline-buffer-modified)))
|
||||
(propertize mode-name 'face 'font-lock-constant-face)
|
||||
(when buffer-file-name
|
||||
(abbreviate-file-name (file-name-directory buffer-file-name)))))))
|
||||
|
||||
(defun +ivy--select-buffer-action (buffer)
|
||||
(ivy--switch-buffer-action
|
||||
|
|
@ -66,54 +68,54 @@ limit to buffers in the current workspace."
|
|||
:keymap ivy-switch-buffer-map
|
||||
:caller '+ivy/switch-workspace-buffer))
|
||||
|
||||
;; TODO refactor ivy task candidate functions (messy!)
|
||||
(defun +ivy--tasks-candidates (tasks)
|
||||
"Generate a list of task tags (specified by `+ivy-task-tags') for
|
||||
`+ivy/tasks'."
|
||||
(let* ((max-type-width (seq-max (mapcar #'length (mapcar #'car +ivy-task-tags))))
|
||||
(max-desc-width (seq-max (mapcar #'length (mapcar #'cl-cdadr tasks))))
|
||||
(max-width (max 25 (min (- (frame-width) (+ max-type-width 1))
|
||||
max-desc-width)))
|
||||
(fmt (format "%%-%ds %%-%ds%%s%%s:%%s" max-type-width max-desc-width))
|
||||
lines)
|
||||
(dolist (alist tasks (nreverse lines))
|
||||
(let-alist alist
|
||||
(push (format fmt
|
||||
(propertize .type 'face (cdr (assoc .type +ivy-task-tags)))
|
||||
(substring .desc 0 (min max-desc-width (length .desc)))
|
||||
(propertize " | " 'face 'font-lock-comment-face)
|
||||
(propertize (abbreviate-file-name .file) 'face 'font-lock-keyword-face)
|
||||
(propertize .line 'face 'font-lock-constant-face))
|
||||
lines)))))
|
||||
(let* ((max-type-width
|
||||
(cl-loop for task in +ivy-task-tags maximize (length (car task))))
|
||||
(max-desc-width
|
||||
(cl-loop for task in tasks maximize (length (cl-cdadr task))))
|
||||
(max-width (max (- (frame-width) (1+ max-type-width) max-desc-width)
|
||||
25)))
|
||||
(cl-loop
|
||||
with fmt = (format "%%-%ds %%-%ds%%s%%s:%%s" max-type-width max-width)
|
||||
for alist in tasks
|
||||
collect
|
||||
(let-alist alist
|
||||
(format fmt
|
||||
(propertize .type 'face (cdr (assoc .type +ivy-task-tags)))
|
||||
(substring .desc 0 (min max-desc-width (length .desc)))
|
||||
(propertize " | " 'face 'font-lock-comment-face)
|
||||
(propertize (abbreviate-file-name .file) 'face 'font-lock-keyword-face)
|
||||
(propertize .line 'face 'font-lock-constant-face))))))
|
||||
|
||||
(defun +ivy--tasks (target)
|
||||
(let (case-fold-search)
|
||||
(delq
|
||||
nil
|
||||
(mapcar (lambda (x)
|
||||
(save-match-data
|
||||
(when (string-match (concat "^\\([^:]+\\):\\([0-9]+\\):.+\\("
|
||||
(string-join (mapcar #'car +ivy-task-tags) "\\|")
|
||||
"\\):?\\s-*\\(.+\\)")
|
||||
x)
|
||||
`((type . ,(match-string 3 x))
|
||||
(desc . ,(match-string 4 x))
|
||||
(file . ,(match-string 1 x))
|
||||
(line . ,(match-string 2 x))))))
|
||||
(let ((command (or (let ((bin (executable-find "rg")))
|
||||
(and bin (concat bin " --line-number")))
|
||||
(let ((bin (executable-find "ag")))
|
||||
(and bin (concat bin " --numbers")))
|
||||
(error "Neither ripgrep or the_silver_searcher is available")))
|
||||
(args (concat " -- "
|
||||
(shell-quote-argument
|
||||
(concat "\\s("
|
||||
(string-join (mapcar #'car +ivy-task-tags) "|")
|
||||
")([\\s:]|\\([^)]+\\):?)")))))
|
||||
(when-let (out (shell-command-to-string
|
||||
(format "%s -H -S --no-heading %s %s"
|
||||
command args target)))
|
||||
(split-string out "\n" t)))))))
|
||||
(let* (case-fold-search
|
||||
(task-tags (mapcar #'car +ivy-task-tags))
|
||||
(cmd
|
||||
(format "%s -H -S --no-heading -- %s %s"
|
||||
(or (when-let (bin (executable-find "rg"))
|
||||
(concat bin " --line-number"))
|
||||
(when-let (bin (executable-find "ag"))
|
||||
(concat bin " --numbers"))
|
||||
(error "ripgrep & the_silver_searcher are unavailable"))
|
||||
(shell-quote-argument
|
||||
(concat "\\s("
|
||||
(string-join task-tags "|")
|
||||
")([\\s:]|\\([^)]+\\):?)"))
|
||||
target)))
|
||||
(save-match-data
|
||||
(cl-loop with out = (shell-command-to-string cmd)
|
||||
for x in (and out (split-string out "\n" t))
|
||||
when (string-match
|
||||
(concat "^\\([^:]+\\):\\([0-9]+\\):.+\\("
|
||||
(string-join task-tags "\\|")
|
||||
"\\):?\\s-*\\(.+\\)")
|
||||
x)
|
||||
collect `((type . ,(match-string 3 x))
|
||||
(desc . ,(match-string 4 x))
|
||||
(file . ,(match-string 1 x))
|
||||
(line . ,(match-string 2 x)))))))
|
||||
|
||||
(defun +ivy--tasks-open-action (x)
|
||||
"Jump to the file and line of the current task."
|
||||
|
|
@ -180,27 +182,27 @@ counsel-rg)."
|
|||
(defun +ivy/wgrep-occur ()
|
||||
"Invoke the search+replace wgrep buffer on the current ag/rg search results."
|
||||
(interactive)
|
||||
(if (not (window-minibuffer-p))
|
||||
(user-error "No completion session is active")
|
||||
(require 'wgrep)
|
||||
(let* ((caller (ivy-state-caller ivy-last))
|
||||
(occur-fn (plist-get ivy--occurs-list caller))
|
||||
(buffer
|
||||
(generate-new-buffer
|
||||
(format "*ivy-occur%s \"%s\"*"
|
||||
(if caller (concat " " (prin1-to-string caller)) "")
|
||||
ivy-text))))
|
||||
(with-current-buffer buffer
|
||||
(let ((inhibit-read-only t))
|
||||
(erase-buffer)
|
||||
(funcall occur-fn))
|
||||
(setf (ivy-state-text ivy-last) ivy-text)
|
||||
(setq ivy-occur-last ivy-last)
|
||||
(setq-local ivy--directory ivy--directory))
|
||||
(ivy-exit-with-action
|
||||
`(lambda (_)
|
||||
(pop-to-buffer ,buffer)
|
||||
(ivy-wgrep-change-to-wgrep-mode))))))
|
||||
(unless (window-minibuffer-p)
|
||||
(user-error "No completion session is active"))
|
||||
(require 'wgrep)
|
||||
(let* ((caller (ivy-state-caller ivy-last))
|
||||
(occur-fn (plist-get ivy--occurs-list caller))
|
||||
(buffer
|
||||
(generate-new-buffer
|
||||
(format "*ivy-occur%s \"%s\"*"
|
||||
(if caller (concat " " (prin1-to-string caller)) "")
|
||||
ivy-text))))
|
||||
(with-current-buffer buffer
|
||||
(let ((inhibit-read-only t))
|
||||
(erase-buffer)
|
||||
(funcall occur-fn))
|
||||
(setf (ivy-state-text ivy-last) ivy-text)
|
||||
(setq ivy-occur-last ivy-last)
|
||||
(setq-local ivy--directory ivy--directory))
|
||||
(ivy-exit-with-action
|
||||
`(lambda (_)
|
||||
(pop-to-buffer ,buffer)
|
||||
(ivy-wgrep-change-to-wgrep-mode)))))
|
||||
|
||||
;;;###autoload
|
||||
(defun +ivy-yas-prompt (prompt choices &optional display-fn)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
;;; completion/ivy/packages.el
|
||||
;;; completion/ivy/config.el -*- lexical-binding: t; -*-
|
||||
|
||||
(defvar +ivy-task-tags '(("TODO" . warning)
|
||||
("FIXME" . error))
|
||||
(defvar +ivy-task-tags
|
||||
'(("TODO" . warning)
|
||||
("FIXME" . error))
|
||||
"An alist of tags for `+ivy/tasks' to include in its search, whose CDR is the
|
||||
face to render it with.")
|
||||
|
||||
|
|
@ -20,7 +21,8 @@ session)."
|
|||
;; Packages
|
||||
;;
|
||||
|
||||
(def-package! ivy :demand t
|
||||
(def-package! ivy
|
||||
:demand t
|
||||
:config
|
||||
(setq ivy-height 12
|
||||
ivy-do-completion-in-region nil
|
||||
|
|
@ -38,7 +40,7 @@ session)."
|
|||
(after! magit (setq magit-completing-read-function #'ivy-completing-read))
|
||||
(after! yasnippet (push #'+ivy-yas-prompt yas-prompt-functions))
|
||||
|
||||
(ivy-mode +1)
|
||||
(add-hook 'window-setup-hook #'ivy-mode)
|
||||
|
||||
(map! :map ivy-mode-map
|
||||
[remap describe-face] #'counsel-describe-face
|
||||
|
|
@ -79,12 +81,16 @@ session)."
|
|||
|
||||
;; Configure `counsel-rg', `counsel-ag' & `counsel-pt'
|
||||
(set! :popup 'ivy-occur-grep-mode :size (+ 2 ivy-height) :regexp t :autokill t)
|
||||
|
||||
(dolist (cmd '(counsel-ag counsel-rg counsel-pt))
|
||||
(ivy-add-actions
|
||||
cmd
|
||||
'(("O" +ivy-git-grep-other-window-action "open in other window"))))
|
||||
|
||||
;; 1. Remove character limit from `counsel-ag-function'
|
||||
;; 2. Disable ivy's over-zealous parentheses quoting behavior (if i want
|
||||
;; literal parentheses, I'll escape them myself).
|
||||
;; 3. This may need to be updated frequently, to meet changes upstream
|
||||
;; 4. counsel-ag, counsel-rg and counsel-pt all use this function
|
||||
(advice-add #'counsel-ag-function :override #'+ivy*counsel-ag-function))
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue