git.iko.soy/helix
on master help sign in
Add a status line element that shows just the basename of the file (#5318)
c9ed42cNick
book/src/configuration.md+1
compare with master
unifiedsplit
@@ -97,6 +97,7 @@ The following statusline elements can be configured:
97| `mode` | The current editor mode (`mode.normal`/`mode.insert`/`mode.select`) |
97| `mode` | The current editor mode (`mode.normal`/`mode.insert`/`mode.select`) |
98| `spinner` | A progress spinner indicating LSP activity |
98| `spinner` | A progress spinner indicating LSP activity |
99| `file-name` | The path/name of the opened file |
99| `file-name` | The path/name of the opened file |
100+| `file-base-name` | The basename of the opened file |
100| `file-encoding` | The encoding of the opened file if it differs from UTF-8 |
101| `file-encoding` | The encoding of the opened file if it differs from UTF-8 |
101| `file-line-ending` | The file line endings (CRLF or LF) |
102| `file-line-ending` | The file line endings (CRLF or LF) |
102| `total-line-numbers` | The total line numbers of the opened file |
103| `total-line-numbers` | The total line numbers of the opened file |
helix-term/src/ui/statusline.rs+21
@@ -139,6 +139,7 @@ where
139 match element_id {
139 match element_id {
140 helix_view::editor::StatusLineElement::Mode => render_mode,
140 helix_view::editor::StatusLineElement::Mode => render_mode,
141 helix_view::editor::StatusLineElement::Spinner => render_lsp_spinner,
141 helix_view::editor::StatusLineElement::Spinner => render_lsp_spinner,
142+ helix_view::editor::StatusLineElement::FileBaseName => render_file_base_name,
142 helix_view::editor::StatusLineElement::FileName => render_file_name,
143 helix_view::editor::StatusLineElement::FileName => render_file_name,
143 helix_view::editor::StatusLineElement::FileEncoding => render_file_encoding,
144 helix_view::editor::StatusLineElement::FileEncoding => render_file_encoding,
144 helix_view::editor::StatusLineElement::FileLineEnding => render_file_line_ending,
145 helix_view::editor::StatusLineElement::FileLineEnding => render_file_line_ending,
@@ -426,6 +427,26 @@ where
426 write(context, title, None);
427 write(context, title, None);
427}
428}
428
429
430+fn render_file_base_name<F>(context: &mut RenderContext, write: F)
431+where
432+ F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
433+{
434+ let title = {
435+ let rel_path = context.doc.relative_path();
436+ let path = rel_path
437+ .as_ref()
438+ .and_then(|p| p.as_path().file_name().map(|s| s.to_string_lossy()))
439+ .unwrap_or_else(|| SCRATCH_BUFFER_NAME.into());
440+ format!(
441+ " {}{} ",
442+ path,
443+ if context.doc.is_modified() { "[+]" } else { "" }
444+ )
445+ };
446+
447+ write(context, title, None);
448+}
449+
429fn render_separator<F>(context: &mut RenderContext, write: F)
450fn render_separator<F>(context: &mut RenderContext, write: F)
430where
451where
431 F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
452 F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
helix-view/src/editor.rs+4−1
@@ -314,7 +314,10 @@ pub enum StatusLineElement {
314 /// The LSP activity spinner
314 /// The LSP activity spinner
315 Spinner,
315 Spinner,
316
316
317+ /// The base file name, including a dirty flag if it's unsaved
318+ FileBaseName,
319+
317− /// The file nane/path, including a dirty flag if it's unsaved
320+ /// The relative file path, including a dirty flag if it's unsaved
318 FileName,
321 FileName,
319
322
320 /// The file encoding
323 /// The file encoding