diff --git a/nushell_completions.go b/nushell_completions.go index fb3c115..7df265d 100644 --- a/nushell_completions.go +++ b/nushell_completions.go @@ -23,141 +23,94 @@ import ( func (c *Command) GenNushellCompletion(w io.Writer, includeDesc bool) error { buf := new(bytes.Buffer) - name := c.Name() WriteStringAndCheck(buf, fmt.Sprintf(` -# A list of cobra apps that completion will be attempted for. -# Add new apps to this list to enable completion for them. -let cobra_apps = ["%[1]s"] - # An external completer that works with any cobra based # command line application (e.g. kubectl, minikube) let cobra_completer = {|spans| - let cmd = $spans.0 + let ShellCompDirectiveError = %[1]d + let ShellCompDirectiveNoSpace = %[2]d + let ShellCompDirectiveNoFileComp = %[3]d + let ShellCompDirectiveFilterFileExt = %[4]d + let ShellCompDirectiveFilterDirs = %[5]d - if not ($cobra_apps | where $cmd =~ $it | is-empty) { - let ShellCompDirectiveError = %[2]d - let ShellCompDirectiveNoSpace = %[3]d - let ShellCompDirectiveNoFileComp = %[4]d - let ShellCompDirectiveFilterFileExt = %[5]d - let ShellCompDirectiveFilterDirs = %[6]d - let last_span = ($spans | last | str trim) + let cmd = $spans | first + let rest = $spans | skip - def exec_complete [ - --fuzzy, - spans: list - ] { - let params = { - last_span: ($spans | last | str trim), - spans: $spans - } - # If there is an equals in the last span - # parse the span into two - let params = if $last_span =~ '=' { - let split = ($last_span | split row '=') - if ($split | length) > 1 { - { - last_span: ($split | last), - spans: ($spans | drop | append ($split | first) | append ($split | last)) - } - } else { - { - last_span: '', - spans: ($spans | drop | append ($split | first) | append '') - } - } - } else { - $params - } + def exec_complete [ + spans: list + ] { + # This will catch the stderr message related to the directive and any other errors, + # such as the command not being a cobra based command + let result = do --ignore-errors { cobra_active_help=0 run-external $cmd "__complete" ...$spans | complete } - let last_span = $params.last_span - let spans = $params.spans + if $result != null and $result.exit_code == 0 { + let completions = $result.stdout | lines - # Drop the last param so we can fuzzy search on it - let spans = if $fuzzy { - $spans | drop - } else { - $spans - } + # the directive is the last line + let directive = do -i { $completions | last | str replace ':' '' | into int } - # skip the first entry in the span (the command) and join the rest of the span to create __complete args - let cmd_args = ($spans | skip 1 | str join ' ') + let completions = $completions | drop | each { |it| + # the first word is the command, the rest is the description + let words = $it | split row -r '\s{1}' - # If the last span entry was empty add "" to the end of the command args - let cmd_args = if ($last_span | is-empty) or $fuzzy { - $'($cmd_args) ""' - } else { - $cmd_args - } + # If the last span contains a hypen and equals, attach it to the name + let last_span = $spans | last + let words = if ($last_span =~ '^-') and ($last_span =~ '=$') { + $words | each {|it| $"($last_span)($it)" } + } else { + $words + } - # The full command to be executed with active help disable (Nushell does not support active help) - let full_cmd = $'COBRA_ACTIVE_HELP=0 ($cmd) __complete ($cmd_args)' + {value: ($words | first | str trim), description: ($words | skip | str join ' ')} + } - # Since nushell doesn't have anything like eval, execute in a subshell - let result = (do -i { nu -c $"'($full_cmd)'" } | complete) + {completions: $completions, directive: $directive} + } else { + {completions: [], directive: -1} + } + } - # Create a record with all completion related info. - # directive and directive_str are for posterity - let stdout_lines = ($result.stdout | lines) - let directive = ($stdout_lines | last | str trim | str replace ":" "" | into int) - let completions = ($stdout_lines | drop | parse -r '([\w\-\.:\+\=\/]*)\t?(.*)' | rename value description) - let completions = if $fuzzy { - $completions | where $it.value =~ $last_span + if (not ($rest | is-empty)) { + let result = exec_complete $rest + let completions = $result.completions + let directive = $result.directive - } else { - ($completions | where {|it| $it.value | str starts-with $last_span }) - } + # Add space at the end of each completion + let completions = if $directive != $ShellCompDirectiveNoSpace { + $completions | each {|it| {value: $"($it.value) ", description: $it.description}} + } else { + $completions + } - { - directive: $directive, - completions: $completions - } - } + # Cobra returns a list of completions that are supported with this directive + # There is no way to currently support this in a nushell external completer + let completions = if $directive == $ShellCompDirectiveFilterFileExt { + [] + } else { + $completions + } - let result = (exec_complete $spans) - let result = if (not ($last_span | is-empty)) and ($result.completions | is-empty) { - exec_complete --fuzzy $spans - } else { - $result - } - - let directive = $result.directive - let completions = $result.completions - - # Add space at the end of each completion - let completions = if $directive != $ShellCompDirectiveNoSpace { - $completions | each {|it| {value: $"($it.value) ", description: $it.description}} - } else { - $completions - } - - # Cobra returns a list of completions that are supported with this directive - # There is no way to currently support this in a nushell external completer - let completions = if $directive == $ShellCompDirectiveFilterFileExt { - [] - } else { - $completions - } - - let return_val = if $last_span =~ '=' { - # if the completion is of the form -n= return flag as part of the completion so that it doesn't get replaced - $completions | each {|it| $"($last_span | split row '=' | first)=($it.value)" } - } else if $directive == $ShellCompDirectiveNoFileComp { - # Allow empty results as this will stop file completion - $completions - } else if ($completions | is-empty) or $directive == $ShellCompDirectiveError { - # Not returning null causes file completions to break - # Return null if there are no completions or ShellCompDirectiveError - null - } else { - $completions - } - - $return_val - } else { - null - } + if $directive == $ShellCompDirectiveNoFileComp { + # Allow empty results as this will stop file completion + $completions + } else if ($completions | is-empty) or $directive == $ShellCompDirectiveError { + # Not returning null causes file completions to break + # Return null if there are no completions or ShellCompDirectiveError + null + } else { + $completions + } + + if ($completions | is-empty) { + null + } else { + $completions + } + } else { + null + } } -`, name, ShellCompDirectiveError, ShellCompDirectiveNoSpace, ShellCompDirectiveNoFileComp, +`, ShellCompDirectiveError, ShellCompDirectiveNoSpace, ShellCompDirectiveNoFileComp, ShellCompDirectiveFilterFileExt, ShellCompDirectiveFilterDirs)) _, err := buf.WriteTo(w)