Merge branch 'johan/conflict-marker-styling'

SCREENSHOTS.md

@@ -1,8 +1,11 @@
-To update `screenshot-git-merge.png`, you should be running
-[iTerm2](https://iterm2.com/) and have [`moar`](https://github.com/walles/moar)
-as your pager.
+# Screenshot updating instructions
 
-Then:
+Screenshots are done using:
+
+- Terminal: [iTerm2](https://iterm2.com/)
+- Pager: [`moar`](https://github.com/walles/moar)
+
+## `screenshot-git-merge.png`
 
 1. Scale your terminal window to 65x17
 2. Copy the below example to the clipboard
@@ -25,3 +28,9 @@ index 0399cd5,59727f0..0000000
 
   hello()
 ```
+
+## `screenshot-diff2-conflict.png`
+
+1. Scale your window to 72x10
+2. `cargo run < testdata/conflict-markers.txt.riff-output`
+3. Screenshot the window and store it as `screenshot-diff2-conflict.png`

src/conflicts_highlighter.rs

@@ -2,11 +2,11 @@ use std::vec;
 
 use threadpool::ThreadPool;
 
-use crate::constants::{GREEN, NORMAL};
+use crate::constants::{GREEN, INVERSE_VIDEO, NORMAL};
 use crate::lines_highlighter::{LineAcceptance, LinesHighlighter, Response};
 use crate::string_future::StringFuture;
-use crate::token_collector::{Style, LINE_STYLE_OLD};
-use crate::token_collector::{LINE_STYLE_CONFLICT_BASE, LINE_STYLE_NEW};
+use crate::token_collector::{Style, LINE_STYLE_CONFLICT_OLD};
+use crate::token_collector::{LINE_STYLE_CONFLICT_BASE, LINE_STYLE_CONFLICT_NEW};
 use crate::{refiner, token_collector};
 
 const CONFLICTS_HEADER1: &str = "<<<<<<<";
@@ -172,9 +172,9 @@ impl ConflictsHighlighter {
         }
 
         let (header_prefix, c1_prefix, c2_prefix, reset) = if self.c1_header.starts_with("++") {
-            (GREEN, " +", "+ ", NORMAL)
+            (INVERSE_VIDEO, " +", "+ ", NORMAL)
         } else {
-            ("", "", "", "")
+            (INVERSE_VIDEO, "", "", "")
         };
 
         let c1_header = self.c1_header.clone();
@@ -191,13 +191,13 @@ impl ConflictsHighlighter {
                     refiner::to_highlighted_tokens(c1_or_newline, c2_or_newline, true);
 
                 let c1_style = if base_header.is_empty() {
-                    LINE_STYLE_OLD
+                    LINE_STYLE_CONFLICT_OLD
                 } else {
-                    LINE_STYLE_NEW
+                    LINE_STYLE_CONFLICT_NEW
                 };
                 let highlighted_c1 = token_collector::render(&c1_style, c1_prefix, &c1_tokens);
                 let highlighted_c2 =
-                    token_collector::render(&LINE_STYLE_NEW, c2_prefix, &c2_tokens);
+                    token_collector::render(&LINE_STYLE_CONFLICT_NEW, c2_prefix, &c2_tokens);
 
                 let mut rendered = String::new();
                 rendered.push_str(header_prefix);
@@ -242,9 +242,9 @@ impl ConflictsHighlighter {
     fn render_diff3(&self, thread_pool: &ThreadPool) -> StringFuture {
         let (header_prefix, c1_prefix, base_prefix, c2_prefix, reset) =
             if self.c1_header.starts_with("++") {
-                (GREEN, " +", "++", "+ ", NORMAL)
+                (INVERSE_VIDEO, " +", "++", "+ ", NORMAL)
             } else {
-                ("", "", "", "", "")
+                (INVERSE_VIDEO, "", "", "", "")
             };
 
         assert!(!self.base.is_empty());
@@ -270,7 +270,7 @@ impl ConflictsHighlighter {
                     });
                 }
                 let highlighted_c1 =
-                    token_collector::render(&LINE_STYLE_NEW, c1_prefix, &c1_tokens);
+                    token_collector::render(&LINE_STYLE_CONFLICT_NEW, c1_prefix, &c1_tokens);
 
                 let c2_or_newline = if c2.is_empty() { "\n" } else { &c2 };
                 let (mut base_vs_c2_tokens, c2_tokens, _, _) =
@@ -282,7 +282,7 @@ impl ConflictsHighlighter {
                     });
                 }
                 let highlighted_c2 =
-                    token_collector::render(&LINE_STYLE_NEW, c2_prefix, &c2_tokens);
+                    token_collector::render(&LINE_STYLE_CONFLICT_NEW, c2_prefix, &c2_tokens);
 
                 assert_eq!(base_vs_c1_tokens.len(), base_vs_c2_tokens.len());
 

src/token_collector.rs

@@ -117,9 +117,29 @@ pub(crate) const LINE_STYLE_ADDS_ONLY: LineStyle = {
 pub(crate) const LINE_STYLE_CONFLICT_BASE: LineStyle = {
     LineStyle {
         prefix_style: AnsiStyle {
+            inverse: true,
+            weight: Weight::Normal,
+            color: Default,
+        },
+        plain_style: AnsiStyle {
             inverse: false,
             weight: Weight::Normal,
-            color: Green,
+            color: Red,
+        },
+        highlighted_style: AnsiStyle {
+            inverse: true,
+            weight: Weight::Normal,
+            color: Red,
+        },
+    }
+};
+
+pub(crate) const LINE_STYLE_CONFLICT_OLD: LineStyle = {
+    LineStyle {
+        prefix_style: AnsiStyle {
+            inverse: true,
+            weight: Weight::Normal,
+            color: Default,
         },
         plain_style: AnsiStyle {
             inverse: false,
@@ -134,6 +154,26 @@ pub(crate) const LINE_STYLE_CONFLICT_BASE: LineStyle = {
     }
 };
 
+pub(crate) const LINE_STYLE_CONFLICT_NEW: LineStyle = {
+    LineStyle {
+        prefix_style: AnsiStyle {
+            inverse: true,
+            weight: Weight::Normal,
+            color: Default,
+        },
+        plain_style: AnsiStyle {
+            inverse: false,
+            weight: Weight::Normal,
+            color: Green,
+        },
+        highlighted_style: AnsiStyle {
+            inverse: true,
+            weight: Weight::Normal,
+            color: Green,
+        },
+    }
+};
+
 pub(crate) const LINE_STYLE_OLD_FILENAME: LineStyle = {
     LineStyle {
         prefix_style: AnsiStyle {

testdata/conflict-markers-diff3-baseless.txt.riff-output

@@ -1,8 +1,8 @@
 This is an example of git conflict markers.
 
-<<<<<<< HEAD
-This line was added on the main branch.
-||||||| 07ffb9b
-=======
-This line was added on the branch named "branch".
->>>>>>> branch
+<<<<<<< HEAD
+This line was added on the main branch.
+||||||| 07ffb9b
+=======
+This line was added on the branch named "branch".
+>>>>>>> branch

testdata/conflict-markers-diff3-removed.txt.riff-output

@@ -1,8 +1,8 @@
 This is an example of git conflict markers.
 
-<<<<<<< HEAD
-This line is changed on the main branch.
-||||||| 07ffb9b
-This line is from the initial commit on the main branch.
-=======
->>>>>>> branch
+<<<<<<< HEAD
+This line is changed on the main branch.
+||||||| 07ffb9b
+This line is from the initial commit on the main branch.
+=======
+>>>>>>> branch

testdata/conflict-markers-diff3.txt.riff-output

@@ -1,9 +1,9 @@
 This is an example of git conflict markers.
 
-<<<<<<< HEAD
-This line is changed on the main branch.
-||||||| 07ffb9b
-This line is from the initial commit on the main branch.
-=======
-This line is from the branch named "branch".
->>>>>>> branch
+<<<<<<< HEAD
+This line is changed on the main branch.
+||||||| 07ffb9b
+This line is from the initial commit on the main branch.
+=======
+This line is from the branch named "branch".
+>>>>>>> branch

testdata/conflict-markers.txt.riff-output

@@ -1,7 +1,7 @@
 This is an example of git conflict markers.
 
-<<<<<<< HEAD
-This line is changed on the main branch.
-=======
-This line is from the branch named "branch".
->>>>>>> branch
+<<<<<<< HEAD
+This line is changed on the main branch.
+=======
+This line is from the branch named "branch".
+>>>>>>> branch

testdata/conflict-with-context.riff-output

@@ -6,79 +6,79 @@
   	"github.com/walles/moar/m/linenumbers"
   )
 
-++<<<<<<< HEAD
- +func (p *Pager) scrollToSearchHits() {
- +	if p.searchPattern == nil {
- +		// This is not a search
- +		return
- +	}
- +
- +	lineNumber := p.scrollPosition.lineNumber(p)
- +	if lineNumber == nil {
- +		// No lines to search
- +		return
- +	}
- +
- +	firstHitPosition := p.findFirstHit(*lineNumber, nil, false)
- +	if firstHitPosition == nil && (*lineNumber != linenumbers.LineNumber{}) {
- +		// Try again from the top
- +		firstHitPosition = p.findFirstHit(linenumbers.LineNumber{}, lineNumber, false)
- +	}
- +	if firstHitPosition == nil {
- +		// No match, give up
- +		return
- +	}
- +
- +	if firstHitPosition.isVisible(p) {
- +		// Already on-screen, never mind
- +		return
- +	}
- +
- +	p.scrollPosition = *firstHitPosition
- +}
- +
- +// NOTE: When we search, we do that by looping over the *input lines*, not the
- +// screen lines. That's why startPosition is a LineNumber rather than a
- +// scrollPosition.
- +//
- +// The `beforePosition` parameter is exclusive, meaning that line will not be
- +// searched.
- +//
- +// For the actual searching, this method will call _findFirstHit() in parallel
- +// on multiple cores, to help large file search performance.
-++||||||| parent of b835e9a (Fix the warnings)
-++func (p *Pager) scrollToSearchHits() {
-++	if p.searchPattern == nil {
-++		// This is not a search
-++		return
-++	}
-++
-++	firstHitPosition := p.findFirstHit(*p.scrollPosition.lineNumber(p), nil, false)
-++	if firstHitPosition == nil {
-++		// Try again from the top
-++		firstHitPosition = p.findFirstHit(linenumbers.LineNumber{}, p.scrollPosition.lineNumber(p), false)
-++	}
-++	if firstHitPosition == nil {
-++		// No match, give up
-++		return
-++	}
-++
-++	if firstHitPosition.isVisible(p) {
-++		// Already on-screen, never mind
-++		return
-++	}
-++
-++	p.scrollPosition = *firstHitPosition
-++}
-++
-++// NOTE: When we search, we do that by looping over the *input lines*, not
-++// the screen lines. That's why we're using a line number rather than a
-++// scrollPosition for searching.
-++=======
-+ // NOTE: When we search, we do that by looping over the *input lines*, not
-+ // the screen lines. That's why we're using a line number rather than a
-+ // scrollPosition for searching.
-++>>>>>>> b835e9a (Fix the warnings)
+++<<<<<<< HEAD
+ +func (p *Pager) scrollToSearchHits() {
+ +	if p.searchPattern == nil {
+ +		// This is not a search
+ +		return
+ +	}
+ +
+ +	lineNumber := p.scrollPosition.lineNumber(p)
+ +	if lineNumber == nil {
+ +		// No lines to search
+ +		return
+ +	}
+ +
+ +	firstHitPosition := p.findFirstHit(*lineNumber, nil, false)
+ +	if firstHitPosition == nil && (*lineNumber != linenumbers.LineNumber{}) {
+ +		// Try again from the top
+ +		firstHitPosition = p.findFirstHit(linenumbers.LineNumber{}, lineNumber, false)
+ +	}
+ +	if firstHitPosition == nil {
+ +		// No match, give up
+ +		return
+ +	}
+ +
+ +	if firstHitPosition.isVisible(p) {
+ +		// Already on-screen, never mind
+ +		return
+ +	}
+ +
+ +	p.scrollPosition = *firstHitPosition
+ +}
+ +
+ +// NOTE: When we search, we do that by looping over the *input lines*, not the
+ +// screen lines. That's why startPosition is a LineNumber rather than a
+ +// scrollPosition.
+ +//
+ +// The `beforePosition` parameter is exclusive, meaning that line will not be
+ +// searched.
+ +//
+ +// For the actual searching, this method will call _findFirstHit() in parallel
+ +// on multiple cores, to help large file search performance.
+++||||||| parent of b835e9a (Fix the warnings)
+++func (p *Pager) scrollToSearchHits() {
+++	if p.searchPattern == nil {
+++		// This is not a search
+++		return
+++	}
+++
+++	firstHitPosition := p.findFirstHit(*p.scrollPosition.lineNumber(p), nil, false)
+++	if firstHitPosition == nil {
+++		// Try again from the top
+++		firstHitPosition = p.findFirstHit(linenumbers.LineNumber{}, p.scrollPosition.lineNumber(p), false)
+++	}
+++	if firstHitPosition == nil {
+++		// No match, give up
+++		return
+++	}
+++
+++	if firstHitPosition.isVisible(p) {
+++		// Already on-screen, never mind
+++		return
+++	}
+++
+++	p.scrollPosition = *firstHitPosition
+++}
+++
+++// NOTE: When we search, we do that by looping over the *input lines*, not
+++// the screen lines. That's why we're using a line number rather than a
+++// scrollPosition for searching.
+++=======
++ // NOTE: When we search, we do that by looping over the *input lines*, not
++ // the screen lines. That's why we're using a line number rather than a
++ // scrollPosition for searching.
+++>>>>>>> b835e9a (Fix the warnings)
   //
   // FIXME: We should take startPosition.deltaScreenLines into account as well!
   func (p *Pager) findFirstHit(startPosition linenumbers.LineNumber, beforePosition *linenumbers.LineNumber, backwards bool) *scrollPosition {

testdata/git-diff-conflict-diff3-edit-remove.diff

@@ -0,0 +1,16 @@
+diff --cc lines.txt
+index 97515f1,f42366c..0000000
+--- lines.txt
++++ lines.txt
+@@@ -1,3 -1,6 +1,11 @@@
+  First line
+++<<<<<<< HEAD
+++||||||| 3b5ce9b
+++Caesar
+++=======
++ Adam
++ Bertil
++ Caesar
+++>>>>>>> branch
+  Last line
+