vim: Add vim counts and vim shortcuts to project_panel (#36653)

Closes #10930 Closes #11353 Release Notes: - Adds commands to project_panel - `ctrl-u` scrolls the project_panel up half of the visible entries - `ctrl-d` scrolls the project_panel down half of the visible entries - `z z` scrolls current selection to center of window - `z t` scrolls current selection to top of window - `z b` scrolls current selection to bottom of window - `{num} j` and `{num} k` now move up and down with a count
2025-09-29 15:53:59 -06:00
parent fbb4dcf2b1
commit 9c60bc3837
6 changed files with 183 additions and 18 deletions
@@ -88,6 +88,10 @@ pub enum ScrollStrategy {
    /// May not be possible if there's not enough list items above the item scrolled to:
    /// in this case, the element will be placed at the closest possible position.
    Center,
+    /// Attempt to place the element at the bottom of the list's viewport.
+    /// May not be possible if there's not enough list items above the item scrolled to:
+    /// in this case, the element will be placed at the closest possible position.
+    Bottom,
 }

 #[derive(Clone, Copy, Debug)]
@@ -99,6 +103,7 @@ pub struct DeferredScrollToItem {
    pub strategy: ScrollStrategy,
    /// The offset in number of items
    pub offset: usize,
+    pub scroll_strict: bool,
 }

 #[derive(Clone, Debug, Default)]
@@ -133,12 +138,23 @@ impl UniformListScrollHandle {
        })))
    }

-    /// Scroll the list to the given item index.
+    /// Scroll the list so that the given item index is onscreen.
    pub fn scroll_to_item(&self, ix: usize, strategy: ScrollStrategy) {
        self.0.borrow_mut().deferred_scroll_to_item = Some(DeferredScrollToItem {
            item_index: ix,
            strategy,
            offset: 0,
+            scroll_strict: false,
+        });
+    }
+
+    /// Scroll the list so that the given item index is at scroll strategy position.
+    pub fn scroll_to_item_strict(&self, ix: usize, strategy: ScrollStrategy) {
+        self.0.borrow_mut().deferred_scroll_to_item = Some(DeferredScrollToItem {
+            item_index: ix,
+            strategy,
+            offset: 0,
+            scroll_strict: true,
        });
    }

@@ -152,6 +168,7 @@ impl UniformListScrollHandle {
            item_index: ix,
            strategy,
            offset,
+            scroll_strict: false,
        });
    }

@@ -368,24 +385,35 @@ impl Element for UniformList {
                            updated_scroll_offset.y = -(item_bottom - list_height) - padding.bottom;
                        }

-                        match deferred_scroll.strategy {
-                            ScrollStrategy::Top => {}
-                            ScrollStrategy::Center => {
-                                if scrolled_to_top {
+                        if deferred_scroll.scroll_strict
+                            || (scrolled_to_top
+                                && (item_top < scroll_top + offset_pixels
+                                    || item_bottom > scroll_top + list_height))
+                        {
+                            match deferred_scroll.strategy {
+                                ScrollStrategy::Top => {
+                                    updated_scroll_offset.y = -item_top
+                                        .max(Pixels::ZERO)
+                                        .min(content_height - list_height)
+                                        .max(Pixels::ZERO);
+                                }
+                                ScrollStrategy::Center => {
                                    let item_center = item_top + item_height / 2.0;

                                    let viewport_height = list_height - offset_pixels;
                                    let viewport_center = offset_pixels + viewport_height / 2.0;
                                    let target_scroll_top = item_center - viewport_center;

-                                    if item_top < scroll_top + offset_pixels
-                                        || item_bottom > scroll_top + list_height
-                                    {
-                                        updated_scroll_offset.y = -target_scroll_top
-                                            .max(Pixels::ZERO)
-                                            .min(content_height - list_height)
-                                            .max(Pixels::ZERO);
-                                    }
+                                    updated_scroll_offset.y = -target_scroll_top
+                                        .max(Pixels::ZERO)
+                                        .min(content_height - list_height)
+                                        .max(Pixels::ZERO);
+                                }
+                                ScrollStrategy::Bottom => {
+                                    updated_scroll_offset.y = -(item_bottom - list_height)
+                                        .max(Pixels::ZERO)
+                                        .min(content_height - list_height)
+                                        .max(Pixels::ZERO);
                                }
                            }
                        }