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

fix issue with optional branches having wrong flag insert positions

Browse source
This commit is contained in:
dawn 2026-01-17 15:40:07 +03:00
parent e2b354aae1
commit c5ce6fb6c0
No known key found for this signature in database
3 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/command_parser/src/tree.rs
View file

@ -1,3 +1,5 @@
use std::sync::Arc;
use ordermap::OrderMap;
use crate::{command::Command, token::Token};
@ -27,10 +29,20 @@ impl TreeBranch {
if matches!(token, Token::Parameter(ref param) if param.is_optional())
&& index < command.tokens.len() - 1
{
current_branch.register_command(Command {
tokens: command.tokens[index + 1..].to_vec(),
..command.clone()
});
let mut new_command = command.clone();
new_command.tokens = command.tokens[index + 1..].to_vec();
new_command.original = command
.original
.clone()
.or_else(|| Some(Arc::new(command.clone())));
// if the optional parameter we're skipping is *before* the flag insertion point,
// we need to shift the index left by 1 to account for the removed token
if new_command.parse_flags_before > index {
new_command.parse_flags_before -= 1;
}
current_branch.register_command(new_command);
}
// recursively get or create a sub-branch for each token
current_branch = current_branch