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

proper undo of snippet expansion.

Browse Source
This commit is contained in:
Zhang Chiyuan 2008-03-05 02:44:41 +00:00
parent b3666ea3ee
commit cda9e20b3d
1 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
yasnippet.el
View File

@ -228,17 +228,37 @@ the template of a snippet in the current snippet-table."
(yas/synchronize-fields (yas/synchronize-fields
(overlay-get overlay 'yas/group)))) (overlay-get overlay 'yas/group))))
(defun yas/undo-expand-snippet (start end key snippet)
"Undo a snippet expansion. Delete the overlays. This undo can't be
redo-ed."
(let ((undo (car buffer-undo-list)))
(while (null undo)
(setq buffer-undo-list (cdr buffer-undo-list))
(setq undo (car buffer-undo-list)))
;; Remove this undo operation record
(setq buffer-undo-list (cdr buffer-undo-list)))
(let ((inhibit-modification-hooks t)
(buffer-undo-list t))
(yas/exit-snippet snippet)
(goto-char start)
(delete-char (- end start))
(insert key)))
(defun yas/expand-snippet (start end template) (defun yas/expand-snippet (start end template)
"Expand snippet at current point. Text between START and END "Expand snippet at current point. Text between START and END
will be deleted before inserting template." will be deleted before inserting template."
(goto-char start) (goto-char start)
(let ((length (- end start)) (let ((key (buffer-substring-no-properties start end))
(original-undo-list buffer-undo-list)
(length (- end start))
(column (current-column))) (column (current-column)))
(save-restriction (save-restriction
(narrow-to-region start start) (narrow-to-region start start)
(setq buffer-undo-list t)
(insert template) (insert template)
;; Step 1: do necessary indent ;; Step 1: do necessary indent
(when yas/indent-line (when yas/indent-line
(let* ((indent (if indent-tabs-mode (let* ((indent (if indent-tabs-mode
@ -336,11 +356,20 @@ will be deleted before inserting template."
(unless (yas/snippet-exit-marker snippet) (unless (yas/snippet-exit-marker snippet)
(setf (yas/snippet-exit-marker snippet) (copy-marker (point) t))) (setf (yas/snippet-exit-marker snippet) (copy-marker (point) t)))
;; Step 11: remove the trigger key ;; Step 11: Construct undo information
(unless (eq original-undo-list t)
(add-to-list 'original-undo-list
`(apply yas/undo-expand-snippet
,(point-min)
,(point-max)
,key
,snippet)))
;; Step 12: remove the trigger key
(widen) (widen)
(delete-char length) (delete-char length)
;; Step 12: place the cursor at a proper place ;; Step 13: place the cursor at a proper place
(let ((groups (yas/snippet-groups snippet)) (let ((groups (yas/snippet-groups snippet))
(exit-marker (yas/snippet-exit-marker snippet))) (exit-marker (yas/snippet-exit-marker snippet)))
(if groups (if groups
@ -349,7 +378,9 @@ will be deleted before inserting template."
(yas/group-primary-field (yas/group-primary-field
(car groups))))) (car groups)))))
;; no need to call exit-snippet, since no overlay created. ;; no need to call exit-snippet, since no overlay created.
(goto-char exit-marker))))))) (goto-char exit-marker)))
(setq buffer-undo-list original-undo-list)))))
(defun yas/current-snippet-overlay (&optional point) (defun yas/current-snippet-overlay (&optional point)
"Get the most proper overlay which is belongs to a snippet." "Get the most proper overlay which is belongs to a snippet."