Eliminate leading space unless --keep-plus-minus-markers

1 files changed, 20 insertions, 6 deletions

diff --git a/src/delta.rs b/src/delta.rs
index b498bd0a..36ea6a56 100644
--- a/src/delta.rs
+++ b/src/delta.rs
@@ -467,7 +467,11 @@ fn handle_hunk_line(
         }
         Some(' ') => {
             let state = State::HunkZero;
-            let prefix = if line.is_empty() { "" } else { &line[..1] };
+            let prefix = if config.keep_plus_minus_markers && !line.is_empty() {
+                &line[..1]
+            } else {
+                ""
+            };
             painter.paint_buffered_lines();
             let lines = vec![prepare(&line, true, config)];
             let syntax_style_sections = Painter::get_syntax_style_sections_for_lines(
@@ -520,12 +524,22 @@ fn prepare(line: &str, append_newline: bool, config: &Config) -> String {
     if !line.is_empty() {
         let mut line = line.graphemes(true);
 
-        // The first column contains a -/+/space character, added by git. We substitute it for a
-        // space now, so that it is not present during syntax highlighting, and substitute again
-        // when emitting the line.
+        // The first column contains a -/+/space character, added by git. If we are retaining them
+        // (--keep-plus-minus-markers), then we substitute it for a space now, so that it is not
+        // present during syntax highlighting, and reinstate it when emitting the line in
+        // Painter::paint_lines. If we not retaining them, then we drop it now, and
+        // Painter::paint_lines doesn't inject anything.
         line.next();
-
-        format!(" {}{}", expand_tabs(line, config.tab_width), terminator)
+        format!(
+            "{}{}{}",
+            if config.keep_plus_minus_markers {
+                " "
+            } else {
+                ""
+            },
+            expand_tabs(line, config.tab_width),
+            terminator
+        )
     } else {
         terminator.to_string()
     }