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

Restyle a few stragglers

Browse Source 
THERE WERE TABS! TABS!

TABS!

[ci skip]
This commit is contained in:
Fabian Homborg 2019-05-20 21:07:37 +02:00
parent c2b7e9b2e6
commit 7ddae68645
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmarks/benchmarks/external_cmds.fish
View File

@ -1,4 +1,4 @@
for i in (seq 2000) for i in (seq 2000)
command true command true
end end

2
benchmarks/benchmarks/seq_echo.fish
View File

@ -1,3 +1,3 @@
for i in (seq 1000) for i in (seq 1000)
echo $i echo $i
end end

4
build_tools/list_committers_since.fish
View File

@ -20,8 +20,8 @@ set committers_from_tag (mktemp)
# Unicode collation tables mean that this is fraught with danger; for example, the # Unicode collation tables mean that this is fraught with danger; for example, the
# "“" character will not case-fold in UTF-8 locales. sort suggests using the C locale! # "“" character will not case-fold in UTF-8 locales. sort suggests using the C locale!
git log "$TAG" --format="%aN" --reverse | sort -u > $committers_to_tag git log "$TAG" --format="%aN" --reverse | sort -u >$committers_to_tag
git log "$TAG".. --format="%aN" --reverse | sort -u > $committers_from_tag git log "$TAG".. --format="%aN" --reverse | sort -u >$committers_from_tag
echo New committers: echo New committers:
echo (comm -13 $committers_to_tag $committers_from_tag)',' echo (comm -13 $committers_to_tag $committers_from_tag)','

2
share/functions/__fish_complete_ant_targets.fish
View File

@ -39,7 +39,7 @@ function __fish_complete_ant_targets -d "Print list of targets from build.xml an
set -l cache_file $cache_dir/(fish_md5 -s $buildfile) set -l cache_file $cache_dir/(fish_md5 -s $buildfile)
if [ ! -s "$cache_file" ] if [ ! -s "$cache_file" ]
# generate cache file if empty # generate cache file if empty
__parse_ant_targets_from_projecthelp $buildfile > $cache_file __parse_ant_targets_from_projecthelp $buildfile >$cache_file
end end
cat $cache_file cat $cache_file

16
tests/test_util.fish
View File

@ -27,11 +27,11 @@ if not set -q __fish_is_running_tests
# Set up our test environment and re-run the original script. # Set up our test environment and re-run the original script.
set -l script $argv[1] set -l script $argv[1]
switch $script switch $script
case '/*' case '/*'
# path is absolute # path is absolute
case '*' case '*'
# path is relative, make it absolute # path is relative, make it absolute
set script $PWD/$script set script $PWD/$script
end end
begin begin
@ -51,7 +51,7 @@ if not set -q __fish_is_running_tests
set -l escaped_parent (dirname $PWD | sed -e 's/[\'\\\\]/\\\\&/g'); or die set -l escaped_parent (dirname $PWD | sed -e 's/[\'\\\\]/\\\\&/g'); or die
set -l escaped_config (printf '%s/fish' $XDG_CONFIG_HOME | sed -e 's/[\'\\\\]/\\\\&/g'); or die set -l escaped_config (printf '%s/fish' $XDG_CONFIG_HOME | sed -e 's/[\'\\\\]/\\\\&/g'); or die
printf 'set fish_function_path \'%s/functions\' \'%s/share/functions\'\n' $escaped_config $escaped_parent > $XDG_CONFIG_HOME/fish/config.fish; or die printf 'set fish_function_path \'%s/functions\' \'%s/share/functions\'\n' $escaped_config $escaped_parent >$XDG_CONFIG_HOME/fish/config.fish; or die
set -xl __fish_is_running_tests $XDG_CONFIG_HOME set -xl __fish_is_running_tests $XDG_CONFIG_HOME
# Set locale information for consistent tests. Fish should work with a lot of locales but the # Set locale information for consistent tests. Fish should work with a lot of locales but the
@ -108,7 +108,9 @@ function say -V suppress_color
return 1 return 1
end end
if begin; test -n "$suppress_color"; or set_color $color_flags $argv[1]; end if begin
test -n "$suppress_color"; or set_color $color_flags $argv[1]
end
printf '%s' $argv[2..-1] printf '%s' $argv[2..-1]
test -z "$suppress_color"; and set_color normal test -z "$suppress_color"; and set_color normal
if test -z "$suppress_newline" if test -z "$suppress_newline"