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

* Fixed a couple of bugs for the mirrors-in-fields feature.

Browse Source 
* Commented and cleaned up
This commit is contained in:
capitaomorte 2009-11-14 13:42:27 +00:00
parent 2e16b2a732
commit ead36b2544
1 changed files with 45 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
yasnippet.el
View File

@ -2810,9 +2810,24 @@ Otherwise deletes a character normally by calling `delete-char'."
(defun yas/skip-and-clear (field) (defun yas/skip-and-clear (field)
"Deletes the region of FIELD and sets it modified state to t" "Deletes the region of FIELD and sets it modified state to t"
(setf (yas/field-modified-p field) t) ;; Just before skipping-and-clearing the field, mark its children
;; fields as modified, too. If the childen have mirrors-in-fields
;; this prevents them from updating erroneously (we're skipping and
;; deleting!).
;;
(yas/mark-this-and-children-modified field)
(delete-region (yas/field-start field) (yas/field-end field))) (delete-region (yas/field-start field) (yas/field-end field)))
(defun yas/mark-this-and-children-modified (field)
(setf (yas/field-modified-p field) t)
(let ((fom (yas/field-next field)))
(while (and fom
(yas/fom-parent-field fom))
(when (and (eq (yas/fom-parent-field fom) field)
(yas/field-p fom))
(yas/mark-this-and-children-modified fom))
(setq fom (yas/fom-next fom)))))
(defun yas/make-move-active-field-overlay (snippet field) (defun yas/make-move-active-field-overlay (snippet field)
"Place the active field overlay in SNIPPET's FIELD. "Place the active field overlay in SNIPPET's FIELD.
@ -3196,7 +3211,7 @@ has to be called before the $-constructs are deleted."
(when soup (when soup
(reduce #'yas/link-foms soup))))) (reduce #'yas/link-foms soup)))))
(defun yas/calculate-mirror-parent-fields (snippet mirror) (defun yas/calculate-mirrors-in-fields (snippet mirror)
"Attempt to assign a parent field of SNIPPET to the mirror MIRROR. "Attempt to assign a parent field of SNIPPET to the mirror MIRROR.
Use the tighest containing field if more than one field contains Use the tighest containing field if more than one field contains
@ -3238,6 +3253,7 @@ 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."
(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)
@ -3534,7 +3550,7 @@ When multiple expressions are found, only the last one counts."
(when brand-new-mirror (when brand-new-mirror
(push brand-new-mirror (push brand-new-mirror
(yas/field-mirrors field)) (yas/field-mirrors field))
(yas/calculate-mirror-parent-fields snippet brand-new-mirror) (yas/calculate-mirrors-in-fields snippet brand-new-mirror)
(push (cons (match-beginning 0) real-match-end-0) yas/dollar-regions))))) (push (cons (match-beginning 0) real-match-end-0) yas/dollar-regions)))))
(defun yas/simple-mirror-parse-create (snippet) (defun yas/simple-mirror-parse-create (snippet)
@ -3566,7 +3582,7 @@ When multiple expressions are found, only the last one counts."
nil))) nil)))
(push brand-new-mirror (push brand-new-mirror
(yas/field-mirrors field)) (yas/field-mirrors field))
(yas/calculate-mirror-parent-fields snippet brand-new-mirror)) (yas/calculate-mirrors-in-fields snippet brand-new-mirror))
(push (yas/make-field number (push (yas/make-field number
(yas/make-marker (match-beginning 0)) (yas/make-marker (match-beginning 0))
(yas/make-marker (match-beginning 0)) (yas/make-marker (match-beginning 0))
@ -3586,20 +3602,32 @@ When multiple expressions are found, only the last one counts."
(defun yas/update-mirrors (snippet) (defun yas/update-mirrors (snippet)
"Updates all the mirrors of SNIPPET." "Updates all the mirrors of SNIPPET."
(save-excursion (save-excursion
(dolist (field (yas/snippet-fields snippet)) (let* ((fields (copy-list (yas/snippet-fields snippet)))
(dolist (mirror (yas/field-mirrors field)) (field (car fields)))
;; stacked expansion: I added an `inhibit-modification-hooks' (while field
;; here, for safety, may need to remove if we the mechanism is (dolist (mirror (yas/field-mirrors field))
;; altered. ;; stacked expansion: I added an `inhibit-modification-hooks'
;; ;; here, for safety, may need to remove if we the mechanism is
(let ((inhibit-modification-hooks t)) ;; altered.
(yas/mirror-update-display mirror field)
;; `yas/place-overlays' is needed if the active field and
;; protected overlays have been changed because of insertions
;; in `yas/mirror-update-display'
;; ;;
(when (eq field (yas/snippet-active-field snippet)) (let ((inhibit-modification-hooks t)
(yas/place-overlays snippet field))))))) (mirror-parent-field (yas/mirror-parent-field mirror)))
;; updatte this mirror
;;
(yas/mirror-update-display mirror field)
;; for mirrors-in-fields: schedule a possible
;; parent field for reupdting later on
;;
(when mirror-parent-field
(add-to-list 'fields mirror-parent-field 'append #'eq))
;; `yas/place-overlays' is needed if the active field and
;; protected overlays have been changed because of insertions
;; in `yas/mirror-update-display'
;;
(when (eq field (yas/snippet-active-field snippet))
(yas/place-overlays snippet field))))
(setq fields (cdr fields))
(setq field (car fields))))))
(defun yas/mirror-update-display (mirror field) (defun yas/mirror-update-display (mirror field)
"Update MIRROR according to FIELD (and mirror transform)." "Update MIRROR according to FIELD (and mirror transform)."