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

overlapped snippet navigation.

Browse Source
This commit is contained in:
Zhang Chiyuan 2008-03-05 05:22:12 +00:00
parent d781580ab0
commit fb5bc52bb6
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
yasnippet.el
View File

@ -251,6 +251,7 @@ will be deleted before inserting template."
(let ((key (buffer-substring-no-properties start end)) (let ((key (buffer-substring-no-properties start end))
(original-undo-list buffer-undo-list) (original-undo-list buffer-undo-list)
(inhibit-modification-hooks t)
(length (- end start)) (length (- end start))
(column (current-column))) (column (current-column)))
(save-restriction (save-restriction
@ -405,6 +406,23 @@ will be deleted before inserting template."
(setq snippet-overlay overlay))))) (setq snippet-overlay overlay)))))
snippet-overlay)) snippet-overlay))
(defun yas/current-overlay-for-navigation ()
"Get current overlay for navigation. Might be overlay at current or previous point."
(let ((overlay1 (yas/current-snippet-overlay))
(overlay2 (if (bobp)
nil
(yas/current-snippet-overlay (- (point) 1)))))
(if (null overlay1)
overlay2
(if (or (null overlay2)
(eq (overlay-get overlay1 'yas/snippet)
(overlay-get overlay2 'yas/snippet)))
overlay1
(if (> (yas/snippet-id (overlay-get overlay2 'yas/snippet))
(yas/snippet-id (overlay-get overlay1 'yas/snippet)))
overlay2
overlay1)))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; User level functions ;; User level functions
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -427,8 +445,7 @@ otherwise, nil returned."
(defun yas/next-field-group () (defun yas/next-field-group ()
"Navigate to next field group. If there's none, exit the snippet." "Navigate to next field group. If there's none, exit the snippet."
(interactive) (interactive)
(let ((overlay (or (yas/current-snippet-overlay) (let ((overlay (yas/current-overlay-for-navigation)))
(yas/current-snippet-overlay (- (point) 1)))))
(if overlay (if overlay
(let ((next (yas/group-next (let ((next (yas/group-next
(overlay-get overlay 'yas/group)))) (overlay-get overlay 'yas/group))))
@ -442,8 +459,7 @@ otherwise, nil returned."
(defun yas/prev-field-group () (defun yas/prev-field-group ()
"Navigate to prev field group. If there's none, exit the snippet." "Navigate to prev field group. If there's none, exit the snippet."
(interactive) (interactive)
(let ((overlay (or (yas/current-snippet-overlay) (let ((overlay (yas/current-overlay-for-navigation)))
(yas/current-snippet-overlay (- (point) 1)))))
(if overlay (if overlay
(let ((prev (yas/group-prev (let ((prev (yas/group-prev
(overlay-get overlay 'yas/group)))) (overlay-get overlay 'yas/group))))