reset annotations and fix suggestion sort

brianstrauch · Dec 5, 2023 · b7201a1 · b7201a1
1 parent 280eef2
commit b7201a1
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/shell.go b/shell.go
@@ -172,6 +172,8 @@ func execute(cmd *cobra.Command, args []string) error {
 			} else {
 				_ = flag.Value.Set(flag.DefValue)
 			}
+
+			_ = cmd.Flags().SetAnnotation(flag.Name, cobra.BashCompOneRequiredFlag, []string{"false"})
 		})
 
 		cmd.InitDefaultHelpFlag()
@@ -212,7 +214,15 @@ func parseSuggestions(out string) []prompt.Suggest {
 			return it < jt
 		}
 
-		return isFlag(jt) || !isFlag(it) || it < jt
+		if isFlag(it) {
+			return false
+		}
+
+		if isFlag(jt) {
+			return true
+		}
+
+		return it < jt
 	})
 
 	return suggestions