Skip to content

Fixed custom completion not working in zsh when command name contains a dash #364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 7, 2021
Merged

Fixed custom completion not working in zsh when command name contains a dash #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d076f87
Updated the zsh completions to escape the command name for a custom c…
CraigSiemens Oct 20, 2021
70043e4
Merge branch 'main' into fix-zsh-dash-command-name-custom-completion
CraigSiemens Nov 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/ArgumentParser/Completions/ZshCompletionsGenerator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ extension ArgumentDefinition {

case .custom:
// Generate a call back into the command to retrieve a completions list
let commandName = commands.first!._commandName
let commandName = commands.first!._commandName.zshEscapingCommandName()
return "{_custom_completion $_\(commandName)_commandname \(customCompletionCall(commands)) $words}"
}
}
Expand Down
4 changes: 4 additions & 0 deletions Tests/ArgumentParserUnitTests/CompletionScriptTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@ extension CompletionScriptTests {
struct EscapedCommand: ParsableCommand {
@Option(help: #"Escaped chars: '[]\."#)
var one: String

@Argument(completion: .custom { _ in ["d", "e", "f"] })
var two: String
}

func testEscaped_Zsh() throws {
Expand Down Expand Up @@ -222,6 +225,7 @@ _escaped-command() {
local -a args
args+=(
'--one[Escaped chars: '"'"'\\[\\]\\\\.]:one:'
':two:{_custom_completion $_escaped_command_commandname ---completion -- two $words}'
'(-h --help)'{-h,--help}'[Show help information.]'
)
_arguments -w -s -S $args[@] && ret=0
Expand Down