diff options
| author | Sebastian Thiel <sebastian.thiel@icloud.com> | 2023-12-13 09:10:47 +0100 |
|---|---|---|
| committer | Sebastian Thiel <sebastian.thiel@icloud.com> | 2023-12-13 09:13:13 +0100 |
| commit | 94c008fe8bd5ff836049f8d5d18478d41bfca9c3 (patch) | |
| tree | 4417386a40de82d492cd8efb112917ee963cce6b | |
| parent | 101a37761952f094a782fb34850c82070565125b (diff) | |
make clear why roots were special cased, and try to restore that behaviour.
| -rw-r--r-- | src/interactive/widgets/entries.rs | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/src/interactive/widgets/entries.rs b/src/interactive/widgets/entries.rs index 538eace..ab2293c 100644 --- a/src/interactive/widgets/entries.rs +++ b/src/interactive/widgets/entries.rs @@ -258,12 +258,31 @@ fn count_column(entry_count: Option<u64>, style: Style) -> Span<'static> { } fn name_column(entry_name: &Path, is_dir: bool, area: Rect, style: Style) -> Span<'static> { + let name = entry_name.to_string_lossy(); Span::styled( fill_background_to_right( format!( - "{prefix}{}", - entry_name.to_string_lossy(), - prefix = if is_dir { "/" } else { " " } + "{prefix}{name}", + prefix = if is_dir { + // Note that these names never happen on non-root items, so this is a root-item special case. + // It was necessary since we can't trust the 'actual' root anymore as it might be the CWD or + // `main()` cwd' into the one path that was provided by the user. + // The idea was to keep explicit roots as specified without adjustment, which works with this + // logic unless somebody provides `name` as is, then we will prefix it which is a little confusing. + // Overall, this logic makes the folder display more consistent. + if name == "." + || name == ".." + || name.starts_with('/') + || name.starts_with("./") + || name.starts_with("../") + { + "" + } else { + "/" + } + } else { + " " + } ), area.width, ), |