ld/yasnippet
1
0
Fork 0
mirror of https://github.com/joaotavora/yasnippet.git synced 2025-10-13 21:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

On yas/reload-all be clearer as to whether just-in-time loading is active

Browse Source
This commit is contained in:
João Távora 2012-07-16 14:16:44 +01:00
parent 19dd43cb52
commit aae62703f4
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
yasnippet.el
View File

@ -1672,8 +1672,9 @@ Optional USE-JIT use jit-loading of snippets."
"Recursively load snippet templates from DIRECTORY." "Recursively load snippet templates from DIRECTORY."
(unless (file-exists-p (concat directory "/" ".yas-skip")) (unless (file-exists-p (concat directory "/" ".yas-skip"))
(if (and (not no-compiled-snippets) (if (and (not no-compiled-snippets)
(load (expand-file-name ".yas-compiled-snippets" directory) 'noerror (<= yas/verbosity 2))) (progn (yas/message 2 "Loading compiled snippets from %s" directory) t)
(yas/message 2 "Loading much faster .yas-compiled-snippets from %s" directory) (load (expand-file-name ".yas-compiled-snippets" directory) 'noerror (<= yas/verbosity 3)))
(yas/message 2 "Loading snippet files from %s" directory)
(yas/load-directory-2 directory mode-sym)))) (yas/load-directory-2 directory mode-sym))))
(defun yas/load-directory-2 (directory mode-sym) (defun yas/load-directory-2 (directory mode-sym)
@ -1707,14 +1708,20 @@ Optional USE-JIT use jit-loading of snippets."
(dolist (directory (reverse (yas/snippet-dirs))) (dolist (directory (reverse (yas/snippet-dirs)))
(cond ((file-directory-p directory) (cond ((file-directory-p directory)
(yas/load-directory directory (not nojit)) (yas/load-directory directory (not nojit))
(yas/message 3 "Loaded %s" directory)) (if nojit
(yas/message 3 "Loaded %s" directory)
(yas/message 3 "Prepared just-in-time loading for %s" directory)))
(t (t
(push (yas/message 0 "Check your `yas/snippet-dirs': %s is not a directory" directory) errors)))) (push (yas/message 0 "Check your `yas/snippet-dirs': %s is not a directory" directory) errors))))
(call-interactively 'yas/load-directory)) (call-interactively 'yas/load-directory))
errors)) errors))
(defun yas/reload-all (&optional interactive) (defun yas/reload-all (&optional interactive)
"Reload all snippets and rebuild the YASnippet menu." "Reload all snippets and rebuild the YASnippet menu.
When called interactively force immediate reload of all known
snippets under `yas/snippet-dirs', otherwise use just-in-time
loading."
(interactive "p") (interactive "p")
(catch 'abort (catch 'abort
(let ((errors) (let ((errors)
@ -1728,7 +1735,7 @@ Optional USE-JIT use jit-loading of snippets."
(when snippet-editing-buffers (when snippet-editing-buffers
(if interactive (if interactive
(if (y-or-n-p "Some buffers editing live snippets, close them and proceed with reload?") (if (y-or-n-p "Some buffers editing live snippets, close them and proceed with reload?")
(mapcar #'kill-buffer snippet-editing-buffers) (mapc #'kill-buffer snippet-editing-buffers)
(yas/message 1 "Aborted reload...") (yas/message 1 "Aborted reload...")
(throw 'abort nil)) (throw 'abort nil))
;; in a non-interactive use, at least set ;; in a non-interactive use, at least set
@ -1762,14 +1769,16 @@ Optional USE-JIT use jit-loading of snippets."
;; ;;
(yas/trigger-key-reload) (yas/trigger-key-reload)
(yas/message 3 "Reloaded everything...%s." (if errors " (some errors, check *Messages*)" ""))))) (yas/message 3 "Reloaded everything%s...%s."
(if interactive "" " (snippets will load just-in-time)")
(if errors " (some errors, check *Messages*)" "")))))
(defun yas/load-pending-jits () (defun yas/load-pending-jits ()
(when yas/minor-mode (when yas/minor-mode
(dolist (mode (yas/modes-to-activate)) (dolist (mode (yas/modes-to-activate))
(let ((forms (gethash mode yas/scheduled-jit-loads))) (let ((forms (gethash mode yas/scheduled-jit-loads)))
(dolist (form forms) (dolist (form forms)
(yas/message 3 "Loading snippets for %s, just in time: %s!" mode form) (yas/message 3 "Loading for `%s', just-in-time: %s!" mode form)
(eval form)) (eval form))
(remhash mode yas/scheduled-jit-loads))))) (remhash mode yas/scheduled-jit-loads)))))