eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-15 02:00:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(commands): prefix in missing parameter error

Browse source
This commit is contained in:
dusk 2025-01-11 23:19:50 +09:00
parent 4cf17263d1
commit 319a79d1d6
No known key found for this signature in database
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/commands/src/lib.rs
View file

@ -69,7 +69,7 @@ pub fn parse_command(prefix: String, input: String) -> CommandResult {
loop { loop {
let possible_tokens = local_tree.possible_tokens().cloned().collect::<Vec<_>>(); let possible_tokens = local_tree.possible_tokens().cloned().collect::<Vec<_>>();
println!("possible: {:?}", possible_tokens); println!("possible: {:?}", possible_tokens);
let next = next_token(possible_tokens.clone(), input.clone(), current_pos); let next = next_token(possible_tokens.clone(), &prefix, input.clone(), current_pos);
println!("next: {:?}", next); println!("next: {:?}", next);
match next { match next {
Ok((found_token, arg, new_pos)) => { Ok((found_token, arg, new_pos)) => {
@ -113,7 +113,9 @@ pub fn parse_command(prefix: String, input: String) -> CommandResult {
if !possible_commands.is_empty() { if !possible_commands.is_empty() {
error.push_str(" Perhaps you meant to use one of the commands below:\n"); error.push_str(" Perhaps you meant to use one of the commands below:\n");
for command in possible_commands.iter().take(MAX_SUGGESTIONS) { for command in possible_commands.iter().take(MAX_SUGGESTIONS) {
if !command.show_in_suggestions { continue } if !command.show_in_suggestions {
continue;
}
writeln!(&mut error, "- **{prefix}{command}** - *{}*", command.help) writeln!(&mut error, "- **{prefix}{command}** - *{}*", command.help)
.expect("oom"); .expect("oom");
} }
@ -147,6 +149,7 @@ pub fn parse_command(prefix: String, input: String) -> CommandResult {
/// - optionally a short-circuit error /// - optionally a short-circuit error
fn next_token( fn next_token(
possible_tokens: Vec<Token>, possible_tokens: Vec<Token>,
prefix: &str,
input: SmolStr, input: SmolStr,
current_pos: usize, current_pos: usize,
) -> Result<(Token, Option<TokenMatchedValue>, usize), Option<SmolStr>> { ) -> Result<(Token, Option<TokenMatchedValue>, usize), Option<SmolStr>> {
@ -180,7 +183,7 @@ fn next_token(
} }
TokenMatchResult::MissingParameter { name } => { TokenMatchResult::MissingParameter { name } => {
return Err(Some(format_smolstr!( return Err(Some(format_smolstr!(
"Missing parameter `{name}` in command `{input} [{name}]`." "Missing parameter `{name}` in command `{prefix}{input} [{name}]`."
))) )))
} }
TokenMatchResult::NoMatch => {} TokenMatchResult::NoMatch => {}