Eli Zaretskii <e...@gnu.org> writes:
>> Cc: monn...@iro.umontreal.ca
>> From: Spencer Baugh <sba...@janestreet.com>
>> Date: Mon, 26 Aug 2024 10:17:05 -0400
>>
>> In 63a48252306a631dc07d62d19311433c7877bd27 I fixed a bug with
>
> Git tells me "bad object 63a48252306a631dc07d62d19311433c7877bd27", so
> I couldn't figure out which commit are you referring to.
Oops, here's the patch again with a corrected commit message:
>From 1c9df731bacadd4ef762675af9903ccb0897a3ae Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sba...@janestreet.com>
Date: Mon, 26 Aug 2024 10:12:51 -0400
Subject: [PATCH] Correctly include fixed strings before a prefix wildcard in
PCM
In 03ac16ece40ba3e3ba805d6a61cc457d84bf3792 I fixed a bug with the PCM
implementation of substring completion, relating to the handling of
PCM wildcards.
However, this fix was incomplete. This change completes the fix by
also including a fixed string if it appears before a `prefix'
wildcard, even if try-completion doesn't discover that fixed string
grows to a unique completion.
I discovered this bug while working on enhancements to PCM completion
related to completion-pcm-leading-wildcard.
* lisp/minibuffer.el (completion-pcm--merge-completions): Include
fixed strings before 'prefix wildcard. (bug#72819)
* test/lisp/minibuffer-tests.el (completion-substring-test-5): Add a
test for this behavior.
---
lisp/minibuffer.el | 15 +++++++++------
test/lisp/minibuffer-tests.el | 17 ++++++++++++-----
2 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 6fae62b3904..1efe71f10e3 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -4418,18 +4418,21 @@ completion-pcm--merge-completions
(unique (or (and (eq prefix t) (setq prefix fixed))
(and (stringp prefix)
(eq t (try-completion prefix comps))))))
- ;; if the common prefix is unique, it also is a common
- ;; suffix, so we should add it for `prefix' elements
- (unless (or (and (eq elem 'prefix) (not unique))
- (equal prefix ""))
- (push prefix res))
;; If there's only one completion, `elem' is not useful
;; any more: it can only match the empty string.
;; FIXME: in some cases, it may be necessary to turn an
;; `any' into a `star' because the surrounding context has
;; changed such that string->pattern wouldn't add an `any'
;; here any more.
- (unless unique
+ (if unique
+ ;; if the common prefix is unique, it also is a common
+ ;; suffix, so we should add it for `prefix' elements
+ (push prefix res)
+ ;; `prefix' only wants to include the fixed part before the
+ ;; wildcard, not the result of growing that fixed part.
+ (when (eq elem 'prefix)
+ (setq prefix fixed))
+ (push prefix res)
(push elem res)
;; Extract common suffix additionally to common prefix.
;; Don't do it for `any' since it could lead to a merged
diff --git a/test/lisp/minibuffer-tests.el b/test/lisp/minibuffer-tests.el
index df36bce4634..38c2b8c4552 100644
--- a/test/lisp/minibuffer-tests.el
+++ b/test/lisp/minibuffer-tests.el
@@ -306,13 +306,20 @@ completion-substring-test-4
6)))
(ert-deftest completion-substring-test-5 ()
- ;; merge-completions needs to work correctly when
+ ;; Normally a `prefix' wildcard ignores the common prefix to its
+ ;; left, since it only grows the common suffix; but if that common
+ ;; prefix is also a common suffix, it should be included.
(should (equal
- (completion-pcm--merge-completions '("ab" "sab") '(prefix "b"))
- '("b" "a" prefix)))
+ (completion-pcm--merge-try '(prefix "b") '("ab" "sab") "" "")
+ '("ab" . 2)))
(should (equal
- (completion-pcm--merge-completions '("ab" "ab") '(prefix "b"))
- '("b" "a")))
+ (completion-pcm--merge-try '(prefix "b") '("ab" "ab") "" "")
+ '("ab" . 2)))
+ ;; When there's a fixed string before `prefix', that fixed string
+ ;; should always be included.
+ (should (equal
+ (completion-pcm--merge-try '("a" prefix "b") '("axb" "ayb") "" "")
+ '("ab" . 2)))
;; substring completion should successfully complete the entire string
(should (equal
(completion-substring-try-completion "b" '("ab" "ab") nil 0)
--
2.39.3
