diff options
| -rw-r--r-- | book/src/configuration.md | 1 | ||||
| -rw-r--r-- | helix-term/src/ui/statusline.rs | 21 | ||||
| -rw-r--r-- | helix-view/src/editor.rs | 5 |
3 files changed, 26 insertions, 1 deletions
diff --git a/book/src/configuration.md b/book/src/configuration.md index 0890d283..a35482e6 100644 --- a/book/src/configuration.md +++ b/book/src/configuration.md @@ -97,6 +97,7 @@ The following statusline elements can be configured: | `mode` | The current editor mode (`mode.normal`/`mode.insert`/`mode.select`) | | `spinner` | A progress spinner indicating LSP activity | | `file-name` | The path/name of the opened file | +| `file-base-name` | The basename of the opened file | | `file-encoding` | The encoding of the opened file if it differs from UTF-8 | | `file-line-ending` | The file line endings (CRLF or LF) | | `total-line-numbers` | The total line numbers of the opened file | diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs index 501faea3..a25b4540 100644 --- a/helix-term/src/ui/statusline.rs +++ b/helix-term/src/ui/statusline.rs @@ -139,6 +139,7 @@ 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::FileEncoding => render_file_encoding, helix_view::editor::StatusLineElement::FileLineEnding => render_file_line_ending, @@ -426,6 +427,26 @@ where write(context, title, None); } +fn render_file_base_name<F>(context: &mut RenderContext, write: F) +where + F: Fn(&mut RenderContext, String, Option<Style>) + Copy, +{ + let title = { + let rel_path = context.doc.relative_path(); + let path = rel_path + .as_ref() + .and_then(|p| p.as_path().file_name().map(|s| s.to_string_lossy())) + .unwrap_or_else(|| SCRATCH_BUFFER_NAME.into()); + format!( + " {}{} ", + path, + if context.doc.is_modified() { "[+]" } else { "" } + ) + }; + + write(context, title, None); +} + fn render_separator<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 index c13a6673..3521077e 100644 --- a/helix-view/src/editor.rs +++ b/helix-view/src/editor.rs @@ -314,7 +314,10 @@ pub enum StatusLineElement { /// The LSP activity spinner Spinner, - /// The file nane/path, including a dirty flag if it's unsaved + /// The base file name, including a dirty flag if it's unsaved + FileBaseName, + + /// The relative file path, including a dirty flag if it's unsaved FileName, /// The file encoding |