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

* Corrected a snippet engine bug with this snippet

Browse Source 
A TEST THAT ${1: should ${2:succeed}} FAILS! $2
This commit is contained in:
capitaomorte 2011-10-07 11:43:09 +00:00
parent 55f183033d
commit 508d47dc6c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
yasnippet.el
View File

@ -2588,7 +2588,7 @@ With optional prefix argument KILL quit the window and buffer."
(yas/template-expand-env yas/current-template)) (yas/template-expand-env yas/current-template))
(when (and debug (when (and debug
(require 'yasnippet-debug nil t)) (require 'yasnippet-debug nil t))
(add-hook 'post-command-hook 'yas/debug-snippet-vars 't 'local)))) (add-hook 'post-command-hook 'yas/debug-snippet-vars nil t))))
(t (t
(message "[yas] Cannot test snippet for unknown major mode"))))) (message "[yas] Cannot test snippet for unknown major mode")))))
@ -3283,10 +3283,9 @@ progress."
(snippet (overlay-get yas/active-field-overlay 'yas/snippet))) (snippet (overlay-get yas/active-field-overlay 'yas/snippet)))
(cond (after? (cond (after?
(yas/advance-end-maybe field (overlay-end overlay)) (yas/advance-end-maybe field (overlay-end overlay))
(let ((saved-point (point))) (save-excursion
(yas/field-update-display field (car (yas/snippets-at-point))) (yas/field-update-display field snippet))
(goto-char saved-point)) (yas/update-mirrors snippet))
(yas/update-mirrors (car (yas/snippets-at-point))))
(field (field
(when (and (not after?) (when (and (not after?)
(not (yas/field-modified-p field)) (not (yas/field-modified-p field))
@ -3668,9 +3667,7 @@ exit-marker have identical start and end markers.
(cond ((and fom (< (yas/fom-end fom) newend)) (cond ((and fom (< (yas/fom-end fom) newend))
(set-marker (yas/fom-end fom) newend) (set-marker (yas/fom-end fom) newend)
(yas/advance-start-maybe (yas/fom-next fom) newend) (yas/advance-start-maybe (yas/fom-next fom) newend)
(let ((parent (yas/fom-parent-field fom))) (yas/advance-end-of-parents-maybe (yas/fom-parent-field fom) newend))
(when parent
(yas/advance-end-maybe parent newend))))
((yas/exit-p fom) ((yas/exit-p fom)
(yas/advance-start-maybe (yas/fom-next fom) newend)))) (yas/advance-start-maybe (yas/fom-next fom) newend))))
@ -3683,7 +3680,10 @@ If it does, also call `yas/advance-end-maybe' on FOM."
(yas/advance-end-maybe fom newstart))) (yas/advance-end-maybe fom newstart)))
(defun yas/advance-end-of-parents-maybe (field newend) (defun yas/advance-end-of-parents-maybe (field newend)
"Like `yas/advance-end-maybe' but for parents." "Like `yas/advance-end-maybe' but for parent fields.
Only works for fields and doesn't care about the start of the
next FOM. Works its way up recursively for parents of parents."
(when (and field (when (and field
(< (yas/field-end field) newend)) (< (yas/field-end field) newend))
(set-marker (yas/field-end field) newend) (set-marker (yas/field-end field) newend)