Only contextualize three way diffs

walles · May 20, 2024 · a6ffa2e · a6ffa2e
1 parent ce8a028
commit a6ffa2e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/conflicts_highlighter.rs b/src/conflicts_highlighter.rs
@@ -188,7 +188,7 @@ impl ConflictsHighlighter {
                 let c1_or_newline = if c1.is_empty() { "\n" } else { &c1 };
                 let c2_or_newline = if c2.is_empty() { "\n" } else { &c2 };
                 let (c1_tokens, c2_tokens, _, _) =
-                    refiner::to_highlighted_tokens(c1_or_newline, c2_or_newline, true);
+                    refiner::to_highlighted_tokens(c1_or_newline, c2_or_newline, false);
 
                 let c1_style = if base_header.is_empty() {
                     LINE_STYLE_OLD

diff --git a/src/refiner.rs b/src/refiner.rs
@@ -172,7 +172,7 @@ pub fn format(prefixes: &[&str], prefix_texts: &[&str]) -> Vec<String> {
 pub fn to_highlighted_tokens(
     old_text: &str,
     new_text: &str,
-    is_conflict: bool,
+    is_three_way_conflict: bool,
 ) -> (Vec<StyledToken>, Vec<StyledToken>, bool, bool) {
     // Find diffs between adds and removals
     let mut old_tokens = Vec::new();
@@ -231,7 +231,7 @@ pub fn to_highlighted_tokens(
     bridge_consecutive_highlighted_tokens(&mut old_tokens);
     unhighlight_noisy_rows(&mut old_tokens);
 
-    if is_conflict {
+    if is_three_way_conflict {
         contextualize_unhighlighted_lines(&mut new_tokens);
     }
     bridge_consecutive_highlighted_tokens(&mut new_tokens);