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

Don't use insert behind hook. It often get ignored. See issue 3

Browse Source
This commit is contained in:
Zhang Chiyuan 2008-03-10 10:40:17 +00:00
parent 85358aa055
commit cdcc8bd91a
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
yasnippet.el
View File

@ -118,9 +118,9 @@ mode will be listed under the menu \"yasnippet\".")
(defvar yas/overlay-insert-in-front-hooks (defvar yas/overlay-insert-in-front-hooks
(list 'yas/overlay-insert-in-front-hook) (list 'yas/overlay-insert-in-front-hook)
"The list of hooks of the overlay inserted in front event.") "The list of hooks of the overlay inserted in front event.")
(defvar yas/overlay-insert-behind-hooks (defvar yas/keymap-overlay-modification-hooks
(list 'yas/overlay-insert-behind-hook) (list 'yas/overlay-maybe-insert-behind-hook)
"The list of hooks of the overlay inserted behind event.") "The list of hooks of the big keymap overlay modification event.")
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -299,14 +299,22 @@ the template of a snippet in the current snippet-table."
(goto-char end) (goto-char end)
(delete-char (- (overlay-end overlay) end))))) (delete-char (- (overlay-end overlay) end)))))
(yas/synchronize-fields field-group)))) (yas/synchronize-fields field-group))))
(defun yas/overlay-insert-behind-hook (overlay after? beg end &optional length) (defun yas/overlay-maybe-insert-behind-hook (overlay after? beg end &optional length)
"Hook for snippet overlay when text is inserted just behind a snippet field." "Insert behind hook sometimes doesn't get called. I don't know why.
So I add modification hook in the big overlay and try to detect `insert-behind'
event manually."
(when (and after? (when (and after?
(null (yas/current-snippet-overlay beg))) ; not inside another field (= length 0)
(move-overlay overlay (> end beg)
(overlay-start overlay) (null (yas/current-snippet-overlay beg))
(not (bobp)))
(let ((field-overlay (yas/current-snippet-overlay (1- beg))))
(when (and field-overlay
(= beg (overlay-end field-overlay)))
(move-overlay field-overlay
(overlay-start field-overlay)
end) end)
(yas/synchronize-fields (overlay-get overlay 'yas/group)))) (yas/synchronize-fields (overlay-get field-overlay 'yas/group))))))
(defun yas/undo-expand-snippet (start end key snippet) (defun yas/undo-expand-snippet (start end key snippet)
"Undo a snippet expansion. Delete the overlays. This undo can't be "Undo a snippet expansion. Delete the overlays. This undo can't be
@ -412,6 +420,12 @@ will be deleted before inserting template."
nil nil
nil nil
t))) t)))
(overlay-put overlay
'modification-hooks
yas/keymap-overlay-modification-hooks)
(overlay-put overlay
'insert-behind-hooks
yas/keymap-overlay-modification-hooks)
(overlay-put overlay 'keymap yas/keymap) (overlay-put overlay 'keymap yas/keymap)
(overlay-put overlay 'yas/snippet-reference snippet) (overlay-put overlay 'yas/snippet-reference snippet)
(setf (yas/snippet-overlay snippet) overlay)) (setf (yas/snippet-overlay snippet) overlay))
@ -444,7 +458,6 @@ will be deleted before inserting template."
(overlay-put overlay 'yas/modified? nil) (overlay-put overlay 'yas/modified? nil)
(overlay-put overlay 'modification-hooks yas/overlay-modification-hooks) (overlay-put overlay 'modification-hooks yas/overlay-modification-hooks)
(overlay-put overlay 'insert-in-front-hooks yas/overlay-insert-in-front-hooks) (overlay-put overlay 'insert-in-front-hooks yas/overlay-insert-in-front-hooks)
(overlay-put overlay 'insert-behind-hooks yas/overlay-insert-behind-hooks)
(dolist (field (yas/group-fields group)) (dolist (field (yas/group-fields group))
(overlay-put (yas/field-overlay field) (overlay-put (yas/field-overlay field)
'face 'face