branch: master
commit 394942130d2b70b6cfa57966ea89acbcd614e80c
Author: Noam Postavsky <npost...@users.sourceforge.net>
Commit: Noam Postavsky <npost...@users.sourceforge.net>
Fix problems with auto-fill-mode interaction
* yasnippet-tests.el (auto-fill-with-multiparagraph): New test.
* yasnippet.el (yas--auto-fill): Don't snapshot markers outside of
current paragraph.
(yas--goto-saved-location, yas--snapshot-marker-location): Count
newlines as whitespace (even if mode marks them as non-whitespace
syntax, e.g., comment end).
(yas--snapshot-overlay-location, yas--restore-overlay-location): Don't
snapshot overlay position which is outside of BEG .. END.
---
yasnippet-tests.el | 9 +++++++++
yasnippet.el | 33 +++++++++++++++++++++------------
2 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/yasnippet-tests.el b/yasnippet-tests.el
index 555249a..7ab956c 100644
--- a/yasnippet-tests.el
+++ b/yasnippet-tests.el
@@ -91,6 +91,15 @@
(should (string= (yas--buffer-contents)
(concat filled-words "\n"))))))
+(ert-deftest auto-fill-with-multiparagraph ()
+ "Test auto-fill protection on snippet spanning multiple paragraphs"
+ (with-temp-buffer
+ (yas-minor-mode +1)
+ (auto-fill-mode +1)
+ (yas-expand-snippet "foo$1\n\n$2bar")
+ (yas-mock-insert " ")
+ (ert-simulate-command '(yas-next-field-or-maybe-expand))
+ (should (looking-at "bar"))))
(ert-deftest primary-field-transformation ()
(with-temp-buffer
diff --git a/yasnippet.el b/yasnippet.el
index 50d4999..cf34388 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -3606,7 +3606,8 @@ field start. This hook does nothing if an undo is in
progress."
(reoverlays nil))
(dolist (snippet snippets)
(dolist (m (yas--collect-snippet-markers snippet))
- (push (yas--snapshot-marker-location m beg end) remarkers))
+ (when (and (<= beg m) (<= m end))
+ (push (yas--snapshot-marker-location m beg end) remarkers)))
(push (yas--snapshot-overlay-location
(yas--snippet-control-overlay snippet) beg end)
reoverlays))
@@ -4129,15 +4130,21 @@ The returned value is a list of the form (MARKER REGEXP
WS-COUNT)."
(nconc before (list marker) after)
"[[:space:]\n]*"))
(progn (goto-char marker)
- (skip-syntax-forward " " end)
+ (skip-chars-forward "[:space:]\n" end)
(- (point) marker)))))
(defun yas--snapshot-overlay-location (overlay beg end)
"Like `yas--snapshot-marker-location' for overlays.
-The returned format is (OVERLAY (RE WS) (RE WS))."
- (list overlay
- (cdr (yas--snapshot-marker-location (overlay-start overlay) beg end))
- (cdr (yas--snapshot-marker-location (overlay-end overlay) beg end))))
+The returned format is (OVERLAY (RE WS) (RE WS)). Either of
+the (RE WS) lists may be nil if the start or end, respectively,
+of the overlay is outside the range BEG .. END."
+ (let ((obeg (overlay-start overlay))
+ (oend (overlay-end overlay)))
+ (list overlay
+ (when (and (<= beg obeg) (< obeg end))
+ (cdr (yas--snapshot-marker-location obeg beg end)))
+ (when (and (<= beg oend) (< oend end))
+ (cdr (yas--snapshot-marker-location oend beg end))))))
(defun yas--snapshot-overlay-line-location (overlay)
"Return info for restoring OVERLAY's line based location.
@@ -4160,8 +4167,8 @@ Buffer must be narrowed to BEG..END used to create the
snapshot info."
(lwarn '(yasnippet re-marker) :warning
"Couldn't find: %S" regexp)
(goto-char (match-beginning 1))
- (skip-syntax-forward " ")
- (skip-syntax-backward " " (- (point) ws-count))))
+ (skip-chars-forward "[:space:]\n")
+ (skip-chars-backward "[:space:]\n" (- (point) ws-count))))
(defun yas--restore-marker-location (re-marker)
"Restores marker based on info from `yas--snapshot-marker-location'.
@@ -4174,10 +4181,12 @@ Buffer must be narrowed to BEG..END used to create the
snapshot info."
Buffer must be narrowed to BEG..END used to create the snapshot info."
(cl-destructuring-bind (overlay loc-beg loc-end) ov-locations
(move-overlay overlay
- (progn (apply #'yas--goto-saved-location loc-beg)
- (point))
- (progn (apply #'yas--goto-saved-location loc-end)
- (point)))))
+ (if (not loc-beg) (overlay-start overlay)
+ (apply #'yas--goto-saved-location loc-beg)
+ (point))
+ (if (not loc-end) (overlay-end overlay)
+ (apply #'yas--goto-saved-location loc-end)
+ (point)))))
(defun yas--restore-overlay-line-location (ov-locations)
