Trim newlines on text inserted that does not need additional spans op…

…ening
w4 · May 21, 2024 · 9245909 · 9245909
1 parent 27cfc0a
commit 9245909
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/git.rs b/src/git.rs
@@ -729,8 +729,15 @@ fn format_file_inner(
             // of open spans, so we can open and close them for each line
             for &(i, ref op) in &ops {
                 if i > cur_index {
+                    let prefix = &line[cur_index..i];
+                    let prefix = if code_tag {
+                        prefix.trim_end_matches('\n')
+                    } else {
+                        prefix
+                    };
+                    write!(out, "{}", Escape(prefix))?;
+
                     span_empty = false;
-                    write!(out, "{}", Escape(&line[cur_index..i]))?;
                     cur_index = i;
                 }