X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/3cf835a4bea2df30c4cc381934848f621df35bd9..99834918e1d9dc8e49356fdaac0853473487806d:/packages/yasnippet/yasnippet-tests.el diff --git a/packages/yasnippet/yasnippet-tests.el b/packages/yasnippet/yasnippet-tests.el index 2d7a0bc84..844cd943b 100644 --- a/packages/yasnippet/yasnippet-tests.el +++ b/packages/yasnippet/yasnippet-tests.el @@ -54,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")))) @@ -64,7 +64,7 @@ (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")))) @@ -74,7 +74,7 @@ (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 () @@ -83,7 +83,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!")))) @@ -92,7 +92,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!")))) @@ -102,7 +102,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...' %>")))) @@ -110,7 +110,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 () @@ -124,16 +124,55 @@ (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")))) + ;;; Snippet expansion and character escaping ;;; Thanks to @zw963 (Billy) for the testing @@ -214,7 +253,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) @@ -315,9 +354,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"))))) @@ -341,7 +380,7 @@ TODO: correct this bug!" ;; 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 @@ -446,6 +485,14 @@ TODO: correct this bug!" ("lisp-interaction-mode" ("sc" . "brother from another mother")))) ,@body)))) +(ert-deftest snippet-lookup () + "Test `yas-lookup-snippet'." + (yas-with-some-interesting-snippet-dirs + (yas-reload-all 'no-jit) + (should (equal (yas-lookup-snippet "printf" 'c-mode) "printf($1);")) + (should (equal (yas-lookup-snippet "def" 'c-mode) "# define")) + (should-not (yas-lookup-snippet "no such snippet" nil 'noerror)) + (should-not (yas-lookup-snippet "printf" 'emacs-lisp-mode 'noerror)))) (ert-deftest basic-jit-loading () "Test basic loading and expansion of snippets" @@ -454,7 +501,7 @@ TODO: correct this bug!" (yas--basic-jit-loading-1))) (ert-deftest basic-jit-loading-with-compiled-snippets () - "Test basic loading and expansion of snippets" + "Test basic loading and expansion of compiled snippets" (yas-with-some-interesting-snippet-dirs (yas-reload-all) (yas-recompile-all) @@ -464,6 +511,20 @@ TODO: correct this bug!" (yas-reload-all) (yas--basic-jit-loading-1)))) +(ert-deftest visiting-compiled-snippets () + "Test snippet visiting for compiled snippets." + (yas-with-some-interesting-snippet-dirs + (yas-recompile-all) + (yas-reload-all 'no-jit) ; must be loaded for `yas-lookup-snippet' to work. + (yas--with-temporary-redefinitions ((find-file-noselect + (filename &rest _) + (throw 'yas-snippet-file filename))) + (should (string-suffix-p + "cc-mode/def" + (catch 'yas-snippet-file + (yas--visit-snippet-file-1 + (yas--lookup-snippet-1 "def" 'cc-mode)))))))) + (ert-deftest loading-with-cyclic-parenthood () "Test loading when cyclic parenthood is setup." (yas-saving-variables @@ -482,15 +543,44 @@ TODO: correct this bug!" yet-another-c-mode and-also-this-one and-that-one - ;; prog-mode doesn't exit in emacs 24.3 + ;; prog-mode doesn't exist in emacs 24.3 ,@(if (fboundp 'prog-mode) '(prog-mode)) emacs-lisp-mode lisp-interaction-mode)) (observed (yas--modes-to-activate))) - (should (null (cl-set-exclusive-or expected observed))) - (should (= (length expected) - (length observed)))))))) + (should (equal major-mode (car observed))) + (should (equal (sort expected #'string<) (sort observed #'string<)))))))) + +(ert-deftest extra-modes-parenthood () + "Test activation of parents of `yas--extra-modes'." + (yas-saving-variables + (yas-with-snippet-dirs '((".emacs.d/snippets" + ("c-mode" + (".yas-parents" . "cc-mode")) + ("yet-another-c-mode" + (".yas-parents" . "c-mode and-also-this-one lisp-interaction-mode")))) + (yas-reload-all) + (with-temp-buffer + (yas-activate-extra-mode 'c-mode) + (yas-activate-extra-mode 'yet-another-c-mode) + (yas-activate-extra-mode 'and-that-one) + (let* ((expected-first `(and-that-one + yet-another-c-mode + c-mode + ,major-mode)) + (expected-rest `(cc-mode + ;; prog-mode doesn't exist in emacs 24.3 + ,@(if (fboundp 'prog-mode) + '(prog-mode)) + emacs-lisp-mode + and-also-this-one + lisp-interaction-mode)) + (observed (yas--modes-to-activate))) + (should (equal expected-first + (cl-subseq observed 0 (length expected-first)))) + (should (equal (sort expected-rest #'string<) + (sort (cl-subseq observed (length expected-first)) #'string<)))))))) (defalias 'yas--phony-c-mode 'c-mode) @@ -700,7 +790,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))) @@ -765,10 +855,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)) @@ -819,6 +912,17 @@ add the snippets associated with the given mode." ;; FIXME: Why provide this default definition here?!? (defalias 'special-mode 'fundamental)) +(unless (fboundp 'string-suffix-p) + ;; introduced in Emacs 24.4 + (defun string-suffix-p (suffix string &optional ignore-case) + "Return non-nil if SUFFIX is a suffix of STRING. +If IGNORE-CASE is non-nil, the comparison is done without paying +attention to case differences." + (let ((start-pos (- (length string) (length suffix)))) + (and (>= start-pos 0) + (eq t (compare-strings suffix nil nil + string start-pos nil ignore-case)))))) + ;;; btw to test this in emacs22 mac osx: ;;; curl -L -O https://github.com/mirrors/emacs/raw/master/lisp/emacs-lisp/ert.el ;;; curl -L -O https://github.com/mirrors/emacs/raw/master/lisp/emacs-lisp/ert-x.el