From 7ddae68645ca8a81a12e7fe7cf5609d2f35d8c42 Mon Sep 17 00:00:00 2001 From: Fabian Homborg Date: Mon, 20 May 2019 21:07:37 +0200 Subject: [PATCH] Restyle a few stragglers THERE WERE TABS! TABS! TABS! [ci skip] --- benchmarks/benchmarks/external_cmds.fish | 2 +- benchmarks/benchmarks/seq_echo.fish | 2 +- build_tools/list_committers_since.fish | 4 ++-- share/functions/__fish_complete_ant_targets.fish | 2 +- tests/test_util.fish | 16 +++++++++------- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/benchmarks/benchmarks/external_cmds.fish b/benchmarks/benchmarks/external_cmds.fish index 7fc39561d..34b3cab40 100644 --- a/benchmarks/benchmarks/external_cmds.fish +++ b/benchmarks/benchmarks/external_cmds.fish @@ -1,4 +1,4 @@ for i in (seq 2000) - command true + command true end diff --git a/benchmarks/benchmarks/seq_echo.fish b/benchmarks/benchmarks/seq_echo.fish index 56e76da68..a309bfbea 100644 --- a/benchmarks/benchmarks/seq_echo.fish +++ b/benchmarks/benchmarks/seq_echo.fish @@ -1,3 +1,3 @@ for i in (seq 1000) - echo $i + echo $i end diff --git a/build_tools/list_committers_since.fish b/build_tools/list_committers_since.fish index e5c51c423..83d57bbb9 100755 --- a/build_tools/list_committers_since.fish +++ b/build_tools/list_committers_since.fish @@ -20,8 +20,8 @@ set committers_from_tag (mktemp) # 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! -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_to_tag +git log "$TAG".. --format="%aN" --reverse | sort -u >$committers_from_tag echo New committers: echo (comm -13 $committers_to_tag $committers_from_tag)',' diff --git a/share/functions/__fish_complete_ant_targets.fish b/share/functions/__fish_complete_ant_targets.fish index 3c216b044..14745c79a 100755 --- a/share/functions/__fish_complete_ant_targets.fish +++ b/share/functions/__fish_complete_ant_targets.fish @@ -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) if [ ! -s "$cache_file" ] # generate cache file if empty - __parse_ant_targets_from_projecthelp $buildfile > $cache_file + __parse_ant_targets_from_projecthelp $buildfile >$cache_file end cat $cache_file diff --git a/tests/test_util.fish b/tests/test_util.fish index a4ad356bc..a23d46ca5 100644 --- a/tests/test_util.fish +++ b/tests/test_util.fish @@ -27,11 +27,11 @@ if not set -q __fish_is_running_tests # Set up our test environment and re-run the original script. set -l script $argv[1] switch $script - case '/*' - # path is absolute - case '*' - # path is relative, make it absolute - set script $PWD/$script + case '/*' + # path is absolute + case '*' + # path is relative, make it absolute + set script $PWD/$script end 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_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 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 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] test -z "$suppress_color"; and set_color normal if test -z "$suppress_newline"