remove single directory option

helix-term/src/ui/editor.rs

@@ -25,7 +25,7 @@ use helix_core::{
 use helix_view::{
     annotations::diagnostics::DiagnosticFilter,
     document::{Mode, SCRATCH_BUFFER_NAME},
-    editor::{BufferLineDirectories, CompleteAction, CursorShapeConfig},
+    editor::{CompleteAction, CursorShapeConfig},
     graphics::{Color, CursorKind, Modifier, Rect, Style},
     input::{KeyEvent, MouseButton, MouseEvent, MouseEventKind},
     keyboard::{KeyCode, KeyModifiers},
@@ -633,90 +633,85 @@ impl EditorView {
         let current_doc = view!(editor).doc;
 
         let mut documents: HashMap<_, _>;
-        let fnames: HashMap<_, _> = match &editor.config().bufferline_directories {
+        let fnames: HashMap<_, _> = if editor.config().bufferline_show_directories {
-            BufferLineDirectories::Smart => {
+            documents = editor
-                documents = editor
-                    .documents()
-                    .map(|doc| {
-                        (
-                            doc.id(),
-                            doc.path().map(|p| {
-                                let mut p = p.clone();
-                                let f = PathBuf::from(p.file_name().unwrap_or_default());
-                                p.pop();
-                                (f, p)
-                            }),
-                        )
-                    })
-                    .collect();
-                let mut ids: Vec<_> = documents.keys().copied().collect();
-                let mut to_remove: Vec<usize> = Vec::with_capacity(ids.len());
-                while !ids.is_empty() {
-                    for (idx, id) in ids.iter().enumerate() {
-                        let Some((current, full)) = &documents[id] else {
-                            log::info!("to remove scratch");
-                            to_remove.push(idx);
-                            continue;
-                        };
-                        if documents
-                            .iter()
-                            .filter_map(|(id, o)| o.as_ref().map(|(p, _)| (id, p)))
-                            .all(|(i, p)| p != current || i == id)
-                            || full.as_os_str().is_empty()
-                        {
-                            log::info!("to remove idx");
-                            to_remove.push(idx);
-                        }
-                    }
-
-                    for idx in to_remove.iter().rev() {
-                        log::info!("removed idx");
-                        ids.remove(*idx);
-                    }
-                    to_remove.clear();
-
-                    for id in &ids {
-                        let Some((current, mut full)) = documents.remove(id).flatten() else {
-                            documents.insert(*id, None);
-                            continue;
-                        };
-                        let mut new = PathBuf::from(full.file_name().unwrap_or_default());
-                        new.push(current);
-                        full.pop();
-                        documents.insert(*id, Some((new, full)));
-                    }
-                }
-                log::info!("completed cycle");
-                documents
-                    .iter()
-                    .map(|(id, op)| {
-                        (
-                            *id,
-                            op.as_ref()
-                                .map(|(p, _)| p.to_str().unwrap_or_default())
-                                .unwrap_or(SCRATCH_BUFFER_NAME),
-                        )
-                    })
-                    .collect()
-            }
-            bufferline_directories => editor
                 .documents()
                 .map(|doc| {
                     (
                         doc.id(),
-                        if *bufferline_directories == BufferLineDirectories::Never {
+                        doc.path().map(|p| {
-                            doc.path()
+                            let mut p = p.clone();
-                                .unwrap_or(&scratch)
+                            let f = PathBuf::from(p.file_name().unwrap_or_default());
-                                .file_name()
+                            p.pop();
-                                .unwrap_or_default()
+                            (f, p)
-                                .to_str()
+                        }),
-                                .unwrap_or_default()
-                        } else {
-                            doc.path().unwrap_or(&scratch).to_str().unwrap_or_default()
-                        },
                     )
                 })
-                .collect(),
+                .collect();
+            let mut ids: Vec<_> = documents.keys().copied().collect();
+            let mut to_remove: Vec<usize> = Vec::with_capacity(ids.len());
+            while !ids.is_empty() {
+                for (idx, id) in ids.iter().enumerate() {
+                    let Some((current, full)) = &documents[id] else {
+                        log::info!("to remove scratch");
+                        to_remove.push(idx);
+                        continue;
+                    };
+                    if documents
+                        .iter()
+                        .filter_map(|(id, o)| o.as_ref().map(|(p, _)| (id, p)))
+                        .all(|(i, p)| p != current || i == id)
+                        || full.as_os_str().is_empty()
+                    {
+                        log::info!("to remove idx");
+                        to_remove.push(idx);
+                    }
+                }
+
+                for idx in to_remove.iter().rev() {
+                    log::info!("removed idx");
+                    ids.remove(*idx);
+                }
+                to_remove.clear();
+
+                for id in &ids {
+                    let Some((current, mut full)) = documents.remove(id).flatten() else {
+                        documents.insert(*id, None);
+                        continue;
+                    };
+                    let mut new = PathBuf::from(full.file_name().unwrap_or_default());
+                    new.push(current);
+                    full.pop();
+                    documents.insert(*id, Some((new, full)));
+                }
+            }
+            log::info!("completed cycle");
+            documents
+                .iter()
+                .map(|(id, op)| {
+                    (
+                        *id,
+                        op.as_ref()
+                            .map(|(p, _)| p.to_str().unwrap_or_default())
+                            .unwrap_or(SCRATCH_BUFFER_NAME),
+                    )
+                })
+                .collect()
+        } else {
+            editor
+                .documents()
+                .map(|doc| {
+                    (
+                        doc.id(),
+                        doc.path()
+                            .unwrap_or(&scratch)
+                            .file_name()
+                            .unwrap_or_default()
+                            .to_str()
+                            .unwrap_or_default(),
+                    )
+                })
+                .collect()
         };
 
         for doc in editor.documents() {

helix-view/src/editor.rs

@@ -333,7 +333,7 @@ pub struct Config {
     /// Persistently display open buffers along the top
     pub bufferline: BufferLine,
     /// Show the parent directory of files in the bufferline.
-    pub bufferline_directories: BufferLineDirectories,
+    pub bufferline_show_directories: bool,
     /// Vertical indent width guides.
     pub indent_guides: IndentGuidesConfig,
     /// Whether to color modes with different colors. Defaults to `false`.
@@ -683,19 +683,6 @@ pub enum BufferLine {
     Multiple,
 }
 
-/// bufferline directory render modes
-#[derive(Debug, Default, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-pub enum BufferLineDirectories {
-    /// Only render filenames
-    #[default]
-    Never,
-    /// Always render one parent directory
-    One,
-    /// Only render directories for files with the same name
-    Smart,
-}
-
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub enum LineNumber {
@@ -1014,7 +1001,7 @@ impl Default for Config {
             rulers: Vec::new(),
             whitespace: WhitespaceConfig::default(),
             bufferline: BufferLine::default(),
-            bufferline_directories: BufferLineDirectories::default(),
+            bufferline_show_directories: false,
             indent_guides: IndentGuidesConfig::default(),
             color_modes: false,
             soft_wrap: SoftWrap {