mirror of
https://github.com/fish-shell/fish-shell
synced 2024-12-25 12:23:09 +00:00
convert nextd
to use argparse
Also fix a bug I introduce in `prevd` when I converted it to use `argparse`.
This commit is contained in:
parent
c149f4f301
commit
5ac8c42fad
2 changed files with 25 additions and 50 deletions
|
@ -1,6 +1,6 @@
|
|||
function nextd --description "Move forward in the directory history"
|
||||
set -l options 'h/help' 'l/list'
|
||||
argparse -n nextd $options -- $argv
|
||||
argparse -n nextd --max-args=1 $options -- $argv
|
||||
or return
|
||||
|
||||
if set -q _flag_help
|
||||
|
@ -8,13 +8,8 @@ function nextd --description "Move forward in the directory history"
|
|||
return 0
|
||||
end
|
||||
|
||||
if set -q argv[2]
|
||||
printf (_ "%s: Too many arguments") nextd >&2
|
||||
return 1
|
||||
end
|
||||
|
||||
set -l times 1
|
||||
if set -q $argv[1]
|
||||
if set -q argv[1]
|
||||
if test $argv[1] -ge 0 ^/dev/null
|
||||
set times $argv[1]
|
||||
else
|
||||
|
|
|
@ -1,64 +1,44 @@
|
|||
|
||||
function prevd --description "Move back in the directory history"
|
||||
set -l options 'h/help' 'l/list'
|
||||
argparse -n prevd --max-args=1 $options -- $argv
|
||||
or return
|
||||
|
||||
if count $argv >/dev/null
|
||||
switch $argv[1]
|
||||
case -h --h --he --hel --help
|
||||
__fish_print_help prevd
|
||||
return 0
|
||||
end
|
||||
if set -q _flag_help
|
||||
__fish_print_help prevd
|
||||
return 0
|
||||
end
|
||||
|
||||
# Parse arguments
|
||||
set -l show_hist 0
|
||||
set -l times 1
|
||||
if count $argv >/dev/null
|
||||
for i in (seq (count $argv))
|
||||
switch $argv[$i]
|
||||
case '-l' --l --li --lis --list
|
||||
set show_hist 1
|
||||
continue
|
||||
case '-*'
|
||||
printf (_ "%s: Unknown option %s\n" ) prevd $argv[$i]
|
||||
return 1
|
||||
case '*'
|
||||
if test $argv[$i] -ge 0 ^/dev/null
|
||||
set times $argv[$i]
|
||||
else
|
||||
printf (_ "The number of positions to skip must be a non-negative integer\n")
|
||||
return 1
|
||||
end
|
||||
continue
|
||||
end
|
||||
if set -q argv[1]
|
||||
if test $argv[1] -ge 0 ^/dev/null
|
||||
set times $argv[1]
|
||||
else
|
||||
printf (_ "%s: The number of positions to skip must be a non-negative integer\n") nextd
|
||||
return 1
|
||||
end
|
||||
end
|
||||
|
||||
# Traverse history
|
||||
set -l code 1
|
||||
if count $times >/dev/null
|
||||
for i in (seq $times)
|
||||
# Try one step backward
|
||||
if __fish_move_last dirprev dirnext
|
||||
|
||||
# We consider it a success if we were able to do at least 1 step
|
||||
# (low expectations are the key to happiness ;)
|
||||
set code 0
|
||||
else
|
||||
break
|
||||
end
|
||||
for i in (seq $times)
|
||||
# Try one step forward
|
||||
if __fish_move_last dirprev dirnext
|
||||
# We consider it a success if we were able to do at least 1 step
|
||||
# (low expectations are the key to happiness ;)
|
||||
set code 0
|
||||
else
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
# Show history if needed
|
||||
if test $show_hist = 1
|
||||
if set -q _flag_list
|
||||
dirh
|
||||
end
|
||||
|
||||
# Set direction for 'cd -'
|
||||
if test $code = 0 ^/dev/null
|
||||
set -g __fish_cd_direction next
|
||||
end
|
||||
test $code = 0
|
||||
and set -g __fish_cd_direction next
|
||||
|
||||
# All done
|
||||
return $code
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue