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

Reorganize snippet construction from list code

Browse Source 
* yasnippet.el (yas--template): New yas--define-snippets-2 constructor
  with arguments matching yas-define-snippets format.
(yas--define-snippets-1): Use it.
(yas--update-template): Return TEMPLATE argument.
This commit is contained in:
Noam Postavsky 2015-09-04 18:33:44 -04:00
parent 2f6cfef031
commit cc1c758ab7
1 changed files with 29 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
yasnippet.el
View File

@ -914,7 +914,27 @@ Honour `yas-dont-activate', which see."
;;; Internal structs for template management ;;; Internal structs for template management
(defstruct (yas--template (:constructor yas--make-template)) (cl-defstruct (yas--template
(:constructor yas--make-template)
;; Handles `yas-define-snippets' format, plus the
;; initial TABLE argument.
(:constructor
yas--define-snippets-2
(table
key content
&optional xname condition group
expand-env file xkeybinding xuuid
&aux
(name (or xname
(and file (file-name-directory file))
key))
(keybinding (yas--read-keybinding xkeybinding))
(uuid (or xuuid name))
(old (gethash uuid (yas--table-uuidhash table)))
(menu-binding-pair
(and old (yas--template-menu-binding-pair old)))
(perm-group
(and old (yas--template-perm-group old))))))
"A template for a snippet." "A template for a snippet."
key key
content content
@ -1081,7 +1101,8 @@ keybinding)."
(defun yas--update-template (table template) (defun yas--update-template (table template)
"Add or update TEMPLATE in TABLE. "Add or update TEMPLATE in TABLE.
Also takes care of adding and updating to the associated menu." Also takes care of adding and updating to the associated menu.
Return TEMPLATE."
;; Remove from table by uuid ;; Remove from table by uuid
;; ;;
(yas--remove-template-by-uuid table (yas--template-uuid template)) (yas--remove-template-by-uuid table (yas--template-uuid template))
@ -1090,7 +1111,8 @@ Also takes care of adding and updating to the associated menu."
(yas--add-template table template) (yas--add-template table template)
;; Take care of the menu ;; Take care of the menu
;; ;;
(yas--update-template-menu table template)) (yas--update-template-menu table template)
template)
(defun yas--update-template-menu (table template) (defun yas--update-template-menu (table template)
"Update every menu-related for TEMPLATE." "Update every menu-related for TEMPLATE."
@ -1600,42 +1622,10 @@ Optional PROMPT sets the prompt to use."
(defun yas--define-snippets-1 (snippet snippet-table) (defun yas--define-snippets-1 (snippet snippet-table)
"Helper for `yas-define-snippets'." "Helper for `yas-define-snippets'."
;; X) Calculate some more defaults on the values returned by ;; Update the appropriate table. Also takes care of adding the
;; `yas--parse-template'. ;; key indicators in the templates menu entry, if any.
;; (yas--update-template
(let* ((file (seventh snippet)) snippet-table (apply #'yas--define-snippets-2 snippet-table snippet)))
(key (car snippet))
(name (or (third snippet)
(and file
(file-name-directory file))))
(condition (fourth snippet))
(group (fifth snippet))
(keybinding (yas--read-keybinding (eighth snippet)))
(uuid (or (ninth snippet)
name))
(template (or (gethash uuid (yas--table-uuidhash snippet-table))
(yas--make-template :uuid uuid
:table snippet-table))))
;; X) populate the template object
;;
(setf (yas--template-key template) key)
(setf (yas--template-content template) (second snippet))
(setf (yas--template-name template) (or name key))
(setf (yas--template-group template) group)
(setf (yas--template-condition template) condition)
(setf (yas--template-expand-env template) (sixth snippet))
(setf (yas--template-file template) (seventh snippet))
(setf (yas--template-keybinding template) keybinding)
;; X) Update this template in the appropriate table. This step
;; also will take care of adding the key indicators in the
;; templates menu entry, if any
;;
(yas--update-template snippet-table template)
;; X) Return the template
;;
;;
template))
(defun yas-define-snippets (mode snippets) (defun yas-define-snippets (mode snippets)
"Define SNIPPETS for MODE. "Define SNIPPETS for MODE.