Package: emacs;
Reported by: Dario Gjorgjevski <dario.gjorgjevski <at> gmail.com>
Date: Wed, 1 Jul 2020 10:41:01 UTC
Severity: normal
Tags: fixed, patch
Fixed in version 28.1
Done: Lars Ingebrigtsen <larsi <at> gnus.org>
Bug is archived. No further changes may be made.
View this message in rfc822 format
From: Lars Ingebrigtsen <larsi <at> gnus.org> To: João Távora <joaotavora <at> gmail.com> Cc: 42149 <at> debbugs.gnu.org, Dario Gjorgjevski <dario.gjorgjevski <at> gmail.com>, Stefan Monnier <monnier <at> iro.umontreal.ca> Subject: bug#42149: Substring and flex completion ignore implicit trailing ‘any’ Date: Thu, 13 May 2021 11:24:39 +0200
João Távora <joaotavora <at> 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
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.