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

fix: don't remove line change in styling

Browse source
This commit is contained in:
iff 2023-08-07 18:07:12 +02:00
parent b9943fb777
commit b0db0447b9
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/style.rs
View file

@ -5,7 +5,8 @@ use colored::*;
// to_string() is necessary here, otherwise there won't be color in the output // to_string() is necessary here, otherwise there won't be color in the output
#[warn(clippy::unnecessary_to_owned)] #[warn(clippy::unnecessary_to_owned)]
pub fn highlight_difference(shell: &str, suggested_command: &str, last_command: &str) -> Option<String> { pub fn highlight_difference(shell: &str, suggested_command: &str, last_command: &str) -> Option<String> {
let mut split_suggested_command = split_command(suggested_command); let replaced_newline = suggested_command.replace("\n", r" {{newline}}");
let mut split_suggested_command = split_command(&replaced_newline);
let split_last_command = split_command(last_command); let split_last_command = split_command(last_command);
if split_suggested_command == split_last_command { if split_suggested_command == split_last_command {
@ -29,6 +30,9 @@ pub fn highlight_difference(shell: &str, suggested_command: &str, last_command:
// let mut highlighted = suggested_command.to_string(); // let mut highlighted = suggested_command.to_string();
'next: for entry in split_suggested_command.iter_mut() { 'next: for entry in split_suggested_command.iter_mut() {
if entry == r"{{newline}" {
continue
}
for old in &old_entries { for old in &old_entries {
if old == entry { if old == entry {
*entry = entry.cyan().to_string(); *entry = entry.cyan().to_string();
@ -54,5 +58,5 @@ pub fn highlight_difference(shell: &str, suggested_command: &str, last_command:
highlighted = split_suggested_command.join(" "); highlighted = split_suggested_command.join(" ");
} }
Some(highlighted) Some(highlighted.replace(r"{{newline}}", "\n"))
} }