github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-30 16:35:16 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix to avoid shortening the command line on tab completions.

Browse Source 
This prevents cases like `cd /usr/e` from tab-completing to
`cd /usr/` (which is the shared prefix of the tab completions).

Things are still sort of confusing with fuzzy matching, e.g.
with files like this:

    foo1bar
    foo2bar

Then ba<tab> will replace the token with foo. That's surprising,
but not new to this fix.

Fixes #1727
This commit is contained in:
ridiculousfish 2014-11-06 10:07:26 -08:00
parent 9d7fbd2cc0
commit 701a37fd00
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
reader.cpp
View File

@ -1883,8 +1883,12 @@ static bool handle_completions(const std::vector<completion_t> &comp, bool conti
break; break;
} }
} }
/* Determine if we use the prefix. We use it if it's non-empty and it will actually make the command line longer. It may make the command line longer by virtue of not using REPLACE_TOKEN (so it always appends to the command line), or by virtue of replacing the token but being longer than it. */
bool use_prefix = common_prefix.size() > (will_replace_token ? tok.size() : 0);
assert(! use_prefix || ! common_prefix.empty());
if (! common_prefix.empty()) if (use_prefix)
{ {
/* We got something. If more than one completion contributed, then it means we have a prefix; don't insert a space after it */ /* We got something. If more than one completion contributed, then it means we have a prefix; don't insert a space after it */
if (prefix_is_partial_completion) if (prefix_is_partial_completion)
@ -1893,7 +1897,7 @@ static bool handle_completions(const std::vector<completion_t> &comp, bool conti
success = true; success = true;
} }
if (continue_after_prefix_insertion || common_prefix.empty()) if (continue_after_prefix_insertion || ! use_prefix)
{ {
/* We didn't get a common prefix, or we want to print the list anyways. */ /* We didn't get a common prefix, or we want to print the list anyways. */
size_t len, prefix_start = 0; size_t len, prefix_start = 0;