Skip to content

Make evil-word respect superword-mode #1931

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make evil-word respect superword-mode #1931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 13 additions & 11 deletions evil-common.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1541,17 +1541,19 @@ word is a sequence of word characters matching
\[[:word:]] (recognized by `forward-word'), a sequence of
non-whitespace non-word characters '[^[:word:]\\n\\r\\t\\f ]', or
an empty line matching ^$."
(evil-forward-nearest
count
#'(lambda (&optional cnt)
(let ((word-separating-categories evil-cjk-word-separating-categories)
(word-combining-categories evil-cjk-word-combining-categories)
(pnt (point)))
(forward-word cnt)
(if (= pnt (point)) cnt 0)))
#'(lambda (&optional cnt)
(evil-forward-chars "^[:word:]\n\r\t\f " cnt))
#'forward-evil-empty-line))
(if (bound-and-true-p superword-mode)
(forward-evil-symbol count)
(evil-forward-nearest
count
#'(lambda (&optional cnt)
(let ((word-separating-categories evil-cjk-word-separating-categories)
(word-combining-categories evil-cjk-word-combining-categories)
(pnt (point)))
(forward-word cnt)
(if (= pnt (point)) cnt 0)))
#'(lambda (&optional cnt)
(evil-forward-chars "^[:word:]\n\r\t\f " cnt))
#'forward-evil-empty-line)))

(defun forward-evil-WORD (&optional count)
"Move forward COUNT \"WORDS\".
Expand Down
79 changes: 79 additions & 0 deletions evil-tests.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4063,6 +4063,85 @@ Below some empty line"))
(should-error (execute-kbd-macro "ge"))
(should-error (execute-kbd-macro "10ge")))))

(ert-deftest evil-test-superword ()
"Test `evil-forward-word-begin' when `superword-mode' is enabled."
:tags '(evil motion)
(ert-info ("Simple elisp")
(evil-test-buffer
"(this-is-a-symbol another-symbol another-s a-symbol x y)"
(superword-mode)
("w")
"([t]his-is-a-symbol another-symbol another-s a-symbol x y)"
("w")
"(this-is-a-symbol [a]nother-symbol another-s a-symbol x y)"
("2w")
"(this-is-a-symbol another-symbol another-s [a]-symbol x y)"
("b")
"(this-is-a-symbol another-symbol [a]nother-s a-symbol x y)"
("e")
"(this-is-a-symbol another-symbol another-[s] a-symbol x y)"
("2e")
"(this-is-a-symbol another-symbol another-s a-symbol [x] y)"
("2ge")
"(this-is-a-symbol another-symbol another-[s] a-symbol x y)"))
(ert-info ("Simple python")
(evil-test-buffer
"[d]ef asdf_jkl_asdf():\n asdf adf_f_f_a\n q=asdf(34.12)\n z = a_s_d_f_ + __asdf__\n\nx = 4"
(python-mode)
(superword-mode)
("w")
"def [a]sdf_jkl_asdf():\n asdf adf_f_f_a\n q=asdf(34.12)\n z = a_s_d_f_ + __asdf__\n\nx = 4"
("w")
"def asdf_jkl_asdf[(]):\n asdf adf_f_f_a\n q=asdf(34.12)\n z = a_s_d_f_ + __asdf__\n\nx = 4"
("w")
"def asdf_jkl_asdf():\n [a]sdf adf_f_f_a\n q=asdf(34.12)\n z = a_s_d_f_ + __asdf__\n\nx = 4"
("w")
"def asdf_jkl_asdf():\n asdf [a]df_f_f_a\n q=asdf(34.12)\n z = a_s_d_f_ + __asdf__\n\nx = 4"
("w")
"def asdf_jkl_asdf():\n asdf adf_f_f_a\n [q]=asdf(34.12)\n z = a_s_d_f_ + __asdf__\n\nx = 4"
("w")
"def asdf_jkl_asdf():\n asdf adf_f_f_a\n q[=]asdf(34.12)\n z = a_s_d_f_ + __asdf__\n\nx = 4"
("w")
"def asdf_jkl_asdf():\n asdf adf_f_f_a\n q=[a]sdf(34.12)\n z = a_s_d_f_ + __asdf__\n\nx = 4"
("w")
"def asdf_jkl_asdf():\n asdf adf_f_f_a\n q=asdf[(]34.12)\n z = a_s_d_f_ + __asdf__\n\nx = 4"
("w")
"def asdf_jkl_asdf():\n asdf adf_f_f_a\n q=asdf([3]4.12)\n z = a_s_d_f_ + __asdf__\n\nx = 4"
("w")
"def asdf_jkl_asdf():\n asdf adf_f_f_a\n q=asdf(34[.]12)\n z = a_s_d_f_ + __asdf__\n\nx = 4"
("w")
"def asdf_jkl_asdf():\n asdf adf_f_f_a\n q=asdf(34.[1]2)\n z = a_s_d_f_ + __asdf__\n\nx = 4"
("w")
"def asdf_jkl_asdf():\n asdf adf_f_f_a\n q=asdf(34.12[)]\n z = a_s_d_f_ + __asdf__\n\nx = 4"
("w")
"def asdf_jkl_asdf():\n asdf adf_f_f_a\n q=asdf(34.12)\n [z] = a_s_d_f_ + __asdf__\n\nx = 4"
("w")
"def asdf_jkl_asdf():\n asdf adf_f_f_a\n q=asdf(34.12)\n z [=] a_s_d_f_ + __asdf__\n\nx = 4"
("w")
"def asdf_jkl_asdf():\n asdf adf_f_f_a\n q=asdf(34.12)\n z = [a]_s_d_f_ + __asdf__\n\nx = 4"
("w")
"def asdf_jkl_asdf():\n asdf adf_f_f_a\n q=asdf(34.12)\n z = a_s_d_f_ [+] __asdf__\n\nx = 4"
("w")
"def asdf_jkl_asdf():\n asdf adf_f_f_a\n q=asdf(34.12)\n z = a_s_d_f_ + [_]_asdf__\n\nx = 4"
("w")
"def asdf_jkl_asdf():\n asdf adf_f_f_a\n q=asdf(34.12)\n z = a_s_d_f_ + __asdf__\n[]\nx = 4"
("w")
"def asdf_jkl_asdf():\n asdf adf_f_f_a\n q=asdf(34.12)\n z = a_s_d_f_ + __asdf__\n\n[x] = 4"))
(ert-info ("Elisp diw (emacs-evil/evil#1492)")
(evil-test-buffer
"word1 wo[r]d2-word3"
(lisp-interaction-mode)
(superword-mode)
("diw")
"word1[ ]"))
(ert-info ("Elisp cw (emacs-evil/evil#728)")
(evil-test-buffer
"-[w]ord)"
(lisp-interaction-mode)
(superword-mode)
("cw" [escape])
"[-])")))

(ert-deftest evil-test-forward-word-begin-cjk ()
"Test `evil-forward-word-begin' on CJK words"
:tags '(evil motion cjk)
Expand Down