Skip to content

Support using regexp for keys #1066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Zetagon wants to merge 12 commits into
base: master
Choose a base branch
from
Draft

Support using regexp for keys #1066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
81859f5
Update template and table to hold regexp-keys
Zetagon May 11, 2019
49f9931
Update yas--parse-templates to parse regexp-key directive
Zetagon May 11, 2019
65a6d33
Update functions that depend on positions in snippet definition
Zetagon May 11, 2019
b207255
Add yas-expand-regexp
Zetagon May 11, 2019
6bed96e
Also honour yas-buffer-local-condition
Zetagon May 19, 2019
21c4707
Make regexp-key a valid substitute for key or binding
Zetagon May 19, 2019
ea8854a
Add ordering to regexp-snippets
Zetagon May 20, 2019
56740bc
Move appending "$" to where regexp-matching is done
Zetagon May 25, 2019
5949cbc
Add support for key-syntaxes for regexp-keys
Zetagon Jun 5, 2019
b5c81da
Add a couple of tests to regexp-keys
Zetagon Jun 2, 2019
17393be
Remove old function
Zetagon Jun 11, 2019
155ebfa
Add yas-matched-regexp-key-groups
Zetagon Aug 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 104 additions & 0 deletions yasnippet-tests.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1671,6 +1671,110 @@ add the snippets associated with the given mode."
(yas-should-expand '(("car" . "(car )")))))))


(ert-deftest regexp-key-simple-integration-test ()
(clrhash yas--tables)
(with-temp-buffer
(insert "# name: test\n# regexp-key: [a-z]*\n# --\nfoo")
(yas-define-snippets 'fundamental-mode (list (yas--parse-template))))
(yas-minor-mode 1)
(insert "foobarquux")
(ert-simulate-command '(yas-expand))
(should (equal (buffer-string) "foo"))
(clrhash yas--tables))

(ert-deftest regexp-key-simple-integration-test-key-syntaxes ()
(clrhash yas--tables)
(with-temp-buffer
(insert "# name: test\n# regexp-key: ([^b-a]*)\n# --\nfoo")
(yas-define-snippets 'fundamental-mode (list (yas--parse-template))))
(with-temp-buffer
(yas-minor-mode 1)
(insert "(asdf)")
(ert-simulate-command '(yas-expand))
(should (equal (buffer-string) "foo")))
(with-temp-buffer
(yas-minor-mode 1)
(insert " (test whitespace before)")
(ert-simulate-command '(yas-expand))
(should (equal (buffer-string) " foo")))
(with-temp-buffer
(yas-minor-mode 1)
(insert "(kdkd\n)")
(ert-simulate-command '(yas-expand))
(should (equal (buffer-string) "(kdkd\n)")))
(with-temp-buffer
(yas-minor-mode 1)
(insert "(foobarquux\n)")
(let ((yas-regexp-key-syntaxes (list (lambda (original) (goto-char (line-beginning-position 0))))))
(ert-simulate-command '(yas-expand)))
(should (equal (buffer-string) "foo")))
(with-temp-buffer
(yas-minor-mode 1)
(insert "(foobarquux)")
(let ((yas-regexp-key-syntaxes (list "(w)")))
(ert-simulate-command '(yas-expand)))
(should (equal (buffer-string) "foo")))
(with-temp-buffer
(yas-minor-mode 1)
(insert "(foo barquux)")
(let ((yas-regexp-key-syntaxes (list "(w)")))
(ert-simulate-command '(yas-expand)))
(should (equal (buffer-string) "(foo barquux)")))
(clrhash yas--tables))
(ert-deftest regexp-matched-regexp-key ()
(clrhash yas--tables)
(with-temp-buffer
(insert "# name: test\n# regexp-key: [a-z]*\n# --\n(`yas-matched-regexp-key`)")
(yas-define-snippets 'fundamental-mode (list (yas--parse-template))))
(yas-minor-mode 1)
(insert "foobarquux")
(ert-simulate-command '(yas-expand))
(should (equal (buffer-string) "(foobarquux)"))
(clrhash yas--tables))

(ert-deftest regexp-key-order-default ()
(clrhash yas--tables)
(with-temp-buffer
(insert "# name: test\n# regexp-order: 1\n# regexp-key: [a-z]*\n# --\norder1")
(yas-define-snippets 'fundamental-mode (list (yas--parse-template))))
(with-temp-buffer
(insert "# name: test\n# regexp-key: [a-z]*\n# --\norderdefault")
(yas-define-snippets 'fundamental-mode (list (yas--parse-template))))
(yas-minor-mode 1)
(insert "foobarquux")
(ert-simulate-command '(yas-expand))
(should (equal (buffer-string) "order1"))
(clrhash yas--tables))

(ert-deftest regexp-key-order ()
(clrhash yas--tables)
(with-temp-buffer
(insert "# name: test\n# regexp-order: 0\n# regexp-key: [a-z]*\n# --\norder0")
(yas-define-snippets 'fundamental-mode (list (yas--parse-template))))
(with-temp-buffer
(insert "# name: test\n# regexp-order: 1\n# regexp-key: [a-z]*\n# --\norder1")
(yas-define-snippets 'fundamental-mode (list (yas--parse-template))))
(yas-minor-mode 1)
(insert "foobarquux")
(ert-simulate-command '(yas-expand))
(should (equal (buffer-string) "order0"))
(clrhash yas--tables))

(ert-deftest regexp-key-simple-nested ()
(clrhash yas--tables)
(with-temp-buffer
(insert "# name: test\n\n# regexp-key: foo+\n# --\n(${1:foo})$0")
(yas-define-snippets 'fundamental-mode (list (yas--parse-template))))
(with-temp-buffer
(insert "# name: test1\n\n# regexp-key: bar+\n# --\nbaz")
(yas-define-snippets 'fundamental-mode (list (yas--parse-template))))
(yas-minor-mode 1)
(insert "foo")
(ert-simulate-command '(yas-expand))
(insert "bar")
(ert-simulate-command '(yas-expand))
(should (equal (buffer-string) "(baz)"))
(clrhash yas--tables))

(provide 'yasnippet-tests)
;; Local Variables:
Expand Down
Loading