Singular used even when multiple suggestions exist note: subcommand 'foo', 'bar' exist

[corneliusroemer]

Please complete the following tasks

• I have searched the discussions
• I have searched the open and rejected issues

Rust Version

1.66.1

Clap Version

master

Minimal reproducible code

There already exists a test that expects the wrong grammar (intentionally?):

clap/tests/builder/subcommands.rs

Line 123 in 90c042e

note: subcommand 'test', 'temp' exist

directly

This can be confusing, as the user could think that usage of singular has meaning and starts to think about why singular is used.

Steps to reproduce the bug with the above code

NA

Actual Behaviour

note: subcommand 'test', 'temp' exists

Expected Behaviour

note: subcommands 'test', 'temp' exist

-> Add a suffix -s subcommand and get rid of exists suffix -s

Additional Context

Possible fix could be in

clap/src/error/format.rs

Lines 70 to 85 in 90c042e

	if let Some(valid) = error.get(ContextKind::SuggestedSubcommand) {
	styled.none("\n");
	if !suggested {
	styled.none("\n");
	suggested = true;
	}
	did_you_mean(&mut styled, "subcommand", valid);
	}
	if let Some(valid) = error.get(ContextKind::SuggestedArg) {
	styled.none("\n");
	if !suggested {
	styled.none("\n");
	suggested = true;
	}
	did_you_mean(&mut styled, "argument", valid);
	}

Though this would require a bit of extra code = increased complexity.

Interestingly, the plural/singular of the exist/exists part is correctly implemented already in

clap/src/error/format.rs

Lines 440 to 460 in 90c042e

	styled.none(context);
	styled.none(" ");
	for (i, valid) in valid.iter().enumerate() {
	if i != 0 {
	styled.none(", ");
	}
	styled.none("'");
	styled.good(valid);
	styled.none("'");
	}
	if valid.len() == 1 {
	styled.none(" exists");
	} else {
	styled.none(" exist");
	}
	}
	}
	fn escape(s: impl AsRef<str>) -> String {
	let s = s.as_ref();
	if s.contains(char::is_whitespace) {

Debug Output

No response