When clicking on a hunk expand it, do not move the caret (#11350)

Kirill Bulatov created 2 years ago

Release Notes:

- N/A

Change summary

crates/editor/src/element.rs | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)

Detailed changes

crates/editor/src/element.rs

@@ -427,10 +427,12 @@ impl EditorElement {
         let mut click_count = event.click_count;
         let mut modifiers = event.modifiers;
 
-        if gutter_hitbox.is_hovered(cx) {
-            click_count = 3; // Simulate triple-click when clicking the gutter to select lines
-        } else if let Some(hovered_hunk) = hovered_hunk {
+        if let Some(hovered_hunk) = hovered_hunk {
             editor.expand_diff_hunk(None, hovered_hunk, cx);
+            cx.notify();
+            return;
+        } else if gutter_hitbox.is_hovered(cx) {
+            click_count = 3; // Simulate triple-click when clicking the gutter to select lines
         } else if !text_hitbox.is_hovered(cx) {
             return;
         }