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: [PATCH] em-cmpl: fix completion of command paths Date: Wed, 25 Jan 2023 12:03:38 -0500 Message-ID: References: <20230107121943.44658-1-nicolas@n16f.net> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="20833"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: emacs-devel@gnu.org To: Nicolas Martyanoff Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Jan 25 18:04:28 2023 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 1pKjCG-0005DV-BA for ged-emacs-devel@m.gmane-mx.org; Wed, 25 Jan 2023 18:04:28 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pKjBj-0006ay-On; Wed, 25 Jan 2023 12:03:55 -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 1pKjBb-0006Qb-0n for emacs-devel@gnu.org; Wed, 25 Jan 2023 12:03:48 -0500 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pKjBX-0001Ip-Mp for emacs-devel@gnu.org; Wed, 25 Jan 2023 12:03:46 -0500 Original-Received: from pmg3.iro.umontreal.ca (localhost [127.0.0.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id C7A96443A8E; Wed, 25 Jan 2023 12:03:41 -0500 (EST) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id EF92B443A85; Wed, 25 Jan 2023 12:03:39 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1674666220; bh=+IP0uPAd4/yHOtE3fLJ+uGzbkvtBsxBWQ7GSMxX7FNI=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=b5WfInbJp+Au08xNpB+M3C6CFIYpcryD1UVhMe9VHxEnCMinloU4O8Pc4jYeaY+mo lJLpe4RmgRwZWML8WUQSbEJzU9hJsohLgz2qUSKjoJ768GYqbce9GxsEbDZXGKSvAA 1bq/zK6PDoN66UFvod4iQkxaX2mWJJ6vvh8ejTgH61CutZCXeQTBFktDVa0AMdVXoy xjk3g2CCp0RzcaCRYII9xbvZG6pvRhQW4uujtI8yQxQRJuzoN/5rAxXpqHnFXuqRog 5lHlcCw8u0hnuZgkQskAbwKuEiEyYqhUeOZ3jsz/zADVJz33i730+MG6hySDtBaVMU srGxvPai3BhTw== Original-Received: from pastel (unknown [45.72.200.228]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id D1F72120EB9; Wed, 25 Jan 2023 12:03:39 -0500 (EST) In-Reply-To: <20230107121943.44658-1-nicolas@n16f.net> (Nicolas Martyanoff's message of "Sat, 7 Jan 2023 13:19:44 +0100") 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.29 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-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:302652 Archived-At: Hi Nicolas, Terribly sorry for the long delay to answer. > The use of `completion-table-dynamic' was introduced in 899055e to fix > bug#48995. However the following issue remains: when completing a command > path, absolute ("/usr/bin/") or relative ("./subdir/"), a space is > automatically added at the end. > Bypassing `completion-table-dynamic' for filenames containing a directory > part fixes the final space bug and does not reintroduce bug#48995. This looks very good. IIUC this fixes a regression w.r.t Emacs-28, so it would be nice to install it into `emacs-29`. Eli, what do you think? Stefan > As a result, `eshell--pcomplete-executables' is not needed anymore, it was > only necessary to work around the way `completion-table-dynamic' works. > > Thanks to Stefan Monnier for his input on the problem. > --- > lisp/eshell/em-cmpl.el | 127 ++++++++++++++++++----------------------- > 1 file changed, 56 insertions(+), 71 deletions(-) > > diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el > index ca51cee2558..c5427fa1a6d 100644 > --- a/lisp/eshell/em-cmpl.el > +++ b/lisp/eshell/em-cmpl.el > @@ -378,31 +378,6 @@ > args) > posns))) > > -(defun eshell--pcomplete-executables () > - "Complete amongst a list of directories and executables. > - > -Wrapper for `pcomplete-executables' or `pcomplete-dirs-or-entries', > -depending on the value of `eshell-force-execution'. > - > -Adds path prefix to candidates independent of `action' value." > - ;; `pcomplete-entries' returns filenames without path on `action' to > - ;; use current string directory as done in `completion-file-name-table' > - ;; when `action' is nil to construct executable candidates. > - (let ((table (if eshell-force-execution > - (pcomplete-dirs-or-entries nil #'file-readable-p) > - (pcomplete-executables)))) > - (lambda (string pred action) > - (let ((cands (funcall table string pred action))) > - (if (eq action t) > - (let ((specdir (file-name-directory string))) > - (mapcar > - (lambda (cand) > - (if (stringp cand) > - (file-name-concat specdir cand) > - cand)) > - cands)) > - cands))))) > - > (defun eshell--complete-commands-list () > "Generate list of applicable, visible commands." > ;; Building the commands list can take quite a while, especially over Tramp > @@ -413,11 +413,21 @@ > ;; we complete. Adjust `pcomplete-stub' accordingly! > (if (and (> (length pcomplete-stub) 0) > (eq (aref pcomplete-stub 0) eshell-explicit-command-char)) > - (setq pcomplete-stub (substring pcomplete-stub 1))))) > + (setq pcomplete-stub (substring pcomplete-stub 1)))) > + (filename (pcomplete-arg))) > + ;; Do not use `completion-table-dynamic' when completing a command path > + ;; (absolute or relative): doing so assumes that the subpath in the input > + ;; string is always a command, and appends a space character, which is > + ;; incorrect (i.e. "/usr/bi" should yield "/usr/bin/" after completion, > + ;; not "/usr/bin/ "). > + ;; > + ;; If you work on this function, be careful not to reintroduce bug#48995. > + (if (file-name-directory filename) > + (if eshell-force-execution > + (pcomplete-dirs-or-entries nil #'file-readable-p) > + (pcomplete-executables)) > (completion-table-dynamic > (lambda (filename) > - (if (file-name-directory filename) > - (eshell--pcomplete-executables) > (let* ((paths (eshell-get-path)) > (cwd (file-name-as-directory > (expand-file-name default-directory)))