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

completions/git: Stop offering :/ files so much

Browse Source 
Don't do it when the relative path is simple (purely descending),
unless the token starts with ":/".

Also stop offering directories - if they need to be disambiguated, the
normal completion logic will take care of that.

Fixes #5574.

[ci skip]
This commit is contained in:
Fabian Homborg 2019-01-23 14:02:03 +01:00
parent da44ee1d08
commit c20187e858
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
share/completions/git.fish
View File

@ -121,8 +121,6 @@ function __fish_git_files
contains -- copied $argv; and set -l copied contains -- copied $argv; and set -l copied
and set -l copied_desc (_ "Copied file") and set -l copied_desc (_ "Copied file")
set -l dir_desc (_ "Directory")
# A literal "?" for use in `case`. # A literal "?" for use in `case`.
set -l q '\\?' set -l q '\\?'
if status test-feature qmark-noglob if status test-feature qmark-noglob
@ -245,27 +243,22 @@ function __fish_git_files
# First the relative filename. # First the relative filename.
printf '%s\t%s\n' "$file" $desc printf '%s\t%s\n' "$file" $desc
# Now from repo root. # Now from repo root.
set -l fromroot (builtin realpath -- $file 2>/dev/null) # Only do this if the filename isn't a simple child,
and set fromroot (string replace -- "$root/" ":/" "$fromroot") # or the current token starts with ":"
and printf '%s\t%s\n' "$fromroot" $desc if string match -q '../*' -- $file
or string match -q ':*' -- (commandline -ct)
# And the containing directory. set -l fromroot (builtin realpath -- $file 2>/dev/null)
# TODO: We may want to offer the parent, but only if another child of that also has a change. and set fromroot (string replace -- "$root/" ":/" "$fromroot")
# E.g: and printf '%s\t%s\n' "$fromroot" $desc
# - a/b/c is added end
# - a/d/e is modified
# - a/ should be offered, but only a/b/ and a/d/ are.
#
# Always offering all parents is overkill however, which is why we don't currently do it.
set -l dir (string replace -rf '/[^/]+$' '/' -- $file)
and printf '%s\t%s\n' $dir "$dir_desc"
end end
end end
else else
# v1 format logic # v1 format logic
# We need to compute relative paths on our own, which is slow. # We need to compute relative paths on our own, which is slow.
# Pre-remove the root at least, so we have fewer components to deal with. # Pre-remove the root at least, so we have fewer components to deal with.
set -l _pwd_list (string replace "$root/" "" -- $PWD | string split /) set -l _pwd_list (string replace "$root/" "" -- $PWD/ | string split /)
test -z "$_pwd_list[-1]"; and set -e _pwd_list[-1]
# Cache the previous relative path because these are sorted, so we can reuse it # Cache the previous relative path because these are sorted, so we can reuse it
# often for files in the same directory. # often for files in the same directory.
set -l previous set -l previous
@ -349,9 +342,7 @@ function __fish_git_files
# Again: "XY filename", so the filename starts on character 4. # Again: "XY filename", so the filename starts on character 4.
set -l relfile (string sub -s 4 -- $line) set -l relfile (string sub -s 4 -- $line)
# The filename with ":/" prepended. set -l file
set -l file (string replace -- "$root/" ":/" "$root/$relfile")
# Computing relative path by hand. # Computing relative path by hand.
set -l abs (string split / -- $relfile) set -l abs (string split / -- $relfile)
# If it's in the same directory, we just need to change the filename. # If it's in the same directory, we just need to change the filename.
@ -359,7 +350,6 @@ function __fish_git_files
set previous[-1] $abs[-1] set previous[-1] $abs[-1]
else else
set -l pwd_list $_pwd_list set -l pwd_list $_pwd_list
set previousfile $abs
# Remove common prefix # Remove common prefix
while test "$pwd_list[1]" = "$abs[1]" while test "$pwd_list[1]" = "$abs[1]"
set -e pwd_list[1] set -e pwd_list[1]
@ -369,10 +359,18 @@ function __fish_git_files
set previous (string replace -r '.*' '..' -- $pwd_list) $abs set previous (string replace -r '.*' '..' -- $pwd_list) $abs
end end
set -a file (string join / -- $previous) set -a file (string join / -- $previous)
printf '%s\n' $file\t$desc
set -l dir (string replace -rf '/[^/]+$' '/' -- $file) # The filename with ":/" prepended.
and printf '%s\t%s\n' $dir "$dir_desc" if string match -q '../*' -- $file
or string match -q ':*' -- (commandline -ct)
set file (string replace -- "$root/" ":/" "$root/$relfile")
end
if test "$root/$relfile" = (pwd -P)/$relfile
set file $relfile
end
printf '%s\n' $file\t$desc
end end
end end
end end