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

fix: remove runtime opts hits

Browse source
This commit is contained in:
iff 2024-11-16 22:48:52 +01:00
parent 3ce7918e35
commit b14aba87d0
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/replaces.rs
View file

@ -37,7 +37,7 @@ pub fn opts(suggest: &mut String, last_command: &mut String, opt_list: &mut Vec<
} }
} }
pub fn cmd_reg(suggest: &mut String, last_command: &mut String) { pub fn cmd_reg(suggest: &mut String, last_command: &String) {
while suggest.contains("{{cmd::") { while suggest.contains("{{cmd::") {
let (placeholder, args) = eval_placeholder(suggest, "{{cmd::", "}}"); let (placeholder, args) = eval_placeholder(suggest, "{{cmd::", "}}");

12
src/runtime_rules.rs
View file

@ -121,8 +121,7 @@ pub fn runtime_match(
&pure_suggest, &pure_suggest,
last_command, last_command,
error_msg, error_msg,
shell, shell
&split_command,
); );
} }
} }
@ -156,7 +155,6 @@ fn eval_suggest(
last_command: &str, last_command: &str,
error_msg: &str, error_msg: &str,
shell: &str, shell: &str,
split_command: &Vec<String>,
) -> Option<String> { ) -> Option<String> {
let mut suggest = suggest.to_owned(); let mut suggest = suggest.to_owned();
if suggest.contains("{{command}}") { if suggest.contains("{{command}}") {
@ -167,11 +165,13 @@ fn eval_suggest(
let mut opt_list = Vec::new(); let mut opt_list = Vec::new();
replaces::opts(&mut suggest, &mut last_command, &mut opt_list); replaces::opts(&mut suggest, &mut last_command, &mut opt_list);
replaces::cmd_reg(&mut suggest, &mut last_command); let split_command = split_command(&last_command);
replaces::cmd_reg(&mut suggest, &last_command);
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, shell); replaces::typo(&mut suggest, &split_command, shell);
for (tag, value) in opt_list { for (tag, value) in opt_list {
suggest = suggest.replace(&tag, &value); suggest = suggest.replace(&tag, &value);