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

Fix expansion of commands snippet

Browse Source 
The previous changed failed to account for command snippets which have
lists for bodies, not strings.
* yasnippet.el (yas-expand-snippet): Don't error if SNIPPET is a list
representing a command snippet body.
* yasnippet-tests.el (yas-expand-command-snippet): New test.
This commit is contained in:
Noam Postavsky 2018-02-12 19:54:29 -05:00
parent c9277d326e
commit cf23537279
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
yasnippet-tests.el
View File

@ -673,6 +673,22 @@ mapconcat #'(lambda (arg)
(ert-simulate-command '(yas-expand)) (ert-simulate-command '(yas-expand))
(should (equal (buffer-string) "expanded foo"))))) (should (equal (buffer-string) "expanded foo")))))
(ert-deftest yas-expand-command-snippet ()
(with-temp-buffer
(yas-with-snippet-dirs
'((".emacs.d/snippets"
("emacs-lisp-mode"
("foo" . "\
# type: command
# --
\(insert \"expanded foo\")"))))
(yas-reload-all)
(emacs-lisp-mode)
(yas-minor-mode +1)
(insert "foo")
(ert-simulate-command '(yas-expand))
(should (equal (buffer-string) "expanded foo")))))
(ert-deftest example-for-issue-271 () (ert-deftest example-for-issue-271 ()
(with-temp-buffer (with-temp-buffer
(yas-minor-mode 1) (yas-minor-mode 1)

9
yasnippet.el
View File

@ -3791,8 +3791,8 @@ bindings considered when expanding the snippet. If omitted, use
SNIPPET's expand-env field. SNIPPET's expand-env field.
SNIPPET may be a snippet structure (e.g., as returned by SNIPPET may be a snippet structure (e.g., as returned by
`yas-lookup-snippet'), or just a string representing a snippet's `yas-lookup-snippet'), or just a snippet body (which is a string
body text." for normal snippets, and a list for command snippets)."
(cl-assert (and yas-minor-mode (cl-assert (and yas-minor-mode
(memq 'yas--post-command-handler post-command-hook)) (memq 'yas--post-command-handler post-command-hook))
nil nil
@ -3831,8 +3831,9 @@ body text."
(when to-delete (when to-delete
(delete-region start end)) (delete-region start end))
(let ((content (if (stringp snippet) snippet (let ((content (if (yas--template-p snippet)
(yas--template-content snippet)))) (yas--template-content snippet)
snippet)))
(when (and (not expand-env) (yas--template-p snippet)) (when (and (not expand-env) (yas--template-p snippet))
(setq expand-env (yas--template-expand-env snippet))) (setq expand-env (yas--template-expand-env snippet)))
(cond ((listp content) (cond ((listp content)