mirrors/argparse
1
0
Fork 0
mirror of https://github.com/TangentFoxy/argparse.git synced 2025-07-27 18:42:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add trailing newline to output of complete functions

Browse Source
This commit is contained in:
Paul Ouellette
2019-06-18 12:20:21 -04:00
parent 188fb9d8ac
commit 4f99e3dce0
2 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
spec/completion_spec.lua
View File

@@ -18,7 +18,8 @@ _foo() {
fi
}
complete -F _foo -o bashdefault -o default foo]=], parser:get_bash_complete())
complete -F _foo -o bashdefault -o default foo
]=], parser:get_bash_complete())
end)
it("generates correct completions for options with required argument", function()
@@ -45,7 +46,8 @@ _foo() {
fi
}
complete -F _foo -o bashdefault -o default foo]=], parser:get_bash_complete())
complete -F _foo -o bashdefault -o default foo
]=], parser:get_bash_complete())
end)
it("generates correct completions for options with argument choices", function()
@@ -73,7 +75,8 @@ _foo() {
fi
}
complete -F _foo -o bashdefault -o default foo]=], parser:get_bash_complete())
complete -F _foo -o bashdefault -o default foo
]=], parser:get_bash_complete())
end)
it("generates correct completions for commands", function()
@@ -109,7 +112,8 @@ _foo() {
fi
}
complete -F _foo -o bashdefault -o default foo]=], parser:get_bash_complete())
complete -F _foo -o bashdefault -o default foo
]=], parser:get_bash_complete())
end)
it("generates correct completions for command options", function()
@@ -149,7 +153,8 @@ _foo() {
fi
}
complete -F _foo -o bashdefault -o default foo]=], parser:get_bash_complete())
complete -F _foo -o bashdefault -o default foo
]=], parser:get_bash_complete())
end)
it("generates completions for help command argument", function()
@@ -186,7 +191,8 @@ _foo() {
fi
}
complete -F _foo -o bashdefault -o default foo]=], parser:get_bash_complete())
complete -F _foo -o bashdefault -o default foo
]=], parser:get_bash_complete())
end)
end)
@@ -194,7 +200,8 @@ complete -F _foo -o bashdefault -o default foo]=], parser:get_bash_complete())
it("generates correct completions for help flag", function()
local parser = Parser "foo"
assert.equal([[
complete -c foo -s h -l help -d 'Show this help message and exit']], parser:get_fish_complete())
complete -c foo -s h -l help -d 'Show this help message and exit'
]], parser:get_fish_complete())
end)
it("generates correct completions for options with required argument", function()
@@ -202,7 +209,8 @@ complete -c foo -s h -l help -d 'Show this help message and exit']], parser:get_
:add_help(false)
parser:option "--bar"
assert.equal([[
complete -c foo -l bar -r]], parser:get_fish_complete())
complete -c foo -l bar -r
]], parser:get_fish_complete())
end)
it("generates correct completions for options with argument choices", function()
@@ -211,7 +219,8 @@ complete -c foo -l bar -r]], parser:get_fish_complete())
parser:option "--format"
:choices {"short", "medium", "full"}
assert.equal([[
complete -c foo -l format -xa 'short medium full']], parser:get_fish_complete())
complete -c foo -l format -xa 'short medium full'
]], parser:get_fish_complete())
end)
it("generates correct completions for commands", function()
@@ -221,7 +230,8 @@ complete -c foo -l format -xa 'short medium full']], parser:get_fish_complete())
:add_help(false)
:description "Install a rock."
assert.equal([[
complete -c foo -n '__fish_use_subcommand' -xa 'install' -d 'Install a rock']], parser:get_fish_complete())
complete -c foo -n '__fish_use_subcommand' -xa 'install' -d 'Install a rock'
]], parser:get_fish_complete())
end)
it("generates correct completions for command options", function()
@@ -232,7 +242,8 @@ complete -c foo -n '__fish_use_subcommand' -xa 'install' -d 'Install a rock']],
install:flag "-v --verbose"
assert.equal([[
complete -c foo -n '__fish_use_subcommand' -xa 'install'
complete -c foo -n '__fish_seen_subcommand_from install' -s v -l verbose]], parser:get_fish_complete())
complete -c foo -n '__fish_seen_subcommand_from install' -s v -l verbose
]], parser:get_fish_complete())
end)
it("generates completions for help command argument", function()
@@ -245,7 +256,8 @@ complete -c foo -n '__fish_seen_subcommand_from install' -s v -l verbose]], pars
complete -c foo -n '__fish_seen_subcommand_from help' -xa 'help'
complete -c foo -n '__fish_seen_subcommand_from help' -xa 'install'
complete -c foo -n '__fish_use_subcommand' -xa 'help' -d 'Show help for commands'
complete -c foo -n '__fish_use_subcommand' -xa 'install']], parser:get_fish_complete())
complete -c foo -n '__fish_use_subcommand' -xa 'install'
]], parser:get_fish_complete())
end)
it("uses fist sentence of descriptions", function()
@@ -254,7 +266,8 @@ complete -c foo -n '__fish_use_subcommand' -xa 'install']], parser:get_fish_comp
parser:option "--bar"
:description "A description with a .period. Another sentence."
assert.equal([[
complete -c foo -l bar -r -d 'A description with a .period']], parser:get_fish_complete())
complete -c foo -l bar -r -d 'A description with a .period'
]], parser:get_fish_complete())
end)
it("escapes backslashes and single quotes in descriptions", function()
@@ -263,7 +276,8 @@ complete -c foo -l bar -r -d 'A description with a .period']], parser:get_fish_c
parser:option "--bar"
:description "A description with illegal \\' characters."
assert.equal([[
complete -c foo -l bar -r -d 'A description with illegal \\\' characters']], parser:get_fish_complete())
complete -c foo -l bar -r -d 'A description with illegal \\\' characters'
]], parser:get_fish_complete())
end)
end)
end)

7
src/argparse.lua
View File

@@ -1095,7 +1095,7 @@ function Parser:add_complete(value)
:args(1)
:choices {"bash", "zsh", "fish"}
:action(function(_, _, shell)
print(self["get_" .. shell .. "_complete"](self))
io.write(self["get_" .. shell .. "_complete"](self))
os.exit(0)
end)
@@ -1224,7 +1224,8 @@ _%s() {
fi
}
complete -F _%s -o bashdefault -o default %s]=]):format(self._name, self._name))
complete -F _%s -o bashdefault -o default %s
]=]):format(self._name, self._name))
return table.concat(buf, "\n")
end
@@ -1302,7 +1303,7 @@ function Parser:get_fish_complete()
self:_fish_complete_help(lines, prefix)
return table.concat(lines, "\n")
return table.concat(lines, "\n") .. "\n"
end
local function get_tip(context, wrong_name)