ld/yasnippet
1
0
Fork 0
mirror of https://github.com/joaotavora/yasnippet.git synced 2025-10-14 05:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Work a little to support nested fields

Browse Source 
* snippet.el (snippet-defmacro): Support nested fields, more or
less...
(&field, &mirror): Add edebug and indent specs.
This commit is contained in:
João Távora 2015-04-02 21:43:28 +01:00
parent ddca1181a0
commit 414d2cbc57
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
snippet.el
View File

@ -48,7 +48,7 @@
;; mechanism *might* become extensible to provide frontends such as yasnippet ;; mechanism *might* become extensible to provide frontends such as yasnippet
;; the capability to conveniently implement said fanciness. ;; the capability to conveniently implement said fanciness.
;; ;;
;; TODO: indentation ;; TODO: auto-indentation of the inserted snippet
;; ;;
;; TODO: undo, specifically snippet revival ;; TODO: undo, specifically snippet revival
;; ;;
@ -682,16 +682,20 @@ Skips over nested fields if their parent has been modified."
`(defun ,name ,args `(defun ,name ,args
(let (;; (start (point-marker)) (let (;; (start (point-marker))
(fields (make-hash-table)) (fields (make-hash-table))
(mirrors (make-hash-table))) (mirrors (make-hash-table))
(snippet--current-field))
(cl-macrolet ((&field (field-name &body field-forms) (cl-macrolet ((&field (field-name &body field-forms)
`(let ((fn (lambda () ,@field-forms)) `(let* ((snippet--current-field
(start (point-marker))) (setf (gethash ',field-name fields)
(make-instance 'snippet--field
:name ',field-name
:parent snippet--current-field)))
(fn (lambda () ,@field-forms)))
(setf (snippet--object-start snippet--current-field)
(point-marker))
(funcall fn) (funcall fn)
(setf (gethash ,field-name (setf (snippet--object-end snippet--current-field)
fields) (point-marker))))
(make-instance 'snippet--field :name ,field-name
:start start
:end (point-marker)))))
(&mirror (field-name mirror-args &body mirror-forms) (&mirror (field-name mirror-args &body mirror-forms)
`(let ((fn (lambda ,mirror-args ,@mirror-forms)) `(let ((fn (lambda ,mirror-args ,@mirror-forms))
(start (point-marker))) (start (point-marker)))
@ -699,7 +703,7 @@ Skips over nested fields if their parent has been modified."
:transform (lambda (&rest args) :transform (lambda (&rest args)
(goto-char start) (goto-char start)
(apply fn args))) (apply fn args)))
(gethash ,field-name mirrors)))) (gethash ',field-name mirrors))))
(&exit ())) (&exit ()))
,@body ,@body
(maphash (lambda (field-name mirrors) (maphash (lambda (field-name mirrors)
@ -719,7 +723,14 @@ Skips over nested fields if their parent has been modified."
(snippet--object-end field)))) (snippet--object-end field))))
(snippet--field-mirrors field))) (snippet--field-mirrors field)))
fields) fields)
nil)))) fields))))
(def-edebug-spec &mirror (sexp sexp &rest form))
(def-edebug-spec &field (sexp &rest form))
(put '&field 'lisp-indent-function 'defun)
(put '&mirror 'lisp-indent-function 'defun)
;; Local Variables: ;; Local Variables: