Merge pull request #4667 from corneliusroemer/fix-4666

fix: Add plural s to context in suggestions

Author: epage

src/error/format.rs

@@ -438,6 +438,9 @@ fn did_you_mean(styled: &mut StyledStr, context: &str, valid: &ContextValue) {
         styled.none(TAB);
         styled.good("note: ");
         styled.none(context);
+        if valid.len() > 1 {
+            styled.none("s");
+        }
         styled.none(" ");
         for (i, valid) in valid.iter().enumerate() {
             if i != 0 {

tests/builder/subcommands.rs

@@ -120,7 +120,7 @@ fn subcmd_did_you_mean_output_ambiguous() {
     static DYM_SUBCMD_AMBIGUOUS: &str = "\
 error: unrecognized subcommand 'te'
 
-  note: subcommand 'test', 'temp' exist
+  note: subcommands 'test', 'temp' exist
   note: to pass 'te' as a value, use 'dym -- te'
 
 Usage: dym [COMMAND]