support both for now

carapace-sh · Jan 12, 2024 · fb4f802 · fb4f802
1 parent faf7259
commit fb4f802
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/internal/shell/elvish/snippet.go b/internal/shell/elvish/snippet.go
@@ -19,10 +19,18 @@ func Snippet(cmd *cobra.Command) string {
 			edit:notify (styled "usage: " $completion[DescriptionStyle])$completion[Usage]
 		}
 		put $completion[Candidates] | all (one) | peach {|c|
-			if (eq $c[Description] "") {
-		    	edit:complex-candidate $c[Value] &display=(styled $c[Display] $c[Style]) &code-suffix=$c[CodeSuffix] &tag=$c[Tag]
-			} else {
-		    	edit:complex-candidate $c[Value] &display=(styled $c[Display] $c[Style])(styled " " $completion[DescriptionStyle]" bg-default")(styled "("$c[Description]")" $completion[DescriptionStyle]) &code-suffix=$c[CodeSuffix] &tag=$c[Tag]
+			try {			
+				if (eq $c[Description] "") {
+		    		edit:complex-candidate $c[Value] &display=(styled $c[Display] $c[Style]) &code-suffix=$c[CodeSuffix] &tag=$c[Tag]
+				} else {
+		    		edit:complex-candidate $c[Value] &display=(styled $c[Display] $c[Style])(styled " " $completion[DescriptionStyle]" bg-default")(styled "("$c[Description]")" $completion[DescriptionStyle]) &code-suffix=$c[CodeSuffix] &tag=$c[Tag]
+				}
+			} catch {
+				if (eq $c[Description] "") {
+			    	edit:complex-candidate $c[Value] &display=(styled $c[Display] $c[Style]) &code-suffix=$c[CodeSuffix]
+				} else {
+			    	edit:complex-candidate $c[Value] &display=(styled $c[Display] $c[Style])(styled " " $completion[DescriptionStyle]" bg-default")(styled "("$c[Description]")" $completion[DescriptionStyle]) &code-suffix=$c[CodeSuffix]
+				}			
 			}
 		}
     }