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

* Fix some stacked expansion bugs (snippet-in-snippet)

Browse Source 
* Better default yas/key-syntaxes
* Fix issue 142: `yas/minor-mode' by itself never triggers a snippet reload. This only happens on `yas/global-mode' or on manual `yas/load-directory' or `yas/reload-all'
* Misc enhancements
This commit is contained in:
capitaomorte 2010-08-29 11:34:09 +00:00
parent e74926a53d
commit 5418a3b223
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
yasnippet.el
View File

@ -453,14 +453,19 @@ the trigger key itself."
map)
"The keymap active while a snippet expansion is in progress.")
(defvar yas/key-syntaxes (list "w" "w_" "w_.()" "^ ")
"A list of syntax of a key. This list is tried in the order
to try to find a key. For example, if the list is '(\"w\" \"w_\").
And in emacs-lisp-mode, where \"-\" has the syntax of \"_\":
(defvar yas/key-syntaxes (list "w" "w_" "w_." "w_.()" "^ ")
"List of character syntaxes used to find a trigger key before point.
Scanning backwards for a key, this list is tried in the
order. For example, if the list is '(\"w\" \"w_\") first look
trigger keys which are composed exclusively of \"word\"-syntax
characters, and then, if that fails, look for keys which are
either of \"word\" or \"symbol\" syntax. So triggering after
triggering after:
foo-bar
will first try \"bar\", if not found, then \"foo-bar\" is tried.")
will first try \"bar\", if that trigger key isn't found found,
\"foo-bar\" is tried.")
(defvar yas/after-exit-snippet-hook
'()
@ -799,12 +804,6 @@ Key bindings:
;; Reload the trigger key
;;
(yas/trigger-key-reload)
;; Load all snippets definitions unless we still don't have a
;; root-directory or some snippets have already been loaded.
;;
(unless (or (null yas/snippet-dirs)
(> (hash-table-count yas/tables) 0))
(yas/reload-all))
;; Install the direct keymaps in `emulation-mode-map-alists'
;; (we use `add-hook' even though it's not technically a hook,
;; but it works). Then define variables named after modes to
@ -825,9 +824,7 @@ Key bindings:
(yas/direct-keymaps-set-vars)
(remove-hook 'yas/minor-mode-hook 'yas/direct-keymaps-set-vars-runonce))
(defvar yas/dont-activate #'(lambda ()
(and yas/snippet-dirs
(null (yas/get-snippet-tables))))
(defvar yas/dont-activate nil
"If non-nil don't let `yas/minor-mode-on' active yas for this buffer.
`yas/minor-mode-on' is usually called by `yas/global-mode' so
@ -845,6 +842,12 @@ Do this unless `yas/dont-activate' is t "
(funcall yas/dont-activate))
(and (not (functionp yas/dont-activate))
yas/dont-activate))
;; Load all snippets definitions unless we still don't have a
;; root-directory or some snippets have already been loaded.
;;
(unless (or (null yas/snippet-dirs)
(> (hash-table-count yas/tables) 0))
(yas/reload-all))
(yas/minor-mode 1)))
(defun yas/minor-mode-off ()
@ -2935,7 +2938,7 @@ inserted first."
(overlay-get ov 'yas/snippet))
(if all-snippets
(overlays-in (point-min) (point-max))
(overlays-at (point))))))
(nconc (overlays-at (point)) (overlays-at (1- (point))))))))
#'(lambda (s1 s2)
(<= (yas/snippet-id s2) (yas/snippet-id s1)))))
@ -2964,7 +2967,7 @@ delegate to `yas/next-field'."
(yas/snippet-fields snippet)))
(active-field-pos (position active-field live-fields))
(target-pos (and active-field-pos (+ arg active-field-pos)))
(target-field (nth target-pos live-fields)))
(target-field (and target-pos (nth target-pos live-fields))))
;; First check if we're moving out of a field with a transform
;;
(when (and active-field
@ -2976,7 +2979,7 @@ delegate to `yas/next-field'."
;; primary field transform: exit call to field-transform
(yas/eval-lisp (yas/field-transform active-field))))
;; Now actually move...
(cond ((>= target-pos (length live-fields))
(cond ((and target-pos (>= target-pos (length live-fields)))
(yas/exit-snippet snippet))
(target-field
(yas/move-to-field snippet target-field))