[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 316435e 173/177: Closes #562: Deleting inner numberless sn
From: |
João Távora |
Subject: |
[elpa] master 316435e 173/177: Closes #562: Deleting inner numberless snippet causes error |
Date: |
Sat, 28 Mar 2015 15:41:44 +0000 |
branch: master
commit 316435e03eb296aec15605390cde04dc5bf8a525
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>
Closes #562: Deleting inner numberless snippet causes error
* yasnippet.el (yas--field-probably-deleted-p): Protect against
nil `yas--field-number'.
* yasnippet-tests.el (delete-numberless-inner-snippet-issue-562): New test
---
yasnippet-tests.el | 11 +++++++++++
yasnippet.el | 3 ++-
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/yasnippet-tests.el b/yasnippet-tests.el
index 7499640..150e1d0 100644
--- a/yasnippet-tests.el
+++ b/yasnippet-tests.el
@@ -112,6 +112,17 @@
(ert-simulate-command `(yas-mock-insert "abc"))
(should (string= (yas--buffer-contents) "abcabcabcabc"))))
+(ert-deftest delete-numberless-inner-snippet-issue-562 ()
+ (with-temp-buffer
+ (yas-minor-mode 1)
+ (yas-expand-snippet "${3:${test}bla}$0${2:ble}")
+ (ert-simulate-command '(yas-next-field-or-maybe-expand))
+ (should (looking-at "testblable"))
+ (ert-simulate-command '(yas-next-field-or-maybe-expand))
+ (ert-simulate-command '(yas-skip-and-clear-or-delete-char))
+ (should (looking-at "ble"))
+ (should (null (yas--snippets-at-point)))))
+
;; (ert-deftest in-snippet-undo ()
;; (with-temp-buffer
;; (yas-minor-mode 1)
diff --git a/yasnippet.el b/yasnippet.el
index 8c9212c..2a2254b 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -3016,7 +3016,8 @@ through the field's start point"
;; the field numbered 0, just before the exit marker, should
;; never be skipped
;;
- (not (zerop (yas--field-number field)))))
+ (not (and (yas--field-number field)
+ (zerop (yas--field-number field))))))
(defun yas--snippets-at-point (&optional all-snippets)
"Return a sorted list of snippets at point.
- [elpa] master bb6bbad 161/177: Add file doc/.nosearch, (continued)
- [elpa] master bb6bbad 161/177: Add file doc/.nosearch, João Távora, 2015/03/28
- [elpa] master 9709dbd 164/177: Add autoload cookies, João Távora, 2015/03/28
- [elpa] master b62bdf3 163/177: Closes #546: backport `yas-initialize' and provide `yas/initialize', João Távora, 2015/03/28
- [elpa] master e161fc0 162/177: Merge pull request #542 from tarsius/nosearch, João Távora, 2015/03/28
- [elpa] master 07734a1 165/177: Clarify what happens with yas-new-snippet., João Távora, 2015/03/28
- [elpa] master 3c13348 167/177: yas-expand-snippet: Clarify EXPAND-ENV, João Távora, 2015/03/28
- [elpa] master 21ffe4b 168/177: Merge pull request #559 from mineo/patch-1, João Távora, 2015/03/28
- [elpa] master 197ef7f 166/177: Merge pull request #552 from treese/master, João Távora, 2015/03/28
- [elpa] master 3e7b56e 169/177: Implements #566: Remove dead major modes code, João Távora, 2015/03/28
- [elpa] master b9989f8 170/177: Add a CONTRIBUTING.md file, João Távora, 2015/03/28
- [elpa] master 316435e 173/177: Closes #562: Deleting inner numberless snippet causes error,
João Távora <=
- [elpa] master fc5052b 171/177: Merge pull request #568 from npostavs/contrib, João Távora, 2015/03/28
- [elpa] master 885237a 174/177: Add useful development assertion, João Távora, 2015/03/28
- [elpa] master a467019 175/177: `yas-minor-mode' assertion broke a test. Good. Fix it., João Távora, 2015/03/28
- [elpa] master d19ef74 172/177: Getting rid of low-level assumptions in yasnippet, João Távora, 2015/03/28
- [elpa] master 73701d9 176/177: Update packages/darkroom by merging its external subtree, João Távora, 2015/03/28
- [elpa] master 4f27187 062/177: refactor: removed extras and snippets tree, both point to submodules, João Távora, 2015/03/28
- [elpa] master 1cf9168 068/177: Merge branch 'unclutter': snippets and textmate importation snippets are now submodules, João Távora, 2015/03/28
- [elpa] master 39a27b6 177/177: Update packages/yasnippet by merging from its external upstream subtree, João Távora, 2015/03/28