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

Optimize file-template find-file hook function

Browse source
This commit is contained in:
Henrik Lissner 2019-10-25 18:07:06 -04:00
parent d8ea65b968
commit 3f759dde23
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/editor/file-templates/autoload.el
View file

@ -91,18 +91,6 @@ evil is loaded and enabled)."
(file-relative-name path doom-emacs-dir)) (file-relative-name path doom-emacs-dir))
((abbreviate-file-name path)))))) ((abbreviate-file-name path))))))
;;;###autoload
(defun +file-template-p (rule)
"Return t if RULE applies to the current buffer."
(let ((pred (car rule))
(plist (cdr rule)))
(and (cond ((and (stringp pred) buffer-file-name)
(string-match-p pred buffer-file-name))
((symbolp pred) (eq major-mode pred)))
(or (not (plist-member plist :when))
(funcall (plist-get plist :when) buffer-file-name))
rule)))
;; ;;
;;; Commands ;;; Commands

24
modules/editor/file-templates/config.el
View file

@ -114,16 +114,28 @@ information.")
(or (file-in-directory-p file doom-private-dir) (or (file-in-directory-p file doom-private-dir)
(file-in-directory-p file doom-emacs-dir))) (file-in-directory-p file doom-emacs-dir)))
(defun +file-template-p (rule)
"Return t if RULE applies to the current buffer."
(let ((pred (car rule))
(plist (cdr rule)))
(and (cond ((symbolp pred) (eq major-mode pred))
((and (stringp pred) buffer-file-name)
(string-match-p pred buffer-file-name))
((not (plist-member plist :when)) t)
((funcall (plist-get plist :when) buffer-file-name)))
rule)))
(defun +file-templates-check-h () (defun +file-templates-check-h ()
"Check if the current buffer is a candidate for file template expansion. It "Check if the current buffer is a candidate for file template expansion. It
must be non-read-only, empty, and there must be a rule in must be non-read-only, empty, and there must be a rule in
`+file-templates-alist' that applies to it." `+file-templates-alist' that applies to it."
(when (and (not (file-exists-p (or (buffer-file-name) ""))) (and buffer-file-name
(not buffer-read-only) (not buffer-read-only)
(bobp) (eobp) (bobp) (eobp)
(not (string-match-p "^ *\\*" (buffer-name)))) (not (member (substring (buffer-name) 0 1) '("*" " ")))
(when-let (rule (cl-find-if #'+file-template-p +file-templates-alist)) (not (file-exists-p buffer-file-name))
(apply #'+file-templates--expand rule)))) (when-let (rule (cl-find-if #'+file-template-p +file-templates-alist))
(apply #'+file-templates--expand rule))))
;; ;;