From: Lars Ingebrigtsen <larsi@gnus.org>
To: "João Távora" <joaotavora@gmail.com>
Cc: 42149@debbugs.gnu.org,
Dario Gjorgjevski <dario.gjorgjevski@gmail.com>,
Stefan Monnier <monnier@iro.umontreal.ca>
Subject: bug#42149: Substring and flex completion ignore implicit trailing ‘any’
Date: Thu, 13 May 2021 11:24:39 +0200 [thread overview]
Message-ID: <877dk3rnoo.fsf@gnus.org> (raw)
In-Reply-To: <8735zpjz64.fsf@gmail.com> ("João Távora"'s message of "Mon, 28 Dec 2020 23:20:19 +0000")
João Távora <joaotavora@gmail.com> writes:
> And I just pushed my cleaned up fix to to master as well, thus hopefully
> fixing the brunt of this bug. Dario and others, please test this. I
> haven't yet pushed the tests, since we're not entirely sure of those,
> but I think we should break them up further and push them too, once we
> come to an aggreement on what and how they should test exactly.
I've only skimmed this long thread, but my understanding of it is that
the reported bug was fixed... but there was some discussion about
including (or not) Dario's tests?
Which (if I'm grepping correctly) would be the patch below? I tried
applying it, and:
2 unexpected results:
FAILED completion-pcm-all-completions-test
FAILED completion-substring-all-completions-test
I have not looked into this further -- João, what's the state here?
diff --git a/test/lisp/minibuffer-tests.el b/test/lisp/minibuffer-tests.el
index 5da86f3614..a473fec441 100644
--- a/test/lisp/minibuffer-tests.el
+++ b/test/lisp/minibuffer-tests.el
@@ -104,5 +104,132 @@
nil (length input))
(cons output (length output)))))))
+(ert-deftest completion-pcm-all-completions-test ()
+ ;; Point is at end, this does not match anything
+ (should (equal
+ (completion-pcm-all-completions
+ "foo" '("hello" "world" "barfoobar") nil 3)
+ nil))
+ ;; Point is at beginning, this matches "barfoobar"
+ (should (equal
+ (car (completion-pcm-all-completions
+ "foo" '("hello" "world" "barfoobar") nil 0))
+ "barfoobar"))
+ ;; Full match!
+ (should (eql
+ (get-text-property
+ 0 'completion-score
+ (car (completion-pcm-all-completions
+ "R" '("R" "hello") nil 1)))
+ 1.0))
+ ;; One fourth of a match and no match due to point being at the end
+ (should (eql
+ (get-text-property
+ 0 'completion-score
+ (car (completion-pcm-all-completions
+ "RO" '("RaOb") nil 1)))
+ (/ 1.0 4.0)))
+ (should (equal
+ (completion-pcm-all-completions
+ "RO" '("RaOb") nil 2)
+ nil))
+ ;; Point is at beginning, but `completions-first-difference' is
+ ;; moved after it
+ (should (equal
+ (get-text-property
+ 1 'face
+ (car (completion-pcm-all-completions
+ "f" '("few" "many") nil 0)))
+ 'completions-first-difference))
+ ;; Wildcards and delimiters work
+ (should (equal
+ (car (completion-pcm-all-completions
+ "li-pac*" '("list-packages") nil 7))
+ "list-packages"))
+ (should (equal
+ (car (completion-pcm-all-completions
+ "li-pac*" '("do-not-list-packages") nil 7))
+ nil)))
+
+(ert-deftest completion-substring-all-completions-test ()
+ ;; One third of a match!
+ (should (equal
+ (car (completion-substring-all-completions
+ "foo" '("hello" "world" "barfoobar") nil 3))
+ "barfoobar"))
+ (should (eql
+ (get-text-property
+ 0 'completion-score
+ (car (completion-substring-all-completions
+ "foo" '("hello" "world" "barfoobar") nil 3)))
+ (/ 1.0 3.0)))
+ ;; Full match!
+ (should (eql
+ (get-text-property
+ 0 'completion-score
+ (car (completion-substring-all-completions
+ "R" '("R" "hello") nil 1)))
+ 1.0))
+ ;; Substring match
+ (should (equal
+ (car (completion-substring-all-completions
+ "custgroup" '("customize-group") nil 4))
+ "customize-group"))
+ (should (equal
+ (car (completion-substring-all-completions
+ "custgroup" '("customize-group") nil 5))
+ nil))
+ ;; `completions-first-difference' should be at the right place
+ (should (equal
+ (get-text-property
+ 4 'face
+ (car (completion-substring-all-completions
+ "jab" '("dabjobstabby" "many") nil 1)))
+ 'completions-first-difference))
+ (should (equal
+ (get-text-property
+ 6 'face
+ (car (completion-substring-all-completions
+ "jab" '("dabjabstabby" "many") nil 1)))
+ 'completions-first-difference))
+ (should (equal
+ (get-text-property
+ 6 'face
+ (car (completion-substring-all-completions
+ "jab" '("dabjabstabby" "many") nil 3)))
+ 'completions-first-difference)))
+
+(ert-deftest completion-flex-all-completions-test ()
+ ;; Fuzzy match
+ (should (equal
+ (car (completion-flex-all-completions
+ "foo" '("hello" "world" "fabrobazo") nil 3))
+ "fabrobazo"))
+ ;; Full match!
+ (should (eql
+ (get-text-property
+ 0 'completion-score
+ (car (completion-flex-all-completions
+ "R" '("R" "hello") nil 1)))
+ 1.0))
+ ;; Another fuzzy match, but more of a "substring" one
+ (should (equal
+ (car (completion-flex-all-completions
+ "custgroup" '("customize-group-other-window") nil 4))
+ "customize-group-other-window"))
+ ;; `completions-first-difference' should be at the right place
+ (should (equal
+ (get-text-property
+ 4 'face
+ (car (completion-flex-all-completions
+ "custgroup" '("customize-group-other-window") nil 4)))
+ 'completions-first-difference))
+ (should (equal
+ (get-text-property
+ 15 'face
+ (car (completion-flex-all-completions
+ "custgroup" '("customize-group-other-window") nil 9)))
+ 'completions-first-difference)))
+
--
(domestic pets only, the antidote for overdose, milk.)
bloggy blog: http://lars.ingebrigtsen.no
next prev parent reply other threads:[~2021-05-13 9:24 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-01 10:40 bug#42149: Substring and flex completion ignore implicit trailing ‘any’ Dario Gjorgjevski
2020-07-01 10:58 ` João Távora
2020-07-01 11:03 ` João Távora
2020-07-01 11:10 ` Dario Gjorgjevski
2020-09-08 9:05 ` Dario Gjorgjevski
2020-09-08 9:30 ` João Távora
2020-09-08 9:44 ` Dario Gjorgjevski
2020-09-08 10:08 ` João Távora
2020-09-08 11:12 ` Dario Gjorgjevski
2020-09-08 11:22 ` João Távora
2020-09-08 11:30 ` Dario Gjorgjevski
2020-09-08 11:32 ` João Távora
2020-09-09 10:17 ` Dario Gjorgjevski
2020-09-09 11:38 ` Dario Gjorgjevski
2020-09-09 13:13 ` Stefan Monnier
2020-09-10 11:26 ` Dario Gjorgjevski
2020-10-14 8:22 ` Dario Gjorgjevski
2020-10-14 8:39 ` João Távora
2020-10-14 9:01 ` Dario Gjorgjevski
2020-10-15 14:25 ` Dario Gjorgjevski
2020-11-20 20:39 ` Dario Gjorgjevski
2020-11-20 21:27 ` João Távora
2020-11-25 0:01 ` João Távora
2020-11-25 8:22 ` Dario Gjorgjevski
2020-11-25 12:22 ` João Távora
2020-11-25 13:27 ` Dario Gjorgjevski
2020-12-23 9:41 ` Dario Gjorgjevski
2020-12-27 20:08 ` João Távora
2020-12-27 20:23 ` João Távora
2020-12-27 21:20 ` Stefan Monnier
2020-12-28 9:30 ` João Távora
2020-12-28 16:03 ` Stefan Monnier
2020-12-28 16:58 ` João Távora
2020-12-28 16:07 ` Stefan Monnier
2020-12-28 17:04 ` João Távora
2020-12-27 21:45 ` Stefan Monnier
2020-12-28 9:38 ` João Távora
2020-12-28 10:22 ` Dario Gjorgjevski
2020-12-28 11:34 ` João Távora
2020-12-28 11:48 ` Dario Gjorgjevski
2020-12-28 12:57 ` João Távora
2020-12-28 10:17 ` Dario Gjorgjevski
2020-12-28 16:26 ` Stefan Monnier
2020-12-28 17:16 ` João Távora
2020-12-28 19:48 ` Dario Gjorgjevski
2020-12-28 20:00 ` Stefan Monnier
2020-12-28 23:20 ` João Távora
2020-12-29 13:27 ` João Távora
2021-05-13 9:24 ` Lars Ingebrigtsen [this message]
2021-05-13 14:31 ` João Távora
2021-05-13 15:41 ` Dario Gjorgjevski
2021-05-13 16:04 ` João Távora
2021-05-16 13:51 ` Lars Ingebrigtsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=877dk3rnoo.fsf@gnus.org \
--to=larsi@gnus.org \
--cc=42149@debbugs.gnu.org \
--cc=dario.gjorgjevski@gmail.com \
--cc=joaotavora@gmail.com \
--cc=monnier@iro.umontreal.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).