X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/cd05da61f9a6155f5ad3e284320daa6b5c73e011..146b161112b68c99ecd607ec5360accc1f4db3cd:/yasnippet-tests.el diff --git a/yasnippet-tests.el b/yasnippet-tests.el index 52f0c3975..8ba4632d3 100644 --- a/yasnippet-tests.el +++ b/yasnippet-tests.el @@ -1,6 +1,6 @@ -;;; yasnippet-tests.el --- some yasnippet tests +;;; yasnippet-tests.el --- some yasnippet tests -*- lexical-binding: t -*- -;; Copyright (C) 2012 João Távora +;; Copyright (C) 2012, 2013, 2014, 2015 Free Software Foundation, Inc. ;; Author: João Távora ;; Keywords: emulations, convenience @@ -27,6 +27,7 @@ (require 'yasnippet) (require 'ert) (require 'ert-x) +(require 'cl) ;;; Snippet mechanics @@ -53,7 +54,7 @@ (yas-expand-snippet "${1:brother} from another $1") (should (string= (yas--buffer-contents) "brother from another brother")) - (ert-simulate-command `(yas-mock-insert "bla")) + (yas-mock-insert "bla") (should (string= (yas--buffer-contents) "bla from another bla")))) @@ -63,17 +64,37 @@ (yas-expand-snippet "${1:brother} from another ${1:$(upcase yas-text)}") (should (string= (yas--buffer-contents) "brother from another BROTHER")) - (ert-simulate-command `(yas-mock-insert "bla")) + (yas-mock-insert "bla") (should (string= (yas--buffer-contents) "bla from another BLA")))) +(ert-deftest mirror-with-transformation-and-autofill () + "Test interaction of autofill with mirror transforms" + (let ((words "one two three four five") + filled-words) + (with-temp-buffer + (c-mode) ; In `c-mode' filling comments works by narrowing. + (yas-minor-mode +1) + (setq fill-column 10) + (auto-fill-mode +1) + (yas-expand-snippet "/* $0\n */") + (yas-mock-insert words) + (setq filled-words (delete-and-extract-region (point-min) (point-max))) + (yas-expand-snippet "/* $1\n */\n$2$2") + (should (string= (yas--buffer-contents) + "/* \n */\n")) + (yas-mock-insert words) + (should (string= (yas--buffer-contents) + (concat filled-words "\n")))))) + + (ert-deftest primary-field-transformation () (with-temp-buffer (yas-minor-mode 1) (let ((snippet "${1:$$(upcase yas-text)}${1:$(concat \"bar\" yas-text)}")) (yas-expand-snippet snippet) (should (string= (yas--buffer-contents) "bar")) - (ert-simulate-command `(yas-mock-insert "foo")) + (yas-mock-insert "foo") (should (string= (yas--buffer-contents) "FOObarFOO"))))) (ert-deftest nested-placeholders-kill-superfield () @@ -82,7 +103,7 @@ (yas-expand-snippet "brother from ${2:another ${3:mother}}!") (should (string= (yas--buffer-contents) "brother from another mother!")) - (ert-simulate-command `(yas-mock-insert "bla")) + (yas-mock-insert "bla") (should (string= (yas--buffer-contents) "brother from bla!")))) @@ -91,7 +112,7 @@ (yas-minor-mode 1) (yas-expand-snippet "brother from ${2:another ${3:mother}}!") (ert-simulate-command '(yas-next-field-or-maybe-expand)) - (ert-simulate-command `(yas-mock-insert "bla")) + (yas-mock-insert "bla") (should (string= (yas--buffer-contents) "brother from another bla!")))) @@ -101,7 +122,7 @@ (yas-expand-snippet "<%= f.submit \"${1:Submit}\"${2:$(and (yas-text) \", :disable_with => '\")}${2:$1ing...}${2:$(and (yas-text) \"'\")} %>") (should (string= (yas--buffer-contents) "<%= f.submit \"Submit\", :disable_with => 'Submiting...' %>")) - (ert-simulate-command `(yas-mock-insert "Send")) + (yas-mock-insert "Send") (should (string= (yas--buffer-contents) "<%= f.submit \"Send\", :disable_with => 'Sending...' %>")))) @@ -109,7 +130,7 @@ (with-temp-buffer (yas-minor-mode 1) (yas-expand-snippet "${1:FOOOOOOO}${2:$1}${3:$2}${4:$3}") - (ert-simulate-command `(yas-mock-insert "abc")) + (yas-mock-insert "abc") (should (string= (yas--buffer-contents) "abcabcabcabc")))) (ert-deftest delete-numberless-inner-snippet-issue-562 () @@ -123,16 +144,104 @@ (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) ;; (yas-expand-snippet "brother from ${2:another ${3:mother}}!") ;; (ert-simulate-command '(yas-next-field-or-maybe-expand)) -;; (ert-simulate-command `(yas-mock-insert "bla")) +;; (yas-mock-insert "bla") ;; (ert-simulate-command '(undo)) ;; (should (string= (yas--buffer-contents) ;; "brother from another mother!")))) +(ert-deftest dont-clear-on-partial-deletion-issue-515 () + "Ensure fields are not cleared when user doesn't really mean to." + (with-temp-buffer + (yas-minor-mode 1) + (yas-expand-snippet "my ${1:kid brother} from another ${2:mother}") + + (ert-simulate-command '(kill-word 1)) + (ert-simulate-command '(delete-char 1)) + + (should (string= (yas--buffer-contents) + "my brother from another mother")) + (should (looking-at "brother")) + + (ert-simulate-command '(yas-next-field)) + (should (looking-at "mother")) + (ert-simulate-command '(yas-prev-field)) + (should (looking-at "brother")))) + +(ert-deftest do-clear-on-yank-issue-515 () + "A yank should clear an unmodified field." + (with-temp-buffer + (yas-minor-mode 1) + (yas-expand-snippet "my ${1:kid brother} from another ${2:mother}") + (yas-mock-yank "little sibling") + (should (string= (yas--buffer-contents) + "my little sibling from another mother")) + (ert-simulate-command '(yas-next-field)) + (ert-simulate-command '(yas-prev-field)) + (should (looking-at "little sibling")))) + +(ert-deftest basic-indentation () + (with-temp-buffer + (ruby-mode) + (yas-minor-mode 1) + (set (make-local-variable 'yas-indent-line) 'auto) + (set (make-local-variable 'yas-also-auto-indent-first-line) t) + (yas-expand-snippet "def ${1:method}${2:(${3:args})}\n$0\nend") + ;; Note that empty line is not indented. + (should (string= "def method(args) + +end" (buffer-string))) + (cl-loop repeat 3 do (ert-simulate-command '(yas-next-field))) + (yas-mock-insert (make-string (random 5) ?\ )) ; purposedly mess up indentation + (yas-expand-snippet "class << ${self}\n $0\nend") + (ert-simulate-command '(yas-next-field)) + (should (string= "def method(args) + class << self + + end +end" (buffer-string))) + (should (= 4 (current-column))))) + +(ert-deftest navigate-a-snippet-with-multiline-mirrors-issue-665 () + "In issue 665, a multi-line mirror is attempted. + +Indentation doesn't (yet) happen on these mirrors, but let this +test guard against any misnavigations that might be introduced by +an incorrect implementation of mirror auto-indentation" + (with-temp-buffer + (ruby-mode) + (yas-minor-mode 1) + (yas-expand-snippet "def initialize(${1:params})\n$2${1:$( +mapconcat #'(lambda (arg) + (format \"@%s = %s\" arg arg)) + (split-string yas-text \", \") + \"\n\")}\nend") + (yas-mock-insert "bla, ble, bli") + (ert-simulate-command '(yas-next-field)) + (let ((expected (mapconcat #'identity + '("@bla = bla" + "[[:blank:]]*@ble = ble" + "[[:blank:]]*@bli = bli") + "\n"))) + (should (looking-at expected)) + (yas-mock-insert "blo") + (ert-simulate-command '(yas-prev-field)) + (ert-simulate-command '(yas-next-field)) + (should (looking-at (concat "blo" expected)))))) + ;;; Snippet expansion and character escaping ;;; Thanks to @zw963 (Billy) for the testing @@ -213,7 +322,7 @@ (snippet "if ${1:condition}\n`yas-selected-text`\nelse\n$3\nend")) (yas-expand-snippet snippet) (yas-next-field) - (ert-simulate-command `(yas-mock-insert "bbb")) + (yas-mock-insert "bbb") (should (string= (yas--buffer-contents) "if condition\naaa\nelse\nbbb\nend"))))) (defmacro yas--with-font-locked-temp-buffer (&rest body) @@ -236,6 +345,15 @@ (and (buffer-name ,temp-buffer) (kill-buffer ,temp-buffer)))))))) +(defmacro yas-saving-variables (&rest body) + `(yas-call-with-saving-variables #'(lambda () ,@body))) + +(defmacro yas-with-snippet-dirs (dirs &rest body) + (declare (indent defun)) + `(yas-call-with-snippet-dirs ,dirs + #'(lambda () + ,@body))) + (ert-deftest example-for-issue-474 () (yas--with-font-locked-temp-buffer (c-mode) @@ -305,9 +423,9 @@ \"fail\")}")) (yas-expand-snippet snippet) (should (string= (yas--buffer-contents) "fail")) - (ert-simulate-command `(yas-mock-insert "foobaaar")) + (yas-mock-insert "foobaaar") (should (string= (yas--buffer-contents) "foobaaarfail")) - (ert-simulate-command `(yas-mock-insert "baz")) + (yas-mock-insert "baz") (should (string= (yas--buffer-contents) "foobaaarbazok"))))) @@ -326,9 +444,12 @@ TODO: correct this bug!" "brother from another mother") ;; no newline should be here! ))) +(defvar yas--barbaz) +(defvar yas--foobarbaz) + ;; See issue #497. To understand this test, follow the example of the ;; `yas-key-syntaxes' docstring. -;; +;; (ert-deftest complicated-yas-key-syntaxes () (with-temp-buffer (yas-saving-variables @@ -530,8 +651,9 @@ TODO: correct this bug!" (should (equal (sort expected-rest #'string<) (sort (cl-subseq observed (length expected-first)) #'string<)))))))) +(defalias 'yas--phony-c-mode 'c-mode) + (ert-deftest issue-492-and-494 () - (defalias 'yas--phony-c-mode 'c-mode) (define-derived-mode yas--test-mode yas--phony-c-mode "Just a test mode") (yas-with-snippet-dirs '((".emacs.d/snippets" ("yas--test-mode"))) @@ -548,9 +670,10 @@ TODO: correct this bug!" (should (= (length expected) (length observed))))))) +(define-derived-mode yas--test-mode c-mode "Just a test mode") +(define-derived-mode yas--another-test-mode c-mode "Another test mode") + (ert-deftest issue-504-tricky-jit () - (define-derived-mode yas--test-mode c-mode "Just a test mode") - (define-derived-mode yas--another-test-mode c-mode "Another test mode") (yas-with-snippet-dirs '((".emacs.d/snippets" ("yas--another-test-mode" @@ -736,7 +859,7 @@ TODO: be meaner" (should (not (eq (key-binding (yas--read-keybinding "TAB")) 'yas-expand))) (should (eq (key-binding (yas--read-keybinding "SPC")) 'yas-expand)))) ;; FIXME: actually should restore to whatever saved values where there. - ;; + ;; (define-key yas-minor-mode-map [tab] 'yas-expand) (define-key yas-minor-mode-map (kbd "TAB") 'yas-expand) (define-key yas-minor-mode-map (kbd "SPC") nil))) @@ -777,7 +900,7 @@ add the snippets associated with the given mode." (defun yas-should-expand (keys-and-expansions) (dolist (key-and-expansion keys-and-expansions) (yas-exit-all-snippets) - (narrow-to-region (point) (point)) + (erase-buffer) (insert (car key-and-expansion)) (let ((yas-fallback-behavior nil)) (ert-simulate-command '(yas-expand))) @@ -791,7 +914,7 @@ add the snippets associated with the given mode." (defun yas-should-not-expand (keys) (dolist (key keys) (yas-exit-all-snippets) - (narrow-to-region (point) (point)) + (erase-buffer) (insert key) (let ((yas-fallback-behavior nil)) (ert-simulate-command '(yas-expand))) @@ -801,10 +924,13 @@ add the snippets associated with the given mode." (yas--buffer-contents)))))) (defun yas-mock-insert (string) - (interactive) - (do ((i 0 (1+ i))) - ((= i (length string))) - (insert (aref string i)))) + (dotimes (i (length string)) + (let ((last-command-event (aref string i))) + (ert-simulate-command '(self-insert-command 1))))) + +(defun yas-mock-yank (string) + (let ((interprogram-paste-function (lambda () string))) + (ert-simulate-command '(yank nil)))) (defun yas-make-file-or-dirs (ass) (let ((file-or-dir-name (car ass)) @@ -838,10 +964,6 @@ add the snippets associated with the given mode." for saved in saved-values do (set var saved))))) -(defmacro yas-saving-variables (&rest body) - `(yas-call-with-saving-variables #'(lambda () ,@body))) - - (defun yas-call-with-snippet-dirs (dirs fn) (let* ((default-directory (make-temp-file "yasnippet-fixture" t)) (yas-snippet-dirs (mapcar #'car dirs))) @@ -853,12 +975,6 @@ add the snippets associated with the given mode." (when (>= emacs-major-version 24) (delete-directory default-directory 'recursive)))))) -(defmacro yas-with-snippet-dirs (dirs &rest body) - (declare (indent defun)) - `(yas-call-with-snippet-dirs ,dirs - #'(lambda () - ,@body))) - ;;; Older emacsen ;;; (unless (fboundp 'special-mode) @@ -897,7 +1013,6 @@ attention to case differences." (provide 'yasnippet-tests) ;; Local Variables: ;; indent-tabs-mode: nil -;; lexical-binding: t ;; byte-compile-warnings: (not cl-functions) ;; End: ;;; yasnippet-tests.el ends here