From 25336484198fc2989f6e423a869b6c1090ff17e3 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Tue, 2 Aug 2022 11:41:51 -0700
Subject: [PATCH] Fix selection positions in tab w/ multiple non-empty
 selections on the same line

Co-authored-by: Julia Risley <floc@unpromptedtirade.com>
---
 crates/editor/src/editor.rs | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 4ecfb472e5..da8f7d921d 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -2925,8 +2925,8 @@ impl Editor {
         for selection in &mut selections {
             if selection.start.row != prev_edited_row {
                 row_delta = 0;
-                prev_edited_row = selection.end.row;
             }
+            prev_edited_row = selection.end.row;
 
             if selection.is_empty() {
                 let cursor = selection.head();
@@ -2998,10 +2998,10 @@ impl Editor {
             if selection.start.row != prev_edited_row {
                 row_delta = 0;
             }
+            prev_edited_row = selection.end.row;
 
             row_delta =
                 Self::indent_selection(buffer, &snapshot, selection, &mut edits, row_delta, cx);
-            prev_edited_row = selection.end.row;
         }
 
         self.transact(cx, |this, cx| {
@@ -3075,7 +3075,11 @@ impl Editor {
             }
         }
 
-        delta_for_end_row
+        if selection.start.row == selection.end.row {
+            delta_for_start_row + delta_for_end_row
+        } else {
+            delta_for_end_row
+        }
     }
 
     pub fn outdent(&mut self, _: &Outdent, cx: &mut ViewContext<Self>) {
@@ -8001,6 +8005,16 @@ mod tests {
               |🏀  |🏀  |efg
            d  |
         "});
+
+        cx.set_state(indoc! {"
+            a
+            [🏀}🏀[🏀}🏀[🏀}
+        "});
+        cx.update_editor(|e, cx| e.tab(&Tab, cx));
+        cx.assert_editor_state(indoc! {"
+            a
+               [🏀}🏀[🏀}🏀[🏀}
+        "});
     }
 
     #[gpui::test]