fix(explore):

- preview panics when term height becomes too small
- preview content not sorted

changes

@@ -37,6 +37,10 @@ New:
 - [x] Ctrl-o should work for 'h', 'gg', 'ge', etc
 - [x] add unit test for TreeView
 - [x] explorer(help): overflow
+- [x] n/N wrap around
+- [x] fix(filter): crash
+- [x] fix(explorer/preview): panic if not tall enough
+- [x] explorer(preview): content not sorted
 - [] add integration test for Explorer
 - [] search highlight matching word
 - [] Error didn't clear
@@ -45,5 +49,4 @@ New:
 - [] Fix panic bugs (see github comments)
 - [] Sticky ancestors
 - [] explorer(preview): overflow where bufferline is there
-- [] explorer(preview): content not sorted
 - [] explorer(preview): implement scrolling C-j/C-k

helix-term/src/ui/explore.rs

@@ -13,9 +13,9 @@ use helix_view::{
     theme::Modifier,
     DocumentId, Editor,
 };
-use std::borrow::Cow;
 use std::cmp::Ordering;
 use std::path::{Path, PathBuf};
+use std::{borrow::Cow, fs::DirEntry};
 use tui::{
     buffer::Buffer as Surface,
     widgets::{Block, Borders, Widget},
@@ -27,24 +27,20 @@ macro_rules! get_theme {
     };
 }
 
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(PartialEq, Eq, PartialOrd, Ord, Debug, Clone, Copy)]
 enum FileType {
     File,
     Folder,
     Root,
 }
 
-#[derive(Debug, Clone)]
+#[derive(PartialEq, Eq, Debug, Clone)]
 struct FileInfo {
     file_type: FileType,
     path: PathBuf,
 }
 
 impl FileInfo {
-    fn new(path: PathBuf, file_type: FileType) -> Self {
-        Self { path, file_type }
-    }
-
     fn root(path: PathBuf) -> Self {
         Self {
             file_type: FileType::Root,
@@ -63,9 +59,13 @@ impl FileInfo {
     }
 }
 
-impl TreeViewItem for FileInfo {
-    type Params = State;
+impl PartialOrd for FileInfo {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
 
+impl Ord for FileInfo {
     fn cmp(&self, other: &Self) -> Ordering {
         use FileType::*;
         match (self.file_type, other.file_type) {
@@ -85,6 +85,10 @@ impl TreeViewItem for FileInfo {
         }
         self.path.cmp(&other.path)
     }
+}
+
+impl TreeViewItem for FileInfo {
+    type Params = State;
 
     fn get_children(&self) -> Result<Vec<Self>> {
         match self.file_type {
@@ -93,18 +97,7 @@ impl TreeViewItem for FileInfo {
         };
         let ret: Vec<_> = std::fs::read_dir(&self.path)?
             .filter_map(|entry| entry.ok())
-            .filter_map(|entry| {
-                entry.metadata().ok().map(|meta| {
-                    let file_type = match meta.is_dir() {
-                        true => FileType::Folder,
-                        false => FileType::File,
-                    };
-                    Self {
-                        file_type,
-                        path: self.path.join(entry.file_name()),
-                    }
-                })
-            })
+            .filter_map(|entry| dir_entry_to_file_info(entry, &self.path))
             .collect();
         Ok(ret)
     }
@@ -121,6 +114,19 @@ impl TreeViewItem for FileInfo {
     }
 }
 
+fn dir_entry_to_file_info(entry: DirEntry, path: &PathBuf) -> Option<FileInfo> {
+    entry.metadata().ok().map(|meta| {
+        let file_type = match meta.is_dir() {
+            true => FileType::Folder,
+            false => FileType::File,
+        };
+        FileInfo {
+            file_type,
+            path: path.join(entry.file_name()),
+        }
+    })
+}
+
 #[derive(Clone, Debug)]
 enum PromptAction {
     CreateFolder { folder_path: PathBuf },
@@ -250,7 +256,11 @@ impl Explorer {
 
     fn render_preview(&mut self, area: Rect, surface: &mut Surface, editor: &Editor) {
         let item = self.tree.current().item();
-        let head_area = render_block(area.clip_bottom(area.height - 2), surface, Borders::BOTTOM);
+        let head_area = render_block(
+            area.clip_bottom(area.height.saturating_sub(2)),
+            surface,
+            Borders::BOTTOM,
+        );
         let path_str = format!("{}", item.path.display());
         surface.set_stringn(
             head_area.x,
@@ -518,13 +528,17 @@ impl Explorer {
             } else {
                 const PREVIEW_AREA_MAX_WIDTH: u16 = 90;
                 const PREVIEW_AREA_MAX_HEIGHT: u16 = 30;
-                let preview_area_width = (area.width - side_area.width).min(PREVIEW_AREA_MAX_WIDTH);
+                let preview_area_width =
+                    (area.width.saturating_sub(side_area.width)).min(PREVIEW_AREA_MAX_WIDTH);
                 let preview_area_height = area.height.min(PREVIEW_AREA_MAX_HEIGHT);
 
                 let preview_area = match position {
                     ExplorerPositionEmbed::Left => area.clip_left(side_area.width),
                     ExplorerPositionEmbed::Right => (Rect {
-                        x: area.width - side_area.width - preview_area_width,
+                        x: area
+                            .width
+                            .saturating_sub(side_area.width)
+                            .saturating_sub(preview_area_width),
                         ..area
                     })
                     .clip_right(side_area.width),
@@ -535,7 +549,7 @@ impl Explorer {
                 }
                 let y = self.tree.winline().saturating_sub(1) as u16;
                 let y = if (preview_area_height + y) > preview_area.height {
-                    preview_area.height - preview_area_height
+                    preview_area.height.saturating_sub(preview_area_height)
                 } else {
                     y
                 };
@@ -761,12 +775,12 @@ impl Component for Explorer {
         let (x, y) = if config.is_overlay() {
             let colw = self.column_width as u16;
             if area.width > colw {
-                (area.x + colw + 2, area.y + area.height - 2)
+                (area.x + colw + 2, area.y + area.height.saturating_sub(2))
             } else {
                 return (None, CursorKind::Hidden);
             }
         } else {
-            (area.x, area.y + area.height - 1)
+            (area.x, area.y + area.height.saturating_sub(1))
         };
         prompt.cursor(Rect::new(x, y, area.width, 1), editor)
     }
@@ -775,16 +789,24 @@ impl Component for Explorer {
 fn get_preview(p: impl AsRef<Path>, max_line: usize) -> Result<Vec<String>> {
     let p = p.as_ref();
     if p.is_dir() {
-        return Ok(p
+        let mut entries = p
             .read_dir()?
-            .filter_map(|entry| entry.ok())
+            .filter_map(|entry| {
+                entry
+                    .ok()
+                    .map(|entry| dir_entry_to_file_info(entry, &p.to_path_buf()))
+                    .flatten()
+            })
             .take(max_line)
-            .map(|entry| {
-                if entry.file_type().map(|ft| ft.is_dir()).unwrap_or(false) {
-                    format!("{}/", entry.file_name().to_string_lossy())
-                } else {
-                    format!("{}", entry.file_name().to_string_lossy())
-                }
+            .collect::<Vec<_>>();
+
+        entries.sort();
+
+        return Ok(entries
+            .into_iter()
+            .map(|entry| match entry.file_type {
+                FileType::Folder => format!("{}/", entry.name()),
+                _ => entry.name(),
             })
             .collect());
     }

helix-term/src/ui/tree.rs

@@ -16,13 +16,13 @@ use tui::buffer::Buffer as Surface;
 
 use super::Prompt;
 
-pub trait TreeViewItem: Sized {
+pub trait TreeViewItem: Sized + Ord {
     type Params;
 
     // fn text(&self, cx: &mut Context, selected: bool, params: &mut Self::Params) -> Spans;
     fn name(&self) -> String;
     fn is_parent(&self) -> bool;
-    fn cmp(&self, other: &Self) -> Ordering;
+    // fn cmp(&self, other: &Self) -> Ordering;
 
     fn filter(&self, s: &str) -> bool {
         self.name().to_lowercase().contains(&s.to_lowercase())
@@ -36,7 +36,8 @@ fn tree_item_cmp<T: TreeViewItem>(item1: &T, item2: &T) -> Ordering {
 }
 
 fn vec_to_tree<T: TreeViewItem>(mut items: Vec<T>) -> Vec<Tree<T>> {
-    items.sort_by(tree_item_cmp);
+    items.sort();
+    // items.sort_by(tree_item_cmp);
     index_elems(
         0,
         items
@@ -1149,7 +1150,7 @@ mod test_tree_view {
     use super::{vec_to_tree, TreeView, TreeViewItem};
     use pretty_assertions::assert_eq;
 
-    #[derive(Clone)]
+    #[derive(PartialEq, Eq, PartialOrd, Ord, Clone)]
     struct Item<'a> {
         name: &'a str,
     }
@@ -1169,10 +1170,6 @@ mod test_tree_view {
             self.name.len() > 2
         }
 
-        fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-            self.name.cmp(other.name)
-        }
-
         fn get_children(&self) -> anyhow::Result<Vec<Self>> {
             if self.is_parent() {
                 let (left, right) = self.name.split_at(self.name.len() / 2);
@@ -1181,6 +1178,10 @@ mod test_tree_view {
                 Ok(vec![])
             }
         }
+
+        fn filter(&self, s: &str) -> bool {
+            self.name().to_lowercase().contains(&s.to_lowercase())
+        }
     }
 
     fn dummy_tree_view<'a>() -> TreeView<Item<'a>> {