mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Minor improvements to new Completion Preview commands

Browse source 
* lisp/completion-preview.el (Commentary): Mention
`completion-preview-partial-insert' and elaborate about
`completion-preview-insert-sexp'.
(completion-preview--barf-if-no-preview): New function.
(completion-preview-insert, completion-preview-complete):
Use it.
(completion-preview-partial-insert): Rename arg to FUN; only
compute (+ end (length aft)) once; bind 'deactivate-mark' to
nil while inserting/deleting to allow commands that use this
function to work as expected with 'shift-select-mode';
improve behavior when called with point not at the start of
the completion preview overlay (e.g. when point is in the
middle of a multi-word symbol and this function is called
via 'completion-preview-insert-word'); add the base part of
the completion candidate to when calling exit-function.
(completion-preview-insert-word): Improve docsting, rename
argument ARG to N.
(completion-preview-insert-sexp): Likewise, and also remove
second argument INTERACTIVE.
(completion-preview--active-p): Rename to...
(completion-preview-active-p): ...this.  Make this function
public so users can leverage it for their own commands.
Extend docstring to explain how to do that.

* test/lisp/completion-preview-tests.el
(completion-preview-insert-calls-exit-function)
(completion-preview-insert-word): Break long lines.
(completion-preview-insert-sexp)
(completion-preview-insert-nonsubword)
(completion-preview-insert-subword): Fix docstrings.
(completion-preview-insert-mid-symbol): New test.
This commit is contained in:
Eshel Yaron 2024-06-26 11:06:52 +02:00
parent b3017e7c25
commit 9cb2a20408
No known key found for this signature in database
GPG key ID: EF3EE9CA35D78618
2 changed files with 150 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

53
test/lisp/completion-preview-tests.el
View file

@ -299,7 +299,8 @@ instead."
(insert "foo")
(let ((this-command 'self-insert-command))
(completion-preview--post-command))
(completion-preview-tests--check-preview "bar-1 2" 'completion-preview-common)
(completion-preview-tests--check-preview "bar-1 2"
'completion-preview-common)
(completion-preview-insert)
(should (string= (buffer-string) "foobar-1 2"))
(should-not completion-preview--overlay)
@ -321,7 +322,8 @@ instead."
(insert "foo")
(let ((this-command 'self-insert-command))
(completion-preview--post-command))
(completion-preview-tests--check-preview "bar-1 2" 'completion-preview-common)
(completion-preview-tests--check-preview "bar-1 2"
'completion-preview-common)
(completion-preview-insert-word)
(should (string= (buffer-string) "foobar"))
(completion-preview-tests--check-preview "-1 2" 'completion-preview)
@ -329,7 +331,7 @@ instead."
(should-not exit-fn-args))))
(ert-deftest completion-preview-insert-nonsubword ()
"Test that `completion-preview-insert-word' properly inserts just a word."
"Test that `completion-preview-insert-word' with `subword-mode' off."
(let ((exit-fn-called nil) (exit-fn-args nil))
(with-temp-buffer
(setq-local completion-at-point-functions
@ -343,7 +345,8 @@ instead."
(insert "foo")
(let ((this-command 'self-insert-command))
(completion-preview--post-command))
(completion-preview-tests--check-preview "barBar" 'completion-preview-common)
(completion-preview-tests--check-preview "barBar"
'completion-preview-common)
(completion-preview-insert-word)
(should (string= (buffer-string) "foobarBar"))
(should-not completion-preview--overlay)
@ -351,7 +354,7 @@ instead."
(should (equal exit-fn-args '("foobarBar" finished))))))
(ert-deftest completion-preview-insert-subword ()
"Test that `completion-preview-insert-word' properly inserts just a word."
"Test that `completion-preview-insert-word' with `subword-mode' on."
(let ((exit-fn-called nil) (exit-fn-args nil))
(with-temp-buffer
(subword-mode)
@ -366,15 +369,48 @@ instead."
(insert "foo")
(let ((this-command 'self-insert-command))
(completion-preview--post-command))
(completion-preview-tests--check-preview "barBar" 'completion-preview-common)
(completion-preview-tests--check-preview "barBar"
'completion-preview-common)
(completion-preview-insert-word)
(should (string= (buffer-string) "foobar"))
(completion-preview-tests--check-preview "Bar" 'completion-preview)
(should-not exit-fn-called)
(should-not exit-fn-args))))
(ert-deftest completion-preview-insert-mid-symbol ()
"Test `completion-preview-insert-word' when point is in a mulit-word symbol."
(with-temp-buffer
(setq-local completion-at-point-functions
(list
(completion-preview-tests--capf
'("foo-bar-baz-spam"))))
(insert "foo-bar-baz-")
(goto-char 4)
(let ((this-command 'self-insert-command))
(completion-preview--post-command))
(completion-preview-tests--check-preview "spam"
'completion-preview-exact
'completion-preview-exact)
(completion-preview-insert-word 2)
(let ((this-command 'self-insert-command))
(completion-preview--post-command))
;; Moving two words forward should land at the end of baz, without
;; inserting anything from the completion candidate.
(completion-preview-tests--check-preview "spam"
'completion-preview-exact
'completion-preview-exact)
(should (= (point) 12))
(completion-preview-insert-word -2)
;; Moving backward shouldn't change anything, either.
(let ((this-command 'self-insert-command))
(completion-preview--post-command))
(completion-preview-tests--check-preview "spam"
'completion-preview-exact
'completion-preview-exact)
(should (= (point) 5))))
(ert-deftest completion-preview-insert-sexp ()
"Test that `completion-preview-insert-word' properly inserts just a sexp."
"Test that `completion-preview-insert-sexp' properly inserts just a sexp."
(let ((exit-fn-called nil) (exit-fn-args nil))
(with-temp-buffer
(setq-local completion-at-point-functions
@ -388,7 +424,8 @@ instead."
(insert "foo")
(let ((this-command 'self-insert-command))
(completion-preview--post-command))
(completion-preview-tests--check-preview "bar-1 2" 'completion-preview-common)
(completion-preview-tests--check-preview "bar-1 2"
'completion-preview-common)
(completion-preview-insert-sexp)
(should (string= (buffer-string) "foobar-1"))
(completion-preview-tests--check-preview " 2" 'completion-preview)