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.devel Subject: Re: on helm substantial differences Date: Wed, 18 Nov 2020 11:10:20 +0200 Organization: LINKOV.NET Message-ID: <87k0uj58ub.fsf@mail.linkov.net> References: <87wnymda5g.fsf@mail.linkov.net> <87ima5he8j.fsf@mail.linkov.net> <87mtzfzt9a.fsf@mail.linkov.net> <87lfezd8r0.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="26545"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (x86_64-pc-linux-gnu) Cc: spacibba@aol.com, Jean Louis , andreyk.mad@gmail.com, emacs-devel@gnu.org, rudalics@gmx.at, Gregory Heytings , Eli Zaretskii , Drew Adams To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Nov 18 10:14:56 2020 Return-path: Envelope-to: ged-emacs-devel@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 1kfJYF-0006lx-Km for ged-emacs-devel@m.gmane-mx.org; Wed, 18 Nov 2020 10:14:55 +0100 Original-Received: from localhost ([::1]:36930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJYE-00021W-Mh for ged-emacs-devel@m.gmane-mx.org; Wed, 18 Nov 2020 04:14:54 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:33194) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfJXP-0000kx-VF for emacs-devel@gnu.org; Wed, 18 Nov 2020 04:14:03 -0500 Original-Received: from relay7-d.mail.gandi.net ([217.70.183.200]:51887) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfJXN-0002fd-G3; Wed, 18 Nov 2020 04:14:03 -0500 X-Originating-IP: 91.129.97.46 Original-Received: from mail.gandi.net (m91-129-97-46.cust.tele2.ee [91.129.97.46]) (Authenticated sender: juri@linkov.net) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 7E71820005; Wed, 18 Nov 2020 09:13:48 +0000 (UTC) In-Reply-To: <87lfezd8r0.fsf@mail.linkov.net> (Juri Linkov's message of "Tue, 17 Nov 2020 22:32:51 +0200") Received-SPF: pass client-ip=217.70.183.200; envelope-from=juri@linkov.net; helo=relay7-d.mail.gandi.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/18 03:31:05 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:259335 Archived-At: --=-=-= Content-Type: text/plain > Actually, I discovered that unfortunately annotation-function > is unsuitable for formatting data in a columnar format. > It needs to receive a complete list of completions to be able > to adjust their widths for more optimal overall columnar layout. > > So a new function is needed that is like annotation-function > but accepts a list of all completions. There is an existing > similar function 'display-sort-function' that could be abused > to add prefix/suffix annotations, but maybe a separate function > would be preferable for cleaner API? It turned out that 'display-function' is not a suitable name either. What a new function should do is to prepend/append affixes on both sides of a completion, accept a list of all completions, and return a list of two separate strings for prefix and suffix: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=affix-function.patch diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 9d57a817b2..3f700803b6 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -121,6 +117,9 @@ completion-metadata - `annotation-function': function to add annotations in *Completions*. Takes one argument (STRING), which is a possible completion and returns a string to append to STRING. +- `affix-function': function to prepend/append a prefix/suffix to entries. + Takes one argument (COMPLETIONS) and should return a list + of completions with a completion, its prefix and suffix. - `display-sort-function': function to sort entries in *Completions*. Takes one argument (COMPLETIONS) and should return a new list of completions. Can operate destructively. @@ -1689,8 +1688,7 @@ completion--insert-strings (let* ((length (apply #'max (mapcar (lambda (s) (if (consp s) - (+ (string-width (car s)) - (string-width (cadr s))) + (cl-reduce #'+ (mapcar #'string-width s)) (string-width s))) strings))) (window (get-buffer-window (current-buffer) 0)) @@ -1715,8 +1713,7 @@ completion--insert-strings ;; FIXME: `string-width' doesn't pay attention to ;; `display' properties. (let ((length (if (consp str) - (+ (string-width (car str)) - (string-width (cadr str))) + (cl-reduce #'+ (mapcar #'string-width str)) (string-width str)))) (cond ((eq completions-format 'vertical) @@ -1754,13 +1751,21 @@ completion--insert-strings (if (not (consp str)) (put-text-property (point) (progn (insert str) (point)) 'mouse-face 'highlight) - (put-text-property (point) (progn (insert (car str)) (point)) - 'mouse-face 'highlight) - (let ((beg (point)) - (end (progn (insert (cadr str)) (point)))) - (put-text-property beg end 'mouse-face nil) - (font-lock-prepend-text-property beg end 'face - 'completions-annotations))) + (let* ((prefix (when (nth 2 str) (nth 1 str))) + (suffix (or (nth 2 str) (nth 1 str)))) + (when prefix + (let ((beg (point)) + (end (progn (insert prefix) (point)))) + (put-text-property beg end 'mouse-face nil) + (font-lock-prepend-text-property beg end 'face + 'completions-annotations))) + (put-text-property (point) (progn (insert (car str)) (point)) + 'mouse-face 'highlight) + (let ((beg (point)) + (end (progn (insert suffix) (point)))) + (put-text-property beg end 'mouse-face nil) + (font-lock-prepend-text-property beg end 'face + 'completions-annotations)))) (cond ((eq completions-format 'vertical) ;; Vertical format @@ -1880,6 +1885,9 @@ completion-extra-properties completion). The function can access the completion data via `minibuffer-completion-table' and related variables. +`:affix-function': Function to prepend/append a prefix/suffix to completions. + The function must accept one argument, a list of completions. + `:exit-function': Function to run after completion is performed. The function must accept two arguments, STRING and STATUS. @@ -1966,6 +1974,9 @@ minibuffer-completion-help (plist-get completion-extra-properties :annotation-function) completion-annotate-function)) + (xfun (or (completion-metadata-get all-md 'affix-function) + (plist-get completion-extra-properties + :affix-function))) (mainbuf (current-buffer)) ;; If the *Completions* buffer is shown in a new ;; window, mark it as softly-dedicated, so bury-buffer in @@ -2012,6 +2023,9 @@ minibuffer-completion-help (let ((ann (funcall afun s))) (if ann (list s ann) s))) completions))) + (when xfun + (setq completions + (funcall xfun completions))) (with-current-buffer standard-output (set (make-local-variable 'completion-base-position) --=-=-=--