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

feat: allow using line continuations in templates

Browse source
This commit is contained in:
iff 2023-08-11 15:29:10 +02:00
parent a193a86a5f
commit 498a134da3
4 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/files.rs
View file

@ -42,7 +42,7 @@ pub fn get_best_match_file(input: &str) -> Option<String> {
.map(|file| {
let file = file.unwrap();
file.file_name().into_string().unwrap().replace(" ", "\\ ")
file.file_name().into_string().unwrap().replace(' ', "\\ ")
})
.collect::<Vec<String>>();

13
src/style.rs
View file

@ -9,8 +9,8 @@ pub fn highlight_difference(
suggested_command: &str,
last_command: &str,
) -> Option<String> {
let replaced_newline = suggested_command.replace('\n', r" {{newline}} ");
let mut split_suggested_command = split_command(&replaced_newline);
// let replaced_newline = suggested_command.replace('\n', r" {{newline}} ");
let mut split_suggested_command = split_command(suggested_command);
let split_last_command = split_command(last_command);
if split_suggested_command == split_last_command {
@ -34,7 +34,7 @@ pub fn highlight_difference(
// let mut highlighted = suggested_command.to_string();
'next: for entry in split_suggested_command.iter_mut() {
if entry == r"{{newline}}" {
if entry == "\n" {
continue;
}
for old in &old_entries {
@ -46,7 +46,6 @@ pub fn highlight_difference(
*entry = entry.red().bold().to_string();
}
let highlighted;
if privileged
&& (suggested_command.contains("&&")
|| suggested_command.contains("||")
@ -57,10 +56,8 @@ pub fn highlight_difference(
let len = split_suggested_command.len() - 1;
split_suggested_command[len] =
split_suggested_command[len].clone() + "\"".red().bold().to_string().as_str();
highlighted = split_suggested_command.join(" ");
} else {
highlighted = split_suggested_command.join(" ");
}
let highlighted = split_suggested_command.join(" ");
Some(highlighted.replace(r" {{newline}} ", "\n"))
Some(highlighted.replace(" \n ", "\n"))
}

2
src/suggestions.rs
View file

@ -123,7 +123,7 @@ fn eval_shell_command(shell: &str, command: &str) -> Vec<String> {
pub fn split_command(command: &str) -> Vec<String> {
// this regex splits the command separated by spaces, except when the space
// is escaped by a backslash or surrounded by quotes
let regex = r#"([^\s"'\\]+|"(?:\\.|[^"\\])*"|\\\s+|'(?:\\.|[^'\\])*'|\\\s)+"#;
let regex = r#"([^\s"'\\]+|"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\\ )+|\\|\n"#;
let regex = Regex::new(regex).unwrap();
let split_command = regex
.find_iter(command)