chore: skip the selection indicator for wrapped lines

jonathanj · jonathanj · commit e01f6b705550 · 2025-05-02T23:28:22.000+02:00
diff --git a/src/screen/mod.rs b/src/screen/mod.rs
@@ -354,11 +354,9 @@ impl Widget for &Screen {
                 if self.line_index[self.cursor] == line.item_index {
                     buf.set_style(indented_line_area, &style.selection_line);
                 } else {
-                    for i in 0..height {
-                        buf[(SCREEN_GUTTER_COLUMN_CURSOR, line_index + i)]
-                            .set_char(style.selection_bar.symbol)
-                            .set_style(&style.selection_bar);
-                    }
+                    buf[(SCREEN_GUTTER_COLUMN_CURSOR, line_index)]
+                        .set_char(style.selection_bar.symbol)
+                        .set_style(&style.selection_bar);
                 }
             }
 
@@ -380,11 +378,9 @@ impl Widget for &Screen {
             }
 
             if self.line_index[self.cursor] == line.item_index {
-                for i in 0..height {
-                    buf[(SCREEN_GUTTER_COLUMN_CURSOR, line_index + i as u16)]
-                        .set_char(style.cursor.symbol)
-                        .set_style(&style.cursor);
-                }
+                buf[(SCREEN_GUTTER_COLUMN_CURSOR, line_index)]
+                    .set_char(style.cursor.symbol)
+                    .set_style(&style.cursor);
             }
 
             line_index += height;
diff --git a/src/tests/snapshots/gitu__tests__wrap__recent_commits.snap b/src/tests/snapshots/gitu__tests__wrap__recent_commits.snap
@@ -6,7 +6,7 @@ expression: ctx.redact_buffer()
                                                                                 |
   Recent commits                                                                |
 ▌ ebac8f4 main This is a long line that is longer than 80 columns, to ensure    |
-▌↪that it definitely wraps on to the line below it                              |
+ ↪that it definitely wraps on to the line below it                              |
                                                                                 |
                                                                                 |
                                                                                 |
@@ -22,4 +22,4 @@ expression: ctx.redact_buffer()
                                                                                 |
                                                                                 |
                                                                                 |
-styles_hash: 556aa06940e8aa8
+styles_hash: 76a85750ae78d878
diff --git a/src/tests/snapshots/gitu__tests__wrap__show.snap b/src/tests/snapshots/gitu__tests__wrap__show.snap
@@ -13,7 +13,7 @@ expression: ctx.redact_buffer()
   added      firstfile                                                          |
   @@ -0,0 +1 @@                                                                 |
 ▌ +This is a long line that is longer than 80 columns, to ensure that it        |
-▌↪definitely wraps on to the line below it                                      |
+ ↪definitely wraps on to the line below it                                      |
                                                                                 |
                                                                                 |
                                                                                 |
@@ -22,4 +22,4 @@ expression: ctx.redact_buffer()
                                                                                 |
                                                                                 |
                                                                                 |
-styles_hash: 9ec7ed8a8eda4208
+styles_hash: eb4b8705c9e937b9
diff --git a/src/tests/snapshots/gitu__tests__wrap__staged_changes.snap b/src/tests/snapshots/gitu__tests__wrap__staged_changes.snap
@@ -8,7 +8,7 @@ expression: ctx.redact_buffer()
   added      testfile                                                           |
 ▌ @@ -0,0 +1 @@                                                                 |
 ▌ +This is a long line that is longer than 80 columns, to ensure that it        |
-▌↪definitely wraps on to the line below it                                      |
+ ↪definitely wraps on to the line below it                                      |
                                                                                 |
   Recent commits                                                                |
                                                                                 |
@@ -22,4 +22,4 @@ expression: ctx.redact_buffer()
                                                                                 |
                                                                                 |
                                                                                 |
-styles_hash: 2fce71be5221797c
+styles_hash: 5336fe13ab979e46
diff --git a/src/tests/snapshots/gitu__tests__wrap__unstaged_changes.snap b/src/tests/snapshots/gitu__tests__wrap__unstaged_changes.snap
@@ -10,7 +10,7 @@ expression: ctx.redact_buffer()
   -testing                                                                      |
   -testtest                                                                     |
 ▌ +This is a long line that is longer than 80 columns, to ensure that it        |
-▌↪definitely wraps on to the line below it                                      |
+ ↪definitely wraps on to the line below it                                      |
                                                                                 |
   Recent commits                                                                |
   f431046 main add testfile                                                     |
@@ -22,4 +22,4 @@ expression: ctx.redact_buffer()
                                                                                 |
                                                                                 |
                                                                                 |
-styles_hash: 5ec29d64b309dd10
+styles_hash: 6816abe8c2f3c32f

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ expression: ctx.redact_buffer()`
`6`	`6`	`\|`
`7`	`7`	`Recent commits \|`
`8`	`8`	`▌ ebac8f4 main This is a long line that is longer than 80 columns, to ensure \|`
`9`		`-▌↪that it definitely wraps on to the line below it \|`
	`9`	`+ ↪that it definitely wraps on to the line below it \|`
`10`	`10`	`\|`
`11`	`11`	`\|`
`12`	`12`	`\|`
`@@ -22,4 +22,4 @@ expression: ctx.redact_buffer()`
`22`	`22`	`\|`
`23`	`23`	`\|`
`24`	`24`	`\|`
`25`		`-styles_hash: 556aa06940e8aa8`
	`25`	`+styles_hash: 76a85750ae78d878`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ expression: ctx.redact_buffer()`
`13`	`13`	`added firstfile \|`
`14`	`14`	`@@ -0,0 +1 @@ \|`
`15`	`15`	`▌ +This is a long line that is longer than 80 columns, to ensure that it \|`
`16`		`-▌↪definitely wraps on to the line below it \|`
	`16`	`+ ↪definitely wraps on to the line below it \|`
`17`	`17`	`\|`
`18`	`18`	`\|`
`19`	`19`	`\|`
`@@ -22,4 +22,4 @@ expression: ctx.redact_buffer()`
`22`	`22`	`\|`
`23`	`23`	`\|`
`24`	`24`	`\|`
`25`		`-styles_hash: 9ec7ed8a8eda4208`
	`25`	`+styles_hash: eb4b8705c9e937b9`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ expression: ctx.redact_buffer()`
`8`	`8`	`added testfile \|`
`9`	`9`	`▌ @@ -0,0 +1 @@ \|`
`10`	`10`	`▌ +This is a long line that is longer than 80 columns, to ensure that it \|`
`11`		`-▌↪definitely wraps on to the line below it \|`
	`11`	`+ ↪definitely wraps on to the line below it \|`
`12`	`12`	`\|`
`13`	`13`	`Recent commits \|`
`14`	`14`	`\|`
`@@ -22,4 +22,4 @@ expression: ctx.redact_buffer()`
`22`	`22`	`\|`
`23`	`23`	`\|`
`24`	`24`	`\|`
`25`		`-styles_hash: 2fce71be5221797c`
	`25`	`+styles_hash: 5336fe13ab979e46`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ expression: ctx.redact_buffer()`
`10`	`10`	`-testing \|`
`11`	`11`	`-testtest \|`
`12`	`12`	`▌ +This is a long line that is longer than 80 columns, to ensure that it \|`
`13`		`-▌↪definitely wraps on to the line below it \|`
	`13`	`+ ↪definitely wraps on to the line below it \|`
`14`	`14`	`\|`
`15`	`15`	`Recent commits \|`
`16`	`16`	`f431046 main add testfile \|`
`@@ -22,4 +22,4 @@ expression: ctx.redact_buffer()`
`22`	`22`	`\|`
`23`	`23`	`\|`
`24`	`24`	`\|`
`25`		`-styles_hash: 5ec29d64b309dd10`
	`25`	`+styles_hash: 6816abe8c2f3c32f`