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

* First implementation of snippet-commands, looks promising.

Browse Source 
* Optimization: read lisp expressions only once, eval many times.

* auto-load .yas-setup.el instead of setup.el to prevent loading it as
  a snippet
This commit is contained in:
capitaomorte 2009-10-15 17:22:51 +00:00
parent 57c150b42d
commit 0b55a52b8d
2 changed files with 100 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
extras/imported/ruby-mode/setup.el → extras/imported/ruby-mode/.yas-setup.el
View File

186
yasnippet.el
View File

@ -707,17 +707,8 @@ With optional UNBIND-KEY, try to unbind that key from
(not (string= yas/trigger-key ""))) (not (string= yas/trigger-key "")))
(define-key yas/minor-mode-map (read-kbd-macro yas/trigger-key) 'yas/expand))) (define-key yas/minor-mode-map (read-kbd-macro yas/trigger-key) 'yas/expand)))
(defvar yas/snippet-tables (make-hash-table)
;; (defvar yas/snippet-keymaps nil "A hash table of MAJOR-MODE symbols to `yas/snippet-table' objects.")
;; "")
;; (make-variable-buffer-local 'yas/snippet-keymaps)
;; (defun yas/snippet-keymaps-reload ()
;; (setq yas/snippet-keymaps nil)
;; (mapc #'(lambda (table)
;; (push (cons t
;; (yas/snippet-table-keymap table))
;; yas/snippet-keymaps))
;; (yas/get-snippet-tables)))
(defvar yas/snippet-keymaps nil (defvar yas/snippet-keymaps nil
"Keymap alist supporting direct snippet keybindings. "Keymap alist supporting direct snippet keybindings.
@ -729,6 +720,7 @@ calculated when loading snippets. TABLE-NAME is a variable
set buffer-locally when entering `yas/minor-mode'. KEYMAP binds set buffer-locally when entering `yas/minor-mode'. KEYMAP binds
all defined direct keybindings to the command all defined direct keybindings to the command
`yas/expand-from-keymap', which acts similarly to `yas/expand'") `yas/expand-from-keymap', which acts similarly to `yas/expand'")
(defun yas/snippet-keymaps-reload () (defun yas/snippet-keymaps-reload ()
(interactive) (interactive)
(setq yas/snippet-keymaps nil) (setq yas/snippet-keymaps nil)
@ -880,9 +872,6 @@ Do this unless `yas/dont-activate' is t or the function
file file
keybinding) keybinding)
(defvar yas/snippet-tables (make-hash-table)
"A hash table of MAJOR-MODE symbols to `yas/snippet-table' objects.")
(defstruct (yas/snippet-table (:constructor yas/make-snippet-table (name))) (defstruct (yas/snippet-table (:constructor yas/make-snippet-table (name)))
"A table to store snippets for a particular mode. "A table to store snippets for a particular mode.
@ -1136,21 +1125,19 @@ a list of modes like this to help the judgement."
(or (fboundp mode) (or (fboundp mode)
(find mode yas/known-modes))) (find mode yas/known-modes)))
(defun yas/read-and-eval-string (string) (defun yas/eval-lisp (form)
;; TODO: This is a possible optimization point, the expression could "Evaluate FORM and convert the result to string."
;; be stored in cons format instead of string,
"Evaluate STRING and convert the result to string."
(let ((retval (catch 'yas/exception (let ((retval (catch 'yas/exception
(condition-case err (condition-case err
(save-excursion (save-excursion
(save-restriction (save-restriction
(save-match-data (save-match-data
(widen) (widen)
(let ((result (eval (read string)))) (let ((result (eval form)))
(when result (when result
(format "%s" result)))))) (format "%s" result))))))
(error (if yas/good-grace (error (if yas/good-grace
"[yas] elisp error!" (format "[yas] elisp error! %s" (error-message-string err))
(error (format "[yas] elisp error: %s" (error (format "[yas] elisp error: %s"
(error-message-string err))))))))) (error-message-string err)))))))))
(when (and (consp retval) (when (and (consp retval)
@ -1158,6 +1145,24 @@ a list of modes like this to help the judgement."
(error (cdr retval))) (error (cdr retval)))
retval)) retval))
(defun yas/eval-lisp-no-saves (form)
(condition-case err
(eval form)
(error (if yas/good-grace
(format "[yas] elisp error! %s" (error-message-string err))
(error (format "[yas] elisp error: %s"
(error-message-string err)))))))
(defun yas/read-lisp (string &optional nil-on-error)
"Read STRING as a elisp expression and return it.
In case STRING in an invalid expression and NIL-ON-ERROR is nil,
return an expression that when evaluated will issue an error."
(condition-case err
(read string)
(error (and (not nil-on-error)
`(error (error-message-string err))))))
(defvar yas/mode-symbol nil (defvar yas/mode-symbol nil
"If non-nil, lookup snippets using this instead of `major-mode'.") "If non-nil, lookup snippets using this instead of `major-mode'.")
(make-variable-buffer-local 'yas/mode-symbol) (make-variable-buffer-local 'yas/mode-symbol)
@ -1236,6 +1241,7 @@ Here's a list of currently recognized variables:
* key * key
* group * group
* expand-env * expand-env
* binding
#name: #include \"...\" #name: #include \"...\"
# -- # --
@ -1266,16 +1272,19 @@ Here's a list of currently recognized variables:
(setq name (match-string-no-properties 2))) (setq name (match-string-no-properties 2)))
(when (string= "condition" (match-string-no-properties 1)) (when (string= "condition" (match-string-no-properties 1))
(setq condition (match-string-no-properties 2))) (setq condition (match-string-no-properties 2)))
(when (string= "key" (match-string-no-properties 1))
(setq key (match-string-no-properties 2)))
(when (string= "group" (match-string-no-properties 1)) (when (string= "group" (match-string-no-properties 1))
(setq group (match-string-no-properties 2))) (setq group (match-string-no-properties 2)))
(when (string= "expand-env" (match-string-no-properties 1)) (when (string= "expand-env" (match-string-no-properties 1))
(setq expand-env (match-string-no-properties 2))) (setq expand-env (yas/read-lisp (match-string-no-properties 2)
(when (string= "key" (match-string-no-properties 1)) 'nil-on-error)))
(setq key (match-string-no-properties 2)))
(when (string= "binding" (match-string-no-properties 1)) (when (string= "binding" (match-string-no-properties 1))
(setq binding (match-string-no-properties 2))))) (setq binding (match-string-no-properties 2)))))
(setq template (setq template
(buffer-substring-no-properties (point-min) (point-max)))) (buffer-substring-no-properties (point-min) (point-max))))
(when (aget expand-env 'yas/command)
(setq template (yas/read-lisp (concat "(progn" template ")"))))
(list key template name condition group expand-env file binding))) (list key template name condition group expand-env file binding)))
(defun yas/calculate-group (file) (defun yas/calculate-group (file)
@ -1449,9 +1458,9 @@ TEMPLATES is a list of `yas/template'."
(defun yas/load-directory-1 (directory &optional parents no-hierarchy-parents making-groups-sym) (defun yas/load-directory-1 (directory &optional parents no-hierarchy-parents making-groups-sym)
"Recursively load snippet templates from DIRECTORY." "Recursively load snippet templates from DIRECTORY."
;; TODO: Rewrite this horrible, horrible monster I created ;; TODO: Rewrite this horrible, horrible monster I created
;; TODO: Temp hack, load a setup.el file if its exists ;; TODO: Temp hack, load a .yas-setup.el file if its exists
(let ((file (concat directory "/" "setup.el"))) (let ((file (concat directory "/" ".yas-setup.el")))
(when (file-exists-p file) (when (file-readable-p file)
(load file))) (load file)))
(unless (file-exists-p (concat directory "/" ".yas-skip")) (unless (file-exists-p (concat directory "/" ".yas-skip"))
@ -2426,7 +2435,7 @@ for this field, apply it. Otherwise, returned nil."
(transformed (and transform (transformed (and transform
(save-excursion (save-excursion
(goto-char start-point) (goto-char start-point)
(yas/read-and-eval-string transform))))) (yas/eval-lisp transform)))))
transformed)) transformed))
(defsubst yas/replace-all (from to &optional text) (defsubst yas/replace-all (from to &optional text)
@ -2520,7 +2529,7 @@ delegate to `yas/next-field'."
(text yas/text) (text yas/text)
(yas/modified-p (yas/field-modified-p active-field))) (yas/modified-p (yas/field-modified-p active-field)))
;; primary field transform: exit call to field-transform ;; primary field transform: exit call to field-transform
(yas/read-and-eval-string (yas/field-transform active-field)))) (yas/eval-lisp (yas/field-transform active-field))))
;; Now actually move... ;; Now actually move...
(cond ((>= target-pos (length live-fields)) (cond ((>= target-pos (length live-fields))
(yas/exit-snippet snippet)) (yas/exit-snippet snippet))
@ -2927,15 +2936,12 @@ will be deleted before inserting template."
(when start (when start
(goto-char start)) (goto-char start))
;; stacked expansion: shoosh the overlay modification hooks
;; ;;
(let ((to-delete (and start end (buffer-substring-no-properties start end))) (let ((to-delete (and start end (buffer-substring-no-properties start end)))
(start (or start (point))) (start (or start (point)))
(end (or end (point))) (end (or end (point)))
(inhibit-modification-hooks t)
(column (current-column)) (column (current-column))
snippet) snippet)
;; Delete the region to delete, this *does* get undo-recorded. ;; Delete the region to delete, this *does* get undo-recorded.
;; ;;
(when (and to-delete (when (and to-delete
@ -2943,60 +2949,67 @@ will be deleted before inserting template."
(delete-region start end) (delete-region start end)
(setq yas/deleted-text to-delete)) (setq yas/deleted-text to-delete))
;; Narrow the region down to the template, shoosh the (cond ((listp template)
;; `buffer-undo-list', and create the snippet, the new snippet ;; x) This is a snippet-command
;; updates its mirrors once, so we are left with some plain text. ;;
;; The undo action for deleting this plain text will get recorded (yas/eval-lisp-no-saves template))
;; at the end of this function. (t
(save-restriction ;; x) This is a snippet-snippet :-)
(narrow-to-region start start) ;;
(let ((buffer-undo-list t)) ;; Narrow the region down to the template, shoosh the
;; snippet creation might evaluate users elisp, which ;; `buffer-undo-list', and create the snippet, the new
;; might generate errors, so we have to be ready to catch ;; snippet updates its mirrors once, so we are left with
;; them mostly to make the undo information ;; some plain text. The undo action for deleting this
;; ;; plain text will get recorded at the end.
(setq yas/start-column (save-restriction (widen) (current-column))) ;;
(insert template) ;; stacked expansion: also shoosh the overlay modification hooks
(save-restriction
(narrow-to-region start start)
(let ((inhibit-modification-hooks t)
(buffer-undo-list t))
;; snippet creation might evaluate users elisp, which
;; might generate errors, so we have to be ready to catch
;; them mostly to make the undo information
;;
(setq yas/start-column (save-restriction (widen) (current-column)))
(insert template)
(setq snippet (setq snippet
(if expand-env (if expand-env
(let ((read-vars (condition-case err (eval `(let ,expand-env
(read expand-env) (yas/snippet-create (point-min) (point-max))))
(error nil)))) (yas/snippet-create (point-min) (point-max))))))
(eval `(let ,read-vars
(yas/snippet-create (point-min) (point-max)))))
(yas/snippet-create (point-min) (point-max))))))
;; stacked-expansion: This checks for stacked expansion, save the ;; stacked-expansion: This checks for stacked expansion, save the
;; `yas/previous-active-field' and advance its boudary. ;; `yas/previous-active-field' and advance its boudary.
;; ;;
(let ((existing-field (and yas/active-field-overlay (let ((existing-field (and yas/active-field-overlay
(overlay-buffer yas/active-field-overlay) (overlay-buffer yas/active-field-overlay)
(overlay-get yas/active-field-overlay 'yas/field)))) (overlay-get yas/active-field-overlay 'yas/field))))
(when existing-field (when existing-field
(setf (yas/snippet-previous-active-field snippet) existing-field) (setf (yas/snippet-previous-active-field snippet) existing-field)
(yas/advance-end-maybe existing-field (overlay-end yas/active-field-overlay)))) (yas/advance-end-maybe existing-field (overlay-end yas/active-field-overlay))))
;; Exit the snippet immediately if no fields ;; Exit the snippet immediately if no fields
;; ;;
(unless (yas/snippet-fields snippet) (unless (yas/snippet-fields snippet)
(yas/exit-snippet snippet)) (yas/exit-snippet snippet))
;; Push two undo actions: the deletion of the inserted contents of ;; Push two undo actions: the deletion of the inserted contents of
;; the new snippet (without the "key") followed by an apply of ;; the new snippet (without the "key") followed by an apply of
;; `yas/take-care-of-redo' on the newly inserted snippet boundaries ;; `yas/take-care-of-redo' on the newly inserted snippet boundaries
;; ;;
(let ((start (overlay-start (yas/snippet-control-overlay snippet))) (let ((start (overlay-start (yas/snippet-control-overlay snippet)))
(end (overlay-end (yas/snippet-control-overlay snippet)))) (end (overlay-end (yas/snippet-control-overlay snippet))))
(push (cons start end) buffer-undo-list) (push (cons start end) buffer-undo-list)
(push `(apply yas/take-care-of-redo ,start ,end ,snippet) (push `(apply yas/take-care-of-redo ,start ,end ,snippet)
buffer-undo-list)) buffer-undo-list))
;; Now, move to the first field ;; Now, move to the first field
;; ;;
(let ((first-field (car (yas/snippet-fields snippet)))) (let ((first-field (car (yas/snippet-fields snippet))))
(when first-field (when first-field
(yas/move-to-field snippet first-field)))) (yas/move-to-field snippet first-field)))))
(message "[yas] snippet expanded.")) (message "[yas] snippet expanded.")))
(defun yas/take-care-of-redo (beg end snippet) (defun yas/take-care-of-redo (beg end snippet)
"Commits SNIPPET, which in turn pushes an undo action for "Commits SNIPPET, which in turn pushes an undo action for
@ -3338,7 +3351,7 @@ With optional string TEXT do it in string instead of the buffer."
"Replace all the \"`(lisp-expression)`\"-style expression "Replace all the \"`(lisp-expression)`\"-style expression
with their evaluated value" with their evaluated value"
(while (re-search-forward yas/backquote-lisp-expression-regexp nil t) (while (re-search-forward yas/backquote-lisp-expression-regexp nil t)
(let ((transformed (yas/read-and-eval-string (yas/restore-escapes (match-string 1))))) (let ((transformed (yas/eval-lisp (yas/read-lisp (yas/restore-escapes (match-string 1))))))
(goto-char (match-end 0)) (goto-char (match-end 0))
(when transformed (insert transformed)) (when transformed (insert transformed))
(delete-region (match-beginning 0) (match-end 0))))) (delete-region (match-beginning 0) (match-end 0)))))
@ -3417,7 +3430,8 @@ When multiple expressions are found, only the last one counts."
yas/dollar-regions))) yas/dollar-regions)))
(let ((lisp-expression-string (buffer-substring-no-properties (match-beginning 1) (let ((lisp-expression-string (buffer-substring-no-properties (match-beginning 1)
real-match-end-1))) real-match-end-1)))
(setf (yas/field-transform parent-field) (yas/restore-escapes lisp-expression-string))) (setf (yas/field-transform parent-field)
(yas/restore-escapes (yas/read-lisp lisp-expression-string))))
(push (cons (match-beginning 0) real-match-end-1) (push (cons (match-beginning 0) real-match-end-1)
yas/dollar-regions))))))) yas/dollar-regions)))))))
@ -3433,9 +3447,9 @@ When multiple expressions are found, only the last one counts."
field) field)
(push (yas/make-mirror (yas/make-marker (match-beginning 0)) (push (yas/make-mirror (yas/make-marker (match-beginning 0))
(yas/make-marker (match-beginning 0)) (yas/make-marker (match-beginning 0))
(yas/restore-escapes (yas/read-lisp (yas/restore-escapes
(buffer-substring-no-properties (match-beginning 2) (buffer-substring-no-properties (match-beginning 2)
(1- real-match-end-0)))) (1- real-match-end-0)))))
(yas/field-mirrors field)) (yas/field-mirrors field))
(push (cons (match-beginning 0) real-match-end-0) yas/dollar-regions))))) (push (cons (match-beginning 0) real-match-end-0) yas/dollar-regions)))))