emacs-bug-tracker
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#61221: closed (30.0.50; [PATCH] Support completion of quoted variabl


From: GNU bug Tracking System
Subject: bug#61221: closed (30.0.50; [PATCH] Support completion of quoted variable refs in Eshell)
Date: Thu, 23 Feb 2023 22:13:02 +0000

Your message dated Thu, 23 Feb 2023 14:11:54 -0800
with message-id <dfc6502e-3f91-ef8f-2891-e3cab123b342@gmail.com>
and subject line Re: bug#61221: 30.0.50; [PATCH] Support completion of quoted 
variable refs in Eshell
has caused the debbugs.gnu.org bug report #61221,
regarding 30.0.50; [PATCH] Support completion of quoted variable refs in Eshell
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
61221: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=61221
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
--- Begin Message --- Subject: 30.0.50; [PATCH] Support completion of quoted variable refs in Eshell Date: Wed, 1 Feb 2023 18:28:08 -0800
X-Debbugs-Cc: monnier@iro.umontreal.ca

Eshell lets you put quotes around variable names so that the parser can tell where the name ends, sort of like ${var} in other shells:

  ~ $ echo $'user-login-name'-suffix
  user-suffix

  ~ $ echo $"user-login-name"-suffix
  user-suffix

However, you can't tab-complete variable names when you do this. Here's a fix. I also fixed a couple small issues with completing directory names where it would sometimes complete to "whatever/ ". That extra trailing space isn't helpful, since you'd have to delete it before typing in a subdir.

Probably the most controversial part of this patch is in #0002, where I added another dynamic variable 'pcomplete-exit-function' that Pcomplete handlers can set to tell Pcomplete what to do after exiting a completion. Maybe it would be better to have handlers throw some special value for 'pcomplete-completions' that contains this info (sort of like the value that a 'completion-at-point-function' returns). I'm not sure what the best (and most-compatible) way to do this would be...

Attachment: 0001-Throw-strings-as-the-values-for-eshell-incomplete.patch
Description: Text document

Attachment: 0002-Add-support-for-completing-quoted-variables-in-Eshel.patch
Description: Text document

Attachment: 0003-Don-t-add-a-space-after-the-trailing-slash-when-comp.patch
Description: Text document


--- End Message ---
--- Begin Message --- Subject: Re: bug#61221: 30.0.50; [PATCH] Support completion of quoted variable refs in Eshell Date: Thu, 23 Feb 2023 14:11:54 -0800 On 2/23/2023 10:02 AM, Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors wrote:
The patches look good, feel free to push, AFAIC.

Thanks, merged as 9d48c9844b.

+    (mapcar (lambda (x) (car x))

Aka (mapcar #'car

Fixed.

+      (setq pcomplete-stub (substring arg (match-beginning 1))
+            delimiter (match-string 2 arg))

You could let-bind `delimiter` here instead of let-binding it earlier
and then `setq`ing it here.  Better for karma and marginally more
efficient (avoids the creation of a `cons` cell to contain the value of
the var).

Done.

+     (append (eshell-envvar-names)
+             (all-completions argname obarray 'boundp))
+     #'string-lessp)))

Since you use #' for `string-lessp`, it would make sense to use #' for
`boundp` as well :-)

Fixed.

+                   ('lambda               ; test-completion
+                     (let ((result (test-completion string names pred)))
+                       (if (eq result t) string result)))

Hmm... why not just always return `result`?

As I understand it, returning 't' means "there is just one matching completion, and the match is exact"[1], but in this case, that's not really true: after completing "~user/" there are still more matching completions (the contents of the user's home directory).

This is really just trying to match what happens when calling 'completion-file-name-table':

  (completion-file-name-table "~user/" nil nil)
    => "~user/"

  (try-completion "~user/" '("~user/") nil)
    => t

So if we get 't' from 'try-completion', we "downgrade" that to the original string.

[1] https://www.gnu.org/software/emacs/manual/html_node/elisp/Basic-Completion.html


--- End Message ---

reply via email to

[Prev in Thread] Current Thread [Next in Thread]