zsh: usage support

carapace-sh · Nov 27, 2022 · d535ba4 · d535ba4
1 parent 93ca86c
commit d535ba4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/example/cmd/_test/zsh.sh b/example/cmd/_test/zsh.sh
@@ -15,9 +15,10 @@ function _example_completion {
   fi
 
   export ZLS_COLOURS="${lines[1]}"
+  [[ ! "${lines[2]}" == "NONE" ]] && _message -r "${lines[2]}"
 
   # shellcheck disable=SC2034,2206
-  lines=(${lines[@]:1})
+  lines=(${lines[@]:2})
   # shellcheck disable=SC2034,2206
   local vals=(${lines%$'\t'*})
   # shellcheck disable=SC2034,2206

diff --git a/internal/shell/zsh/action.go b/internal/shell/zsh/action.go
@@ -93,7 +93,11 @@ func ActionRawValues(currentWord string, usage string, nospace common.SuffixMatc
 	if len(zstyles) > 1000 { // TODO disable styling for large amount of values (bad performance)
 		zstyles = make([]string, 0)
 	}
-	return fmt.Sprintf(":%v\n%v", strings.Join(zstyles, ":"), strings.Join(vals, "\n"))
+
+	if usage == "" {
+		usage = "NONE" // TODO fix empty line issue in script
+	}
+	return fmt.Sprintf(":%v\n%v\n%v", strings.Join(zstyles, ":"), usage, strings.Join(vals, "\n"))
 }
 
 var zstyleQuoter = strings.NewReplacer(

diff --git a/internal/shell/zsh/snippet.go b/internal/shell/zsh/snippet.go
@@ -27,9 +27,10 @@ function _%v_completion {
   fi
 
   export ZLS_COLOURS="${lines[1]}"
+  [[ ! "${lines[2]}" == "NONE" ]] && _message -r "${lines[2]}"
   
   # shellcheck disable=SC2034,2206
-  lines=(${lines[@]:1})
+  lines=(${lines[@]:2})
   # shellcheck disable=SC2034,2206
   local vals=(${lines%%$'\t'*})
   # shellcheck disable=SC2034,2206