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

Don't catch and rethrow yas-{-}exception

Browse Source 
* yasnippet.el (yas--eval-for-string): Don't catch yas--exception.
(yas-throw): Signal `yas-exception', not `yas--exception'; DATA must be
a list.
(yas-exception): Add `error-message' property.
(yas-verify-value): Just use plain format since the new `error-message'
property for `yas-exception' will add the right prefix.
This commit is contained in:
Noam Postavsky 2016-05-18 07:33:15 -04:00
parent ac26024837
commit 9c9547a628
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
yasnippet.el
View File

@ -1344,7 +1344,6 @@ Returns (TEMPLATES START END). This function respects
(if (memq yas-good-grace '(t inline)) (if (memq yas-good-grace '(t inline))
(condition-case oops (condition-case oops
(funcall eval-saving-stuff form) (funcall eval-saving-stuff form)
(yas--exception (signal 'yas-exception (cdr oops)))
(error (cdr oops))) (error (cdr oops)))
(funcall eval-saving-stuff form)))) (funcall eval-saving-stuff form))))
@ -2855,17 +2854,16 @@ The last element of POSSIBILITIES may be a list of strings."
key))))) key)))))
(defun yas-throw (text) (defun yas-throw (text)
"Throw a yas--exception with TEXT as the reason." "Signal `yas-exception' with TEXT as the reason."
(signal 'yas--exception text)) (signal 'yas-exception (list text)))
(put 'yas--exception 'error-conditions '(error yas--exception)) (put 'yas-exception 'error-conditions '(error yas-exception))
(put 'yas-exception 'error-message "[yas] Exception")
(defun yas-verify-value (possibilities) (defun yas-verify-value (possibilities)
"Verify that the current field value is in POSSIBILITIES. "Verify that the current field value is in POSSIBILITIES.
Otherwise signal `yas-exception'."
Otherwise throw exception." (when (and yas-moving-away-p (cl-notany (lambda (pos) (string= pos yas-text)) possibilities))
(when (and yas-moving-away-p (yas-throw (format "Field only allows %s" possibilities))))
(cl-notany (lambda (pos) (string= pos yas-text)) possibilities))
(yas-throw (yas--format "Field only allows %s" possibilities))))
(defun yas-field-value (number) (defun yas-field-value (number)
"Get the string for field with NUMBER. "Get the string for field with NUMBER.