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

Fix field transform application in yas-next-field

Browse Source 
* yasnippet.el (yas--apply-transform): Don't let-bind yas-moving-away-p
to nil, it's nil by default.
(yas-next-field): Call `yas--field-update-display' instead of only
calling `yas--eval-lisp' so that the result of the transform is inserted
into the buffer.
This commit is contained in:
Noam Postavsky 2016-05-12 04:57:08 -04:00
parent 6f97316551
commit 6180cc4059
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
yasnippet.el
View File

@ -2966,7 +2966,6 @@ If there is a transform but it returns nil, return the empty
string iff EMPTY-ON-NIL-P is true." string iff EMPTY-ON-NIL-P is true."
(let* ((yas-text (yas--field-text-for-display field)) (let* ((yas-text (yas--field-text-for-display field))
(yas-modified-p (yas--field-modified-p field)) (yas-modified-p (yas--field-modified-p field))
(yas-moving-away-p nil)
(transform (if (yas--mirror-p field-or-mirror) (transform (if (yas--mirror-p field-or-mirror)
(yas--mirror-transform field-or-mirror) (yas--mirror-transform field-or-mirror)
(yas--field-transform field-or-mirror))) (yas--field-transform field-or-mirror)))
@ -3095,13 +3094,11 @@ If there's none, exit the snippet."
(let* ((snippet (car (yas--snippets-at-point))) (let* ((snippet (car (yas--snippets-at-point)))
(active-field (overlay-get yas--active-field-overlay 'yas--field)) (active-field (overlay-get yas--active-field-overlay 'yas--field))
(target-field (yas--find-next-field arg snippet active-field))) (target-field (yas--find-next-field arg snippet active-field)))
;; First check if we're moving out of a field with a transform. ;; Apply transform to active field.
(when (and active-field (yas--field-transform active-field)) (when active-field
(let* ((yas-moving-away-p t) (let ((yas-moving-away-p t))
(yas-text (yas--field-text-for-display active-field)) (when (yas--field-update-display active-field)
(yas-modified-p (yas--field-modified-p active-field))) (yas--update-mirrors snippet))))
;; primary field transform: exit call to field-transform
(yas--eval-lisp (yas--field-transform active-field))))
;; Now actually move... ;; Now actually move...
(if target-field (if target-field
(yas--move-to-field snippet target-field) (yas--move-to-field snippet target-field)