Vagrant completion updates

[zzamboni]

Improved vagrant completions for some commands to avoid spurious completions, and added completions for some missing Vagrant commands.

[lilyball]

This could be simplified to

function __fish_vagrant_using_command
    set -l cmd (commandline -opc)
    set -q cmd[2]; and test "$argv[1]" = $cmd[2]
end

Note: set -l for cmd so we don't overwrite any global/universal variables with that name.

set -q cmd[2] is a quick way of testing to ensure $cmd[2] exists, and then we quote "$argv[1]" because we didn't test to make sure it exists and want to make sure we pass something to test; since we already verified $cmd[2] exists we don't need to quote it.

[zzamboni]

Thank you, good tips - will fix.

[lilyball]

In this function, set -q cmd[2] won't work unless you also test not set -q cmd[3] since you're trying to ensure there's only two words. So we can stick with count. But it can still be simplified (and the set cmd be fixed):

function __fish_vagrant_using_command_and_no_subcommand
    set -l cmd (commandline -opc)
    test (count $cmd) -eq 2 -a "$argv[1]" = "$cmd[2]"
end

"$cmd[2]" is quoted in this case because we're passing the argument to test regardless of whether the first test passes. We could use test (count $cmd) -eq 2; and test "$argv[1]" = $cmd[2] but there seems to be no point.

[lilyball]

These sets should use -l, for the same reason as above: so an inherited global/universal variable of that name doesn't get overwritten.

[lilyball]

Actually the whole function can be simplified again:

function __fish_vagrant_using_subcommand --arguments cmd_main cmd_sub
    set -l cmd (commandline -opc)
    set -q cmd[3]; and test "$cmd_main" = $cmd[2] -a "$cmd_sub" = $cmd[3]
end

Looks like the if [ $cmd_main ... command was actually wrong to begin with, since it was using an ; and in the condition without a begin/end block. Which is to say, it was never actually testing that the subcommand was correct.

[zzamboni]

Ooooh, this is the reason why the --provider flag was being offered as a completion to all the box subcommands! I wondered about that but never caught the mistake. Thanks!

[zzamboni]

And I just noticed the --arguments - very nice! Much cleaner than the usual shell way of fetching arguments.

[lilyball]

Eh, when it works. It's basically equivalent to just

set -l cmd_main $argv[1]
set -l cmd_sub $argv[2]

except without array out of bound index errors.

But if you need to conditionally parse out flags or suchlike, it can end up being more annoying to work with than just $argv.

[lilyball]

awk seems a tad overkill for this.

set -l IFS \n\ \t
command vagrant box list | while read -l name _
    echo $name
end

Granted, awk is shorter, but it involves invoking an extra process, when we can easily grab the first word of each line in fishscript.

[lilyball]

Squashed and pushed as d982f2a. Thanks!

[zzamboni]

Thanks!