From 28d2d6880462509f0d3131eb2eb928bb8859e058 Mon Sep 17 00:00:00 2001
From: Nathan Vegdahl
Date: Fri, 2 Jul 2021 09:51:29 -0700
Subject: Make horizontal selection movement work properly.

---
 helix-term/src/commands.rs | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'helix-term')

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index e76962f0..5ab0926a 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2193,7 +2193,25 @@ fn goto_mode(cx: &mut Context) {
 }
 
 fn select_mode(cx: &mut Context) {
-    doc_mut!(cx.editor).mode = Mode::Select;
+    let (view, doc) = current!(cx.editor);
+
+    // Make sure all selections are at least 1-wide.
+    // (With the exception of being in an empty document, of course.)
+    doc.set_selection(
+        view.id,
+        doc.selection(view.id).clone().transform(|range| {
+            if range.is_empty() && range.head == doc.text().len_chars() {
+                Range::new(
+                    graphemes::prev_grapheme_boundary(doc.text().slice(..), range.anchor),
+                    range.head,
+                )
+            } else {
+                range.min_width_1(doc.text().slice(..))
+            }
+        }),
+    );
+
+    doc.mode = Mode::Select;
 }
 
 fn exit_select_mode(cx: &mut Context) {
-- 
cgit v1.2.3-70-g09d2