[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 1cf723a 41/60: Ignore trailing spaces in snippet definitio
From: |
João Távora |
Subject: |
[elpa] master 1cf723a 41/60: Ignore trailing spaces in snippet definitions |
Date: |
Thu, 21 Jan 2016 22:36:02 +0000 |
branch: master
commit 1cf723a408800b489a5f74bd14219a74b665a7f3
Author: Sharif Nassar <address@hidden>
Commit: Noam Postavsky <address@hidden>
Ignore trailing spaces in snippet definitions
Probably nobody wants a snippet `key` with a trailing space. It can
be hard to differentiate from a `key` without trailing space. The
default `<TAB>` behavior of yasnippet will never expand these.
* yasnippet.el (yas--parse-template): Ignore trailing spaces in snippet
definitions.
* yasnippet-tests.el (deftest ignore-trailing-whitespace): New test for
new behavior.
Copyright-paperwork-exempt: yes
---
yasnippet-tests.el | 9 +++++++++
yasnippet.el | 2 +-
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/yasnippet-tests.el b/yasnippet-tests.el
index b71ea7e..9a1e2c2 100644
--- a/yasnippet-tests.el
+++ b/yasnippet-tests.el
@@ -123,6 +123,15 @@
(should (looking-at "ble"))
(should (null (yas--snippets-at-point)))))
+(ert-deftest ignore-trailing-whitespace ()
+ (should (equal
+ (with-temp-buffer
+ (insert "# key: foo\n# --\nfoo")
+ (yas--parse-template))
+ (with-temp-buffer
+ (insert "# key: foo \n# --\nfoo")
+ (yas--parse-template)))))
+
;; (ert-deftest in-snippet-undo ()
;; (with-temp-buffer
;; (yas-minor-mode 1)
diff --git a/yasnippet.el b/yasnippet.el
index ef6a763..c456247 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1448,7 +1448,7 @@ Here's a list of currently recognized directives:
(point-max)))
(setq bound (point))
(goto-char (point-min))
- (while (re-search-forward "^# *\\([^ ]+?\\) *: *\\(.*\\)$"
bound t)
+ (while (re-search-forward "^# *\\([^ ]+?\\) *:
*\\(.*?\\)[[:space:]]*$" bound t)
(when (string= "uuid" (match-string-no-properties 1))
(setq uuid (match-string-no-properties 2)))
(when (string= "type" (match-string-no-properties 1))
- [elpa] master e3f03ca 21/60: Test visiting compiled snippets, (continued)
- [elpa] master e3f03ca 21/60: Test visiting compiled snippets, João Távora, 2016/01/21
- [elpa] master e56aa6f 28/60: Build a single `explored' list., João Távora, 2016/01/21
- [elpa] master b6d924c 31/60: * yasnippet.el (yas--scan-sexps): Use ignore-errors., João Távora, 2016/01/21
- [elpa] master 00b84ce 27/60: Add (failing) yas--modes-to-activate test, João Távora, 2016/01/21
- [elpa] master 72c6c4c 32/60: Fix #618; save match data in yas--scan-sexps, João Távora, 2016/01/21
- [elpa] master ac3fe83 30/60: Merge pull request #621 from npostavs/dfs-extra-modes2, João Távora, 2016/01/21
- [elpa] master b8687bb 35/60: Avoid double snippet loading messages, João Távora, 2016/01/21
- [elpa] master 35642ac 33/60: Simplify string matching., João Távora, 2016/01/21
- [elpa] master b055f13 34/60: Fix #617; ensure point is visible before x prompt, João Távora, 2016/01/21
- [elpa] master f121645 38/60: Fix #607; avoid Emacs bug #21824, João Távora, 2016/01/21
- [elpa] master 1cf723a 41/60: Ignore trailing spaces in snippet definitions,
João Távora <=
- [elpa] master 2100b89 42/60: Closes #632: Use `user-emacs-directory' instead of hardcoded "~/emacs.d", João Távora, 2016/01/21
- [elpa] master beb02e5 39/60: * CONTRIBUTING.md: Add note about changelog only messages., João Távora, 2016/01/21
- [elpa] master fb28ec8 37/60: * README.mdown (Use `yas-minor-mode`): Reword., João Távora, 2016/01/21
- [elpa] master 6c46878 43/60: Fix #587; set `this-command' on fallback., João Távora, 2016/01/21
- [elpa] master 23ee54e 44/60: Use destructive list functions in yas--s-a-p, João Távora, 2016/01/21
- [elpa] master 3aa7cb2 40/60: M-x delete-trailing-whitespace, João Távora, 2016/01/21
- [elpa] master d78181a 46/60: Remove yas--inhibit-overlay-hooks macro., João Távora, 2016/01/21
- [elpa] master 17fe790 51/60: Fix #515; only clear field on self-insert, João Távora, 2016/01/21
- [elpa] master 67a45a6 48/60: * README.mdown: Add link to textmate-to-yas.el., João Távora, 2016/01/21
- [elpa] master c80fbf2 49/60: Cleanup yas--on-field-overlay-modification, João Távora, 2016/01/21