technofab/pay-respects
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/pay-respects.git synced 2025-12-12 06:20:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: runtime rules parsing panic

Browse source
This commit is contained in:
iff 2025-04-09 18:31:54 +02:00
parent 0fb229b7d8
commit d70469bf76
2 changed files with 9 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

45
module-runtime-rules/src/replaces.rs
View file

@ -103,7 +103,7 @@ pub fn command(suggest: &mut String, split_command: &[String]) {
} }
} }
pub fn typo(suggest: &mut String, split_command: &[String], executables: &[String], shell: &str) { pub fn typo(suggest: &mut String, split_command: &[String], executables: &[String]) {
while suggest.contains("{{typo") { while suggest.contains("{{typo") {
let (placeholder, args) = eval_placeholder(suggest, "{{typo", "}}"); let (placeholder, args) = eval_placeholder(suggest, "{{typo", "}}");
@ -155,7 +155,7 @@ pub fn typo(suggest: &mut String, split_command: &[String], executables: &[Strin
.rsplit_once(")") .rsplit_once(")")
.unwrap() .unwrap()
.0; .0;
split.split(',').collect::<Vec<&str>>() split.split(&[',', '\n']).collect::<Vec<&str>>()
} else { } else {
unreachable!("Typo suggestion must have a match list"); unreachable!("Typo suggestion must have a match list");
}; };
@ -165,34 +165,17 @@ pub fn typo(suggest: &mut String, split_command: &[String], executables: &[Strin
.map(|s| s.trim().to_string()) .map(|s| s.trim().to_string())
.collect::<Vec<String>>(); .collect::<Vec<String>>();
let command = if match_list[0].starts_with("{{shell") { let command = suggest_typo(&split_command[index], &match_list, executables);
let function = match_list.join(",");
let (_, args) = eval_placeholder(&function, "{{shell", "}}");
let function = &function[args.to_owned()].trim_matches(|c| c == '(' || c == ')');
suggest_typo(
&split_command[index],
&eval_shell_command(shell, function),
executables,
)
} else {
suggest_typo(&split_command[index], &match_list, executables)
};
suggest.replace_range(placeholder, &command); suggest.replace_range(placeholder, &command);
} }
} }
pub fn select( pub fn select(suggest: &mut String, split_command: &[String], select_list: &mut Vec<String>) {
shell: &str,
suggest: &mut String,
split_command: &[String],
executables: &[String],
select_list: &mut Vec<String>,
) {
if suggest.contains("{{select") { if suggest.contains("{{select") {
let (placeholder, args) = eval_placeholder(suggest, "{{select", "}}"); let (placeholder, args) = eval_placeholder(suggest, "{{select", "}}");
let index = if suggest.contains('[') { let _ = if suggest.contains('[') {
let split = suggest[args.to_owned()] let split = suggest[args.to_owned()]
.split(&['[', ']']) .split(&['[', ']'])
.collect::<Vec<&str>>(); .collect::<Vec<&str>>();
@ -221,7 +204,7 @@ pub fn select(
.rsplit_once(")") .rsplit_once(")")
.unwrap() .unwrap()
.0; .0;
split.split(',').collect::<Vec<&str>>() split.split(&[',', '\n']).collect::<Vec<&str>>()
} else { } else {
unreachable!("Select suggestion must have a match list"); unreachable!("Select suggestion must have a match list");
}; };
@ -231,21 +214,7 @@ pub fn select(
.map(|s| s.trim().to_string()) .map(|s| s.trim().to_string())
.collect::<Vec<String>>(); .collect::<Vec<String>>();
let selects = if selection_list[0].starts_with("{{shell") { let selects = selection_list;
let function = selection_list.join(",");
let (_, args) = eval_placeholder(&function, "{{shell", "}}");
let function = &function[args.to_owned()].trim_matches(|c| c == '(' || c == ')');
eval_shell_command(shell, function)
} else if selection_list[0] == "path" {
let res = best_matches_path(&split_command[index], executables);
if let Some(res) = res {
res
} else {
vec![split_command[index].clone()]
}
} else {
selection_list
};
for match_ in selects { for match_ in selects {
select_list.push(match_); select_list.push(match_);

10
module-runtime-rules/src/rules.rs
View file

@ -143,16 +143,10 @@ fn eval_suggest(
replaces::err(&mut suggest, error_msg); replaces::err(&mut suggest, error_msg);
replaces::command(&mut suggest, &split_command); replaces::command(&mut suggest, &split_command);
replaces::shell(&mut suggest, shell); replaces::shell(&mut suggest, shell);
replaces::typo(&mut suggest, &split_command, executables, shell); replaces::typo(&mut suggest, &split_command, executables);
let mut select_list = Vec::new(); let mut select_list = Vec::new();
replaces::select( replaces::select(&mut suggest, &split_command, &mut select_list);
shell,
&mut suggest,
&split_command,
executables,
&mut select_list,
);
for (tag, value) in opt_list { for (tag, value) in opt_list {
suggest = suggest.replace(&tag, &value); suggest = suggest.replace(&tag, &value);