From 774a8e1341e56efea84984e4b67183a28c93bbba Mon Sep 17 00:00:00 2001
From: Nathan Vegdahl <cessen@cessen.com>
Date: Sat, 17 Jul 2021 10:57:58 -0700
Subject: [PATCH] Update change-case commands to work with gap indexing.

---
 helix-term/src/commands.rs | 63 ++++++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 27 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 74b54db7dae08..63a6ff2d6978a 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -786,24 +786,27 @@ fn replace(cx: &mut Context) {
 
 fn switch_case(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
-    let transaction =
-        Transaction::change_by_selection(doc.text(), doc.selection(view.id), |range| {
-            let text: Tendril = range
-                .fragment(doc.text().slice(..))
-                .chars()
-                .flat_map(|ch| {
-                    if ch.is_lowercase() {
-                        ch.to_uppercase().collect()
-                    } else if ch.is_uppercase() {
-                        ch.to_lowercase().collect()
-                    } else {
-                        vec![ch]
-                    }
-                })
-                .collect();
+    let selection = doc
+        .selection(view.id)
+        .clone()
+        .min_width_1(doc.text().slice(..));
+    let transaction = Transaction::change_by_selection(doc.text(), &selection, |range| {
+        let text: Tendril = range
+            .fragment(doc.text().slice(..))
+            .chars()
+            .flat_map(|ch| {
+                if ch.is_lowercase() {
+                    ch.to_uppercase().collect()
+                } else if ch.is_uppercase() {
+                    ch.to_lowercase().collect()
+                } else {
+                    vec![ch]
+                }
+            })
+            .collect();
 
-            (range.from(), range.to() + 1, Some(text))
-        });
+        (range.from(), range.to() + 1, Some(text))
+    });
 
     doc.apply(&transaction, view.id);
     doc.append_changes_to_history(view.id);
@@ -811,12 +814,15 @@ fn switch_case(cx: &mut Context) {
 
 fn switch_to_uppercase(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
-    let transaction =
-        Transaction::change_by_selection(doc.text(), doc.selection(view.id), |range| {
-            let text: Tendril = range.fragment(doc.text().slice(..)).to_uppercase().into();
+    let selection = doc
+        .selection(view.id)
+        .clone()
+        .min_width_1(doc.text().slice(..));
+    let transaction = Transaction::change_by_selection(doc.text(), &selection, |range| {
+        let text: Tendril = range.fragment(doc.text().slice(..)).to_uppercase().into();
 
-            (range.from(), range.to() + 1, Some(text))
-        });
+        (range.from(), range.to() + 1, Some(text))
+    });
 
     doc.apply(&transaction, view.id);
     doc.append_changes_to_history(view.id);
@@ -824,12 +830,15 @@ fn switch_to_uppercase(cx: &mut Context) {
 
 fn switch_to_lowercase(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
-    let transaction =
-        Transaction::change_by_selection(doc.text(), doc.selection(view.id), |range| {
-            let text: Tendril = range.fragment(doc.text().slice(..)).to_lowercase().into();
+    let selection = doc
+        .selection(view.id)
+        .clone()
+        .min_width_1(doc.text().slice(..));
+    let transaction = Transaction::change_by_selection(doc.text(), &selection, |range| {
+        let text: Tendril = range.fragment(doc.text().slice(..)).to_lowercase().into();
 
-            (range.from(), range.to() + 1, Some(text))
-        });
+        (range.from(), range.to() + 1, Some(text))
+    });
 
     doc.apply(&transaction, view.id);
     doc.append_changes_to_history(view.id);