editor: Hide file blame on editor cancel (ESC) (#42436)

Release Notes: - N/A *or* Added/Fixed/Improved ...
2025-11-11 13:56:04 +00:00
parent 10d5d78ded
commit 38e2c7aa66
1 changed files with 8 additions and 1 deletions
@@ -4076,17 +4076,24 @@ impl Editor {
        self.selection_mark_mode = false;
        self.selection_drag_state = SelectionDragState::None;

+        if self.dismiss_menus_and_popups(true, window, cx) {
+            cx.notify();
+            return;
+        }
        if self.clear_expanded_diff_hunks(cx) {
            cx.notify();
            return;
        }
-        if self.dismiss_menus_and_popups(true, window, cx) {
+        if self.show_git_blame_gutter {
+            self.show_git_blame_gutter = false;
+            cx.notify();
            return;
        }

        if self.mode.is_full()
            && self.change_selections(Default::default(), window, cx, |s| s.try_cancel())
        {
+            cx.notify();
            return;
        }