Avoid renaming existing element

helix-editor · Dec 28, 2022 · a568fb0 · a568fb0
1 parent 5da164f
commit a568fb0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
@@ -139,8 +139,8 @@ where
     match element_id {
         helix_view::editor::StatusLineElement::Mode => render_mode,
         helix_view::editor::StatusLineElement::Spinner => render_lsp_spinner,
+        helix_view::editor::StatusLineElement::FileBaseName => render_file_base_name,
         helix_view::editor::StatusLineElement::FileName => render_file_name,
-        helix_view::editor::StatusLineElement::FilePath => render_file_path,
         helix_view::editor::StatusLineElement::FileEncoding => render_file_encoding,
         helix_view::editor::StatusLineElement::FileLineEnding => render_file_line_ending,
         helix_view::editor::StatusLineElement::FileType => render_file_type,
@@ -407,7 +407,7 @@ where
     write(context, format!(" {} ", file_type), None);
 }
 
-fn render_file_path<F>(context: &mut RenderContext, write: F)
+fn render_file_name<F>(context: &mut RenderContext, write: F)
 where
     F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
 {
@@ -427,7 +427,7 @@ where
     write(context, title, None);
 }
 
-fn render_file_name<F>(context: &mut RenderContext, write: F)
+fn render_file_base_name<F>(context: &mut RenderContext, write: F)
 where
     F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
 {

diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
@@ -278,7 +278,7 @@ impl Default for StatusLineConfig {
         use StatusLineElement as E;
 
         Self {
-            left: vec![E::Mode, E::Spinner, E::FilePath],
+            left: vec![E::Mode, E::Spinner, E::FileName],
             center: vec![],
             right: vec![E::Diagnostics, E::Selections, E::Position, E::FileEncoding],
             separator: String::from("│"),
@@ -315,10 +315,10 @@ pub enum StatusLineElement {
     Spinner,
 
     /// The base file name, including a dirty flag if it's unsaved
-    FileName,
+    FileBaseName,
 
-    /// The file path, including a dirty flag if it's unsaved
-    FilePath,
+    /// The relative file path, including a dirty flag if it's unsaved
+    FileName,
 
     /// The file encoding
     FileEncoding,