Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 13:39:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into ast

Browse source
This commit is contained in:
ridiculousfish 2014-01-01 15:32:50 -08:00
commit 358145c4bd
8 changed files with 130 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
complete.cpp
View file

@ -1241,7 +1241,7 @@ void completer_t::complete_from_args(const wcstring &str,
if (! is_autosuggest)
proc_pop_interactive();
this->complete_strings(str, desc.c_str(), 0, possible_comp, flags);
this->complete_strings(escape_string(str, ESCAPE_ALL), desc.c_str(), 0, possible_comp, flags);
}
/**

2
configure.ac
View file

@ -398,7 +398,7 @@ fi
# installed
#
AC_ARG_VAR( [docdir], [Documentation direcotry] )
AC_ARG_VAR( [docdir], [Documentation directory] )
if test -z $docdir; then
docdir=$datadir/doc/fish

1
share/completions/adb.fish
View file

@ -98,6 +98,7 @@ complete -f -n '__fish_adb_no_subcommand' -c adb -a 'root' -d 'Restart the adbd
complete -f -n '__fish_adb_no_subcommand' -c adb -a 'usb' -d 'Restart the adbd daemon listening on USB'
complete -f -n '__fish_adb_no_subcommand' -c adb -a 'tcpip' -d 'Restart the adbd daemon listening on TCP'
complete -f -n '__fish_adb_no_subcommand' -c adb -a 'ppp' -d 'Run PPP over USB'
complete -f -n '__fish_adb_no_subcommand' -c adb -a 'sideload' -d 'Install zip-file on device in sideload mode'
# install options
complete -n '__fish_seen_subcommand_from install' -c adb -s l -d 'Forward-lock the app'

15
share/completions/elixir.fish Normal file
View file

@ -0,0 +1,15 @@
complete -f -c elixir -s v -d "Prints version and exit"
complete -f -c elixir -s e -d "Evaluates the given command"
complete -c elixir -s r -d "Requires the given files/patterns"
complete -c elixir -s S -d "Finds and executes the given script"
complete -c elixir -s pr -d "Requires the given files/patterns in parallel"
complete -c elixir -s pa -d "Prepends the given path to Erlang code path"
complete -c elixir -s pz -d "Appends the given path to Erlang code path"
complete -c elixir -l app -d "Start the given app and its dependencies"
complete -f -c elixir -l erl -d "Switches to be passed down to erlang"
complete -f -c elixir -l name -d "Makes and assigns a name to the distributed node"
complete -f -c elixir -l sname -d "Makes and assigns a short name to the distributed node"
complete -f -c elixir -l cookie -d "Sets a cookie for this distributed node"
complete -f -c elixir -l hidden -d "Makes a hidden node"
complete -f -c elixir -l detached -d "Starts the Erlang VM detached from console"
complete -f -c elixir -l no-halt -d "Does not halt the Erlang VM after execution"

16
share/completions/iex.fish Normal file
View file

@ -0,0 +1,16 @@
complete -f -c iex -s v -d "Prints version and exit"
complete -f -c iex -s e -d "Evaluates the given command"
complete -c iex -s r -d "Requires the given files/patterns"
complete -c iex -s S -d "Finds and executes the given script"
complete -c iex -s pr -d "Requires the given files/patterns in parallel"
complete -c iex -s pa -d "Prepends the given path to Erlang code path"
complete -c iex -s pz -d "Appends the given path to Erlang code path"
complete -c iex -l app -d "Start the given app and its dependencies"
complete -f -c iex -l erl -d "Switches to be passed down to erlang"
complete -f -c iex -l name -d "Makes and assigns a name to the distributed node"
complete -f -c iex -l sname -d "Makes and assigns a short name to the distributed node"
complete -f -c iex -l cookie -d "Sets a cookie for this distributed node"
complete -f -c iex -l hidden -d "Makes a hidden node"
complete -f -c iex -l detached -d "Starts the Erlang VM detached from console"
complete -f -c iex -l remsh -d "Connects to a node using a remote shell"
complete -c iex -l dot-iex -d "Overrides default .iex file and uses path instead; path can be empty, then no file will be loaded"

93
share/completions/mix.fish Normal file
View file

@ -0,0 +1,93 @@
function __fish_mix_needs_command
set cmd (commandline -opc)
if [ (count $cmd) -eq 1 -a $cmd[1] = 'mix' ]
return 0
end
return 1
end
function __fish_mix_using_command
set cmd (commandline -opc)
if [ (count $cmd) -gt 1 ]
if [ $argv[1] = $cmd[2] ]
return 0
end
end
return 1
end
complete -f -c mix -n '__fish_mix_needs_command' -a archive -d "Archive this project into a .ez file"
complete -f -c mix -n '__fish_mix_needs_command' -a clean -d "Clean generated application files"
complete -f -c mix -n '__fish_mix_needs_command' -a cmd -d "Executes the given command"
complete -c mix -n '__fish_mix_needs_command' -a compile -d "Compile source files"
complete -f -c mix -n '__fish_mix_needs_command' -a deps -d "List dependencies and their status"
complete -f -c mix -n '__fish_mix_needs_command' -a deps.clean -d "Remove the given dependencies' files"
complete -f -c mix -n '__fish_mix_needs_command' -a deps.compile -d "Compile dependencies"
complete -f -c mix -n '__fish_mix_needs_command' -a deps.get -d "Get all out of date dependencies"
complete -f -c mix -n '__fish_mix_needs_command' -a deps.unlock -d "Unlock the given dependencies"
complete -f -c mix -n '__fish_mix_needs_command' -a deps.update -d "Update the given dependencies"
complete -f -c mix -n '__fish_mix_needs_command' -a do -d "Executes the tasks separated by comma"
complete -f -c mix -n '__fish_mix_needs_command' -a escriptize -d "Generates an escript for the project"
complete -f -c mix -n '__fish_mix_needs_command' -a help -d "Print help information for tasks"
complete -c mix -n '__fish_mix_needs_command' -a local -d "List local tasks"
complete -c mix -n '__fish_mix_needs_command' -a local.install -d "Install a task or an archive locally"
complete -c mix -n '__fish_mix_needs_command' -a local.rebar -d "Install rebar locally"
complete -c mix -n '__fish_mix_needs_command' -a local.uninstall -d "Uninstall local tasks or archives"
complete -c mix -n '__fish_mix_needs_command' -a new -d "Creates a new Elixir project"
complete -f -c mix -n '__fish_mix_needs_command' -a run -d "Run the given file or expression"
complete -f -c mix -n '__fish_mix_needs_command' -a test -d "Run a project's tests"
# archive subcommand
complete -f -c mix -n '__fish_mix_using_command archive' -s o -d "specify output file name"
complete -f -c mix -n '__fish_mix_using_command archive' -l no-compile -d "skip compilation"
# clean subcommand
complete -f -c mix -n '__fish_mix_using_command clean' -l all -d "Clean everything, including dependencies"
# escriptize subcommand
complete -f -c mix -n '__fish_mix_using_command escriptize' -l force -d "forces compilation regardless of modification times"
complete -f -c mix -n '__fish_mix_using_command escriptize' -l no-compile -d "skips compilation to .beam files"
# new subcommand
complete -f -c mix -n '__fish_mix_using_command new' -l bare -d "can be given to not generate an OTP application skeleton"
complete -f -c mix -n '__fish_mix_using_command new' -l module
complete -f -c mix -n '__fish_mix_using_command new' -l umbrella -d "can be given to generate an umbrella project"
# run subcommand
complete -c mix -n '__fish_mix_using_command run' -l eval -s e -d "Evaluates the given code"
complete -c mix -n '__fish_mix_using_command run' -l require -s r -d "Requires pattern before running the command"
complete -c mix -n '__fish_mix_using_command run' -l parallel-require -s pr -d "Requires pattern in parallel"
complete -c mix -n '__fish_mix_using_command run' -l no-halt -d "Does not halt the system after running the command"
complete -c mix -n '__fish_mix_using_command run' -l no-compile -d "Does not compile even if files require compilation"
complete -c mix -n '__fish_mix_using_command run' -l no-start -d "Does not start applications after compilation"
# test subcommand
complete -c mix -n '__fish_mix_using_command test' -l trace -d "run tests with detailed reporting. Automatically sets `--max-cases` to 1"
complete -c mix -n '__fish_mix_using_command test' -l max-cases -d "set the maximum number of cases running async"
complete -c mix -n '__fish_mix_using_command test' -l cover -d "the directory to include coverage results"
complete -c mix -n '__fish_mix_using_command test' -l force -d "forces compilation regardless of modification times"
complete -c mix -n '__fish_mix_using_command test' -l no-compile -d "do not compile, even if files require compilation"
complete -c mix -n '__fish_mix_using_command test' -l no-start -d "do not start applications after compilation"
complete -c mix -n '__fish_mix_using_command test' -l no-color -d "disable color in the output"
# help subcommand
complete -f -c mix -n '__fish_mix_using_command help' -a archive -d "Archive this project into a .ez file"
complete -f -c mix -n '__fish_mix_using_command help' -a clean -d "Clean generated application files"
complete -f -c mix -n '__fish_mix_using_command help' -a cmd -d "Executes the given command"
complete -f -c mix -n '__fish_mix_using_command help' -a compile -d "Compile source files"
complete -f -c mix -n '__fish_mix_using_command help' -a deps -d "List dependencies and their status"
complete -f -c mix -n '__fish_mix_using_command help' -a deps.clean -d "Remove the given dependencies' files"
complete -f -c mix -n '__fish_mix_using_command help' -a deps.compile -d "Compile dependencies"
complete -f -c mix -n '__fish_mix_using_command help' -a deps.get -d "Get all out of date dependencies"
complete -f -c mix -n '__fish_mix_using_command help' -a deps.unlock -d "Unlock the given dependencies"
complete -f -c mix -n '__fish_mix_using_command help' -a deps.update -d "Update the given dependencies"
complete -f -c mix -n '__fish_mix_using_command help' -a do -d "Executes the tasks separated by comma"
complete -f -c mix -n '__fish_mix_using_command help' -a escriptize -d "Generates an escript for the project"
complete -f -c mix -n '__fish_mix_using_command help' -a local -d "List local tasks"
complete -f -c mix -n '__fish_mix_using_command help' -a local.install -d "Install a task or an archive locally"
complete -f -c mix -n '__fish_mix_using_command help' -a local.rebar -d "Install rebar locally"
complete -f -c mix -n '__fish_mix_using_command help' -a local.uninstall -d "Uninstall local tasks or archives"
complete -f -c mix -n '__fish_mix_using_command help' -a new -d "Creates a new Elixir project"
complete -f -c mix -n '__fish_mix_using_command help' -a run -d "Run the given file or expression"
complete -f -c mix -n '__fish_mix_using_command help' -a test -d "Run a project's tests"

4
share/functions/__fish_complete_svn.fish
View file

@ -298,12 +298,12 @@ function __fish_complete_svn -d 'Complete svn and its wrappers' --argument-names
#
# Completions for the 'relocate' subcommand
#
_svn_cmpl_ $relocate -xa '( svn info | grep URL: | cut --delimiter " " --fields 2 ) http:// ftp:// svn+ssh:// svn+ssh://(__fish_print_hostnames)'
_svn_cmpl_ $relocate -xa '( svn info | grep URL: | cut -d " " -f 2 ) http:// ftp:// svn+ssh:// svn+ssh://(__fish_print_hostnames)'
#
# Completions for the 'switch', 'sw' subcommands
#
_svn_cmpl_ $switch -l relocate --description 'Relocate via URL-rewriting' -xa '( svn info | grep URL: | cut --delimiter " " --fields 2 ) http:// ftp:// svn+ssh:// svn+ssh://(__fish_print_hostnames)'
_svn_cmpl_ $switch -l relocate --description 'Relocate via URL-rewriting' -xa '( svn info | grep URL: | cut -d " " -f 2 ) http:// ftp:// svn+ssh:// svn+ssh://(__fish_print_hostnames)'
#
# Completions for the 'status', 'st' subcommands

2
share/functions/math.fish
View file

@ -7,7 +7,7 @@ function math --description "Perform math calculations in bc"
return 0
end
set -l out (echo $argv|bc)
set -l out (echo $argv|env BC_LINE_LENGTH=0 bc)
echo $out
switch $out
case 0