Refactor +file-templates--expand

This commit is contained in:
Henrik Lissner 2018-06-22 01:06:37 +02:00
parent fe44d71965
commit 0d19b9e61c
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -55,13 +55,10 @@ these properties:
;; ;;
;;;###autoload ;;;###autoload
(defun +file-templates--expand (pred &rest plist) (cl-defun +file-templates--expand (pred &key project mode trigger ignore)
"Auto insert a yasnippet snippet into current file and enter insert mode (if "Auto insert a yasnippet snippet into current file and enter insert mode (if
evil is loaded and enabled)." evil is loaded and enabled)."
(when (and pred (not (plist-get plist :ignore))) (when (and pred (not ignore))
(let ((project (plist-get plist :project))
(mode (plist-get plist :mode))
(trigger (plist-get plist :trigger)))
(when (if project (doom-project-p) t) (when (if project (doom-project-p) t)
(unless mode (unless mode
(setq mode (if (symbolp pred) pred major-mode))) (setq mode (if (symbolp pred) pred major-mode)))
@ -81,7 +78,7 @@ evil is loaded and enabled)."
(and yas--active-field-overlay (and yas--active-field-overlay
(overlay-buffer yas--active-field-overlay) (overlay-buffer yas--active-field-overlay)
(overlay-get yas--active-field-overlay 'yas--field))) (overlay-get yas--active-field-overlay 'yas--field)))
(evil-initialize-state 'insert)))))) (evil-initialize-state 'insert)))))
;;;###autoload ;;;###autoload
(defun +file-templates-get-short-path () (defun +file-templates-get-short-path ()