From e8298a398c6b018c49025ff3f885e4f5f40b01fd Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Wed, 7 Apr 2021 16:57:58 +0900
Subject: Fix selection rendering, it would be off by 1 if reverse.

---
 helix-term/src/ui/editor.rs | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'helix-term/src')

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 1317a5e7..67f5cf84 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -233,19 +233,8 @@ impl EditorView {
                 // TODO: render also if only one of the ranges is in viewport
                 let mut start = view.screen_coords_at_pos(doc, text, selection.anchor);
                 let mut end = view.screen_coords_at_pos(doc, text, selection.head);
-
-                // cursor
-                if let Some(end) = end {
-                    surface.set_style(
-                        Rect::new(
-                            viewport.x + end.col as u16,
-                            viewport.y + end.row as u16,
-                            1,
-                            1,
-                        ),
-                        cursor_style,
-                    );
-                }
+                   
+                let head = end;
 
                 if selection.head < selection.anchor {
                     std::mem::swap(&mut start, &mut end);
@@ -260,7 +249,7 @@ impl EditorView {
                         Rect::new(
                             viewport.x + start.col as u16,
                             viewport.y + start.row as u16,
-                            (end.col - start.col) as u16,
+                            (end.col - start.col) as u16 + 1,
                             1,
                         ),
                         selection_style,
@@ -293,6 +282,19 @@ impl EditorView {
                         selection_style,
                     );
                 }
+                    
+                // cursor
+                if let Some(head) = head {
+                    surface.set_style(
+                        Rect::new(
+                            viewport.x + head.col as u16,
+                            viewport.y + head.row as u16,
+                            1,
+                            1,
+                        ),
+                        cursor_style,
+                    );
+                }
             }
         }
 
-- 
cgit v1.2.3-70-g09d2