github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-23 10:00:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

git completion: use fancy ellipsis

Browse Source 
A recenty commit was loathe to assume the unicode ellipsis character
was safe so just used '..' instead. However I noticed we actually
already do use that character elsehwere in the completions.

So, just make both spots try to somewhat carefully use it.
We do this same `string match` check on LANG in fish_job_summary.fish
This commit is contained in:
Aaron Gyes 2022-08-13 17:56:33 -07:00
parent 2a0e0d6721
commit ce55114e38
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
share/completions/git.fish
View File

@ -523,6 +523,14 @@ function __fish_git_complete_rev_files
printf "$rev:%s\n" (__fish_git_rev_files $rev $path)
end
# This is the same logic used on $LANG in fish_job_summary. Print a pretty ellipse if we can,
# returns the width.
function __fish_git_ellipsis
string match -iqr 'utf.?8' -- $LANG && set -f str \u2026 || set -f str ..
printf %s $str
return (string length -V $str)
end
# Determines whether we can/should complete with __fish_git_rev_files
function __fish_git_needs_rev_files
# git (as of 2.20) accepts the rev:path syntax for a number of subcommands,
@ -607,7 +615,7 @@ function __fish_git_config_keys
# With -z, key and value are separated by space, not "="
__fish_git config -lz | while read -lz key value
# Print only first line of value(with an ellipsis) if multiline
printf '%s\t%s\n' $key (string replace \n …\n -- $value)[1]
printf '%s\t%s\n' $key (string replace \n (__fish_git_ellipsis)\n -- $value)[1]
end
# Print all recognized config keys; duplicates are not shown twice by fish
printf '%s\n' (__fish_git help --config)[1..-2] # Last line is a footer; ignore it
@ -732,9 +740,10 @@ function __fish_git_aliases
begin
set -l name (string replace -r '^.*\.' '' -- $key)
# Only use the first line of the value as the description.
# Also shorten it to 35 chars.
set -l val (printf '%s\n' $value | string replace -r '^(.{0,35}).+' '$1..')[1]
printf "%s\t%s\n" $name "Alias: $val"
# Also shorten it to 35/36 chars depending on how wide the ellipsis is.
set -f ellipsis (__fish_git_ellipsis)
set -l val (printf '%s\n' $value | string replace -r "^(.{0,$(math 37 - $status)}).+" '$1'$ellipsis)[1]
printf "%s\t%s\n" $name "alias: $val"
end
end
end