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

fix(commands): mark Any tokens as 'match remainder' if it has a 'match remainder' token in it

Browse source
This commit is contained in:
dusk 2025-01-12 21:10:38 +09:00
parent b020e0a859
commit 816aa68b33
No known key found for this signature in database
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -165,8 +165,8 @@ fn next_token(
println!("matched: {matched:?}\n---"); println!("matched: {matched:?}\n---");
// try checking if this is a flag // try checking if this is a flag
// todo!: this breaks full text matching if the full text starts with a flag // note: if the param starts with - and if a "match remainder" token was going to be matched
// (but that's kinda already broken anyway) // this is going to override that. to prevent that the param should be quoted
if let Some(param) = matched.as_ref() if let Some(param) = matched.as_ref()
&& param.in_quotes.not() && param.in_quotes.not()
&& param.value.starts_with('-') && param.value.starts_with('-')
@ -183,8 +183,12 @@ fn next_token(
// iterate over tokens and run try_match // iterate over tokens and run try_match
for token in possible_tokens { for token in possible_tokens {
let is_match_remaining_token = |token: &Token| matches!(token, Token::FullString(_));
// check if this is a token that matches the rest of the input // check if this is a token that matches the rest of the input
let match_remaining = matches!(token, Token::FullString(_)); let match_remaining = is_match_remaining_token(&token)
// check for Any here if it has a "match remainder" token in it
// if there is a "match remainder" token in a command there shouldn't be a command descending from that
|| matches!(token, Token::Any(ref tokens) if tokens.iter().any(is_match_remaining_token));
// either use matched param or rest of the input if matching remaining // either use matched param or rest of the input if matching remaining
let input_to_match = matched.as_ref().map(|v| { let input_to_match = matched.as_ref().map(|v| {
match_remaining match_remaining
@ -197,11 +201,7 @@ fn next_token(
// otherwise use matched param next pos, // otherwise use matched param next pos,
// and if didnt match anything we stay where we are // and if didnt match anything we stay where we are
let next_pos = matched let next_pos = matched
.map(|v| { .map(|v| match_remaining.then_some(input.len()).unwrap_or(v.next_pos))
match_remaining
.then_some(input.len())
.unwrap_or(v.next_pos)
})
.unwrap_or(current_pos); .unwrap_or(current_pos);
return Some(Ok((token, value, next_pos))); return Some(Ok((token, value, next_pos)));
} }