From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: [elpa] externals/vertico a962a8b 2/3: Implement deferred highlighting for all completion styles Date: Sun, 11 Apr 2021 12:37:34 -0400 Message-ID: References: <20210411131733.8572.37775@vcs0.savannah.gnu.org> <20210411131739.DAF2320AE6@vcs0.savannah.gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="16959"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: Daniel Mendler To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Apr 11 18:39:00 2021 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 1lVd6x-0004Is-JH for ged-emacs-devel@m.gmane-mx.org; Sun, 11 Apr 2021 18:38:59 +0200 Original-Received: from localhost ([::1]:45542 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lVd6w-0007Cn-K7 for ged-emacs-devel@m.gmane-mx.org; Sun, 11 Apr 2021 12:38:58 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:34602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lVd5j-0006Ut-7g for emacs-devel@gnu.org; Sun, 11 Apr 2021 12:37:43 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:12608) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lVd5e-0004y0-Qq for emacs-devel@gnu.org; Sun, 11 Apr 2021 12:37:42 -0400 Original-Received: from pmg2.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 0C5E980A0C; Sun, 11 Apr 2021 12:37:37 -0400 (EDT) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 3C23F8081F; Sun, 11 Apr 2021 12:37:35 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1618159055; bh=S+zhstlfL9cbFnfQkNLOOdLMZJvrcsNDFL3dCqsKQUk=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=ET+qbc5pP6m+JfYVvTrso3gd8td7ZfteabskIyEISdCkPV07yg8GvUV50EkxuR1jF YmpJgfbJzqh945ptDWCPDLaq6yH8zZpOPW1kYBBfEC+w7BaSxmwH7IWgpM5lU4o7j9 u5wZzjeXvqw0jBGGtGdqRbs2XSHY4M6sZRIRGNdPTVygkaTZd30hnhFuZyR0PJ3J9l 0auFqu/mid+RTykQkxs+rE63WQ3A9lPnkzt3vlY0uL6DXPdDWPQmjwWixrP4GCR32H c15Pt/LMUGSGezdCASP5+2vhu1My/P+wLo0q/vFLW1fSsqEgleaahgaOu9HCFPqDCO pip4q396bWbvA== Original-Received: from alfajor (104-222-126-84.cpe.teksavvy.com [104.222.126.84]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 13B291204C5; Sun, 11 Apr 2021 12:37:35 -0400 (EDT) In-Reply-To: <20210411131739.DAF2320AE6@vcs0.savannah.gnu.org> (Protesilaos Stavrou's message of "Sun, 11 Apr 2021 09:17:39 -0400 (EDT)") Received-SPF: pass client-ip=132.204.25.50; envelope-from=monnier@iro.umontreal.ca; helo=mailscanner.iro.umontreal.ca X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3, 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:267901 Archived-At: > +(declare-function orderless-highlight-matches "ext:orderless") > +(defun vertico--all-completions (&rest args) > + "Compute all completions for ARGS with deferred highlighting." > + (cl-letf* ((orig-pcm (symbol-function #'completion-pcm--hilit-commonality)) > + (orig-flex (symbol-function #'completion-flex-all-completions)) > + ((symbol-function #'completion-flex-all-completions) > + (lambda (&rest args) > + ;; Unfortunately for flex we have to undo the deferred highlighting, since flex uses > + ;; the completion-score for sorting, which is applied during highlighting. > + (cl-letf (((symbol-function #'completion-pcm--hilit-commonality) orig-pcm)) > + (apply orig-flex args)))) > + ;; Defer the following highlighting functions > + (hl #'identity) > + ((symbol-function #'completion-hilit-commonality) > + (lambda (cands prefix &optional base) > + (setq hl (lambda (x) (nconc (completion-hilit-commonality x prefix base) nil))) > + (and cands (nconc cands base)))) > + ((symbol-function #'completion-pcm--hilit-commonality) > + (lambda (pattern cands) > + (setq hl (lambda (x) (completion-pcm--hilit-commonality pattern x))) > + cands)) > + ((symbol-function #'orderless-highlight-matches) > + (lambda (pattern cands) > + (setq hl (lambda (x) (orderless-highlight-matches pattern x))) > + cands))) > + (cons (apply #'completion-all-completions args) hl))) Yuck! I think this should have a bug#NNN attached to make sure it's only used on a temporary basis (i.e. until Emacs's minibuffer.el provides the corresponding functionality). Stefan