From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#68214: Completion sorting customization by category Date: Fri, 05 Jan 2024 09:59:03 +0200 Organization: LINKOV.NET Message-ID: <86sf3cjj6o.fsf@mail.linkov.net> References: <86a5pnzst1.fsf@mail.linkov.net> <868r5630ft.fsf@mail.linkov.net> <8ebc33fb-d01f-4426-a716-69a11f6dfad1@daniel-mendler.de> <86le95m2ue.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="28484"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) Cc: 68214@debbugs.gnu.org To: Daniel Mendler Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jan 05 09:12:46 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rLfJt-0007H7-LE for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 05 Jan 2024 09:12:45 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLfJJ-0003EO-TS; Fri, 05 Jan 2024 03:12:09 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rLfJ7-0002sY-Nj for bug-gnu-emacs@gnu.org; Fri, 05 Jan 2024 03:12:01 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rLfJ7-0000Hu-FY for bug-gnu-emacs@gnu.org; Fri, 05 Jan 2024 03:11:57 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rLfJB-00034K-K6 for bug-gnu-emacs@gnu.org; Fri, 05 Jan 2024 03:12:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 05 Jan 2024 08:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68214 X-GNU-PR-Package: emacs Original-Received: via spool by 68214-submit@debbugs.gnu.org id=B68214.170444229211749 (code B ref 68214); Fri, 05 Jan 2024 08:12:01 +0000 Original-Received: (at 68214) by debbugs.gnu.org; 5 Jan 2024 08:11:32 +0000 Original-Received: from localhost ([127.0.0.1]:56302 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLfIh-00033R-Hw for submit@debbugs.gnu.org; Fri, 05 Jan 2024 03:11:32 -0500 Original-Received: from relay5-d.mail.gandi.net ([2001:4b98:dc4:8::225]:56837) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLfIe-00033B-Rz for 68214@debbugs.gnu.org; Fri, 05 Jan 2024 03:11:30 -0500 Original-Received: by mail.gandi.net (Postfix) with ESMTPSA id 3C1271C0002; Fri, 5 Jan 2024 08:11:16 +0000 (UTC) In-Reply-To: <86le95m2ue.fsf@mail.linkov.net> (Juri Linkov's message of "Thu, 04 Jan 2024 19:21:29 +0200") X-GND-Sasl: juri@linkov.net X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:277368 Archived-At: --=-=-= Content-Type: text/plain >>>> This function could be used to look up the other meta data >>>> functions too, `display-sort-function`, `annotation-function`, >>>> `affixation-function`, `group-function`, etc. >>> >>> All these meta data functions could be added later to >>> completion-category-overrides after pushing the current patch. >> >> Makes sense, the `display-sort-function' is a good start. I suggest to >> at least add the `cycle-sort-function' too. The cycle threshold can be >> customized too. > > Looks like the cycle threshold is already supported, > so I'll add the other meta data. This looks like a complete patch, but it's not completely tested yet: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=completion-metadata-override-get.patch diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index b7aebae63a8..fbd9a03d921 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -1180,6 +1185,10 @@ completion-category-overrides (cons :tag "Completion Cycling" (const :tag "Select one value from the menu." cycle) ,completion--cycling-threshold-type) + (cons :tag "Cycle Sorting" + (const :tag "Select one value from the menu." + cycle-sort-function) + (choice (function :tag "Custom function"))) (cons :tag "Completion Sorting" (const :tag "Select one value from the menu." display-sort-function) @@ -1189,7 +1198,19 @@ completion-category-overrides minibuffer-sort-alphabetically) (const :tag "Historical sorting" minibuffer-sort-by-history) - (function :tag "Custom function")))))) + (function :tag "Custom function"))) + (cons :tag "Completion Annotation" + (const :tag "Select one value from the menu." + annotation-function) + (choice (function :tag "Custom function"))) + (cons :tag "Completion Affixation" + (const :tag "Select one value from the menu." + affixation-function) + (choice (function :tag "Custom function"))) + (cons :tag "Completion Groups" + (const :tag "Select one value from the menu." + group-function) + (choice (function :tag "Custom function")))))) (defun completion--category-override (category tag) (or (assq tag (cdr (assq category completion-category-overrides))) @@ -1761,8 +1782,8 @@ completion-all-sorted-completions base-size md minibuffer-completion-table minibuffer-completion-predicate)) - (sort-fun (completion-metadata-get all-md 'cycle-sort-function)) - (group-fun (completion-metadata-get all-md 'group-function))) + (sort-fun (completion-metadata-override-get all-md 'cycle-sort-function)) + (group-fun (completion-metadata-override-get all-md 'group-function))) (when last (setcdr last nil) @@ -2540,14 +2561,14 @@ minibuffer-completion-help base-size md minibuffer-completion-table minibuffer-completion-predicate)) - (ann-fun (or (completion-metadata-get all-md 'annotation-function) + (ann-fun (or (completion-metadata-override-get all-md 'annotation-function) (plist-get completion-extra-properties :annotation-function))) - (aff-fun (or (completion-metadata-get all-md 'affixation-function) + (aff-fun (or (completion-metadata-override-get all-md 'affixation-function) (plist-get completion-extra-properties :affixation-function))) (sort-fun (completion-metadata-override-get all-md 'display-sort-function)) - (group-fun (completion-metadata-get all-md 'group-function)) + (group-fun (completion-metadata-override-get all-md 'group-function)) (mainbuf (current-buffer)) ;; If the *Completions* buffer is shown in a new ;; window, mark it as softly-dedicated, so bury-buffer in @@ -4466,9 +4487,9 @@ completion--flex-adjust-metadata "If `flex' is actually doing filtering, adjust sorting." (let ((flex-is-filtering-p completion-pcm--regexp) (existing-dsf - (completion-metadata-get metadata 'display-sort-function)) + (completion-metadata-override-get metadata 'display-sort-function)) (existing-csf - (completion-metadata-get metadata 'cycle-sort-function))) + (completion-metadata-override-get metadata 'cycle-sort-function))) (cl-flet ((compose-flex-sort-fn (existing-sort-fn) (lambda (completions) diff --git a/lisp/icomplete.el b/lisp/icomplete.el index d49714f3204..00f69e4ad72 100644 --- a/lisp/icomplete.el +++ b/lisp/icomplete.el @@ -789,12 +789,12 @@ icomplete--augment `group-function'. Consecutive `equal' sections are avoided. COMP is the element in PROSPECTS or a transformation also given by `group-function''s second \"transformation\" protocol." - (let* ((aff-fun (or (completion-metadata-get md 'affixation-function) + (let* ((aff-fun (or (completion-metadata-override-get md 'affixation-function) (plist-get completion-extra-properties :affixation-function))) - (ann-fun (or (completion-metadata-get md 'annotation-function) + (ann-fun (or (completion-metadata-override-get md 'annotation-function) (plist-get completion-extra-properties :annotation-function))) (grp-fun (and completions-group - (completion-metadata-get md 'group-function))) + (completion-metadata-override-get md 'group-function))) (annotated (cond (aff-fun (funcall aff-fun prospects)) diff --git a/lisp/completion-preview.el b/lisp/completion-preview.el index baadb4714b1..d1d6c5cac50 100644 --- a/lisp/completion-preview.el +++ b/lisp/completion-preview.el @@ -231,8 +231,8 @@ completion-preview--try-table (exit-fn (plist-get props :exit-function)) (string (buffer-substring beg end)) (md (completion-metadata string table pred)) - (sort-fn (or (completion-metadata-get md 'cycle-sort-function) - (completion-metadata-get md 'display-sort-function) + (sort-fn (or (completion-metadata-override-get md 'cycle-sort-function) + (completion-metadata-override-get md 'display-sort-function) completion-preview-sort-function)) (all (let ((completion-lazy-hilit t)) (completion-all-completions string table pred --=-=-=--