From: Juri Linkov <juri@linkov.net>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: spacibba@aol.com, Jean Louis <bugs@gnu.support>,
andreyk.mad@gmail.com, emacs-devel@gnu.org, rudalics@gmx.at,
Gregory Heytings <ghe@sdf.org>, Eli Zaretskii <eliz@gnu.org>,
Drew Adams <drew.adams@oracle.com>
Subject: Re: on helm substantial differences
Date: Tue, 17 Nov 2020 21:18:57 +0200 [thread overview]
Message-ID: <87mtzfzt9a.fsf@mail.linkov.net> (raw)
In-Reply-To: <jwvtutpjjle.fsf-monnier+emacs@gnu.org> (Stefan Monnier's message of "Mon, 16 Nov 2020 12:36:11 -0500")
[-- Attachment #1: Type: text/plain, Size: 693 bytes --]
> Before knowing what's the best approach, I think we should clearly
> decide what would be the "ideal" new API. E.g. should it return "any
> string" and then it'd be up to the infrastructure code to store
> side-info about what is the corresponding candidate's actual text?
After trying different variants, it turned out that the most convenient
is to use annotation-function that can contain a placeholder for the
completion candidate. Currently "%s" is used as a placeholder,
for example, "prefix %s suffix" but it can be any string.
Or maybe better to allow returning a list of two separate strings
for prefix and suffix from annotation-function?
Here is an example used for testing:
[-- Attachment #2: display-function.png --]
[-- Type: image/png, Size: 98453 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: annotation-function.patch --]
[-- Type: text/x-diff, Size: 4234 bytes --]
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 9d57a817b2..b98033753d 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -83,7 +80,6 @@
;; - add support for ** to pcm.
;; - Add vc-file-name-completion-table to read-file-name-internal.
-;; - A feature like completing-help.el.
;;; Code:
@@ -1754,13 +1753,22 @@ 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* ((split (split-string (cadr str) "%s"))
+ (prefix (when (cadr split) (car split)))
+ (suffix (or (cadr split) (car split))))
+ (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
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 170f497541..00603272bf 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -127,16 +127,30 @@ help-enable-completion-autoload
:version "26.3")
(defun help--symbol-completion-table (string pred action)
- (when help-enable-completion-autoload
- (let ((prefixes (radix-tree-prefixes (help-definition-prefixes) string)))
- (help--load-prefixes prefixes)))
- (let ((prefix-completions
- (and help-enable-completion-autoload
- (mapcar #'intern (all-completions string definition-prefixes)))))
- (complete-with-action action obarray string
- (if pred (lambda (sym)
- (or (funcall pred sym)
- (memq sym prefix-completions)))))))
+ (if (eq action 'metadata)
+ '(metadata
+ (annotation-function
+ . (lambda (c)
+ (let* ((s (intern c))
+ (doc (condition-case nil (documentation s) (error nil)))
+ (doc (and doc (substring doc 0 (string-match "\n" doc)))))
+ (format "%s %%s%s"
+ (propertize (cond ((commandp s) "c")
+ ((fboundp s) "f")
+ ((boundp s) "v")
+ " ")
+ 'face 'shadow)
+ (if doc (propertize (format " -- %s" doc) 'face 'shadow) ""))))))
+ (when help-enable-completion-autoload
+ (let ((prefixes (radix-tree-prefixes (help-definition-prefixes) string)))
+ (help--load-prefixes prefixes)))
+ (let ((prefix-completions
+ (and help-enable-completion-autoload
+ (mapcar #'intern (all-completions string definition-prefixes)))))
+ (complete-with-action action obarray string
+ (if pred (lambda (sym)
+ (or (funcall pred sym)
+ (memq sym prefix-completions))))))))
(defvar describe-function-orig-buffer nil
"Buffer that was current when `describe-function' was invoked.
next prev parent reply other threads:[~2020-11-17 19:18 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-12 17:42 on helm substantial differences Drew Adams
2020-11-13 21:16 ` Jean Louis
2020-11-15 11:49 ` Jean Louis
2020-11-15 20:07 ` Juri Linkov
2020-11-15 22:01 ` Stefan Monnier
2020-11-15 22:41 ` Drew Adams
2020-11-16 8:58 ` Juri Linkov
2020-11-16 16:03 ` Drew Adams
2020-11-16 17:36 ` Stefan Monnier
2020-11-16 20:38 ` Juri Linkov
2020-11-16 21:54 ` Stefan Monnier
2020-11-17 19:18 ` Juri Linkov [this message]
2020-11-17 20:32 ` Juri Linkov
2020-11-18 9:10 ` Juri Linkov
2020-11-18 11:38 ` Basil L. Contovounesios
2020-11-18 19:13 ` Juri Linkov
2020-11-18 20:33 ` Juri Linkov
2020-11-20 9:24 ` Juri Linkov
2020-11-20 11:57 ` Eli Zaretskii
2020-11-20 12:15 ` Eli Zaretskii
2020-11-20 14:39 ` Stefan Monnier
2020-11-21 20:18 ` Juri Linkov
2020-11-22 3:33 ` Eli Zaretskii
2020-11-22 8:36 ` Juri Linkov
2020-11-22 15:19 ` Eli Zaretskii
2020-11-22 20:11 ` Juri Linkov
2020-11-23 3:24 ` Eli Zaretskii
2020-11-25 9:10 ` Juri Linkov
2020-11-25 15:51 ` Eli Zaretskii
2020-11-25 19:16 ` Juri Linkov
2020-11-25 19:59 ` Eli Zaretskii
2020-11-25 20:35 ` Juri Linkov
2020-11-26 13:45 ` Eli Zaretskii
2020-11-27 8:45 ` Juri Linkov
2020-11-27 8:58 ` Eli Zaretskii
2020-11-27 9:17 ` Juri Linkov
2020-11-17 21:14 ` Jean Louis
2020-11-18 9:03 ` Juri Linkov
2020-11-18 19:21 ` Juri Linkov
2020-11-18 22:04 ` select yank via completion Stefan Monnier
2020-11-18 23:02 ` Drew Adams
2020-11-19 7:54 ` Juri Linkov
2020-11-19 17:00 ` Drew Adams
2020-11-20 8:53 ` Juri Linkov
2020-11-20 11:53 ` Eli Zaretskii
2020-11-21 19:38 ` Juri Linkov
2020-11-21 19:57 ` Eli Zaretskii
2020-11-21 20:43 ` Juri Linkov
2020-11-20 14:23 ` Stefan Monnier
2020-11-21 19:42 ` Juri Linkov
2020-11-21 21:08 ` Stefan Monnier
2020-11-21 22:21 ` Drew Adams
2020-11-21 22:48 ` Jean Louis
2020-11-21 23:00 ` Jean Louis
2020-11-25 19:25 ` Juri Linkov
2020-11-25 19:40 ` Drew Adams
2020-11-21 21:54 ` Drew Adams
2020-11-21 21:46 ` Drew Adams
2020-11-24 22:59 ` Basil L. Contovounesios
2020-11-25 7:36 ` Juri Linkov
2020-11-25 8:14 ` Andrii Kolomoiets
2020-11-25 20:24 ` Juri Linkov
2020-11-26 8:46 ` Basil L. Contovounesios
2020-11-26 9:26 ` Juri Linkov
2020-11-26 9:57 ` Eli Zaretskii
2020-11-26 21:17 ` Basil L. Contovounesios
2020-11-27 7:13 ` Eli Zaretskii
2020-11-27 9:01 ` Juri Linkov
2020-11-18 22:36 ` on helm substantial differences Drew Adams
2020-11-16 16:13 ` Eli Zaretskii
2020-11-16 20:41 ` Juri Linkov
2020-11-16 21:18 ` Drew Adams
2020-11-16 22:13 ` Juri Linkov
2020-11-17 0:04 ` Drew Adams
2020-11-17 8:38 ` Juri Linkov
2020-11-17 16:56 ` Drew Adams
2020-11-17 12:06 ` Protesilaos Stavrou
2020-11-17 17:29 ` Drew Adams
2020-11-17 19:23 ` Juri Linkov
2020-11-17 3:24 ` Eli Zaretskii
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=87mtzfzt9a.fsf@mail.linkov.net \
--to=juri@linkov.net \
--cc=andreyk.mad@gmail.com \
--cc=bugs@gnu.support \
--cc=drew.adams@oracle.com \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=ghe@sdf.org \
--cc=monnier@iro.umontreal.ca \
--cc=rudalics@gmx.at \
--cc=spacibba@aol.com \
/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).