kc/helix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Distinguish dirs visually in file_browser

Browse source
This commit is contained in:
Denys Rybalka 2024-10-03 10:20:43 +02:00
parent 7e58404172
commit adc72f2d87
No known key found for this signature in database
GPG key ID: 1F6284E97DB46ED1
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
helix-term/src/ui/mod.rs
View file

@ -273,10 +273,12 @@ pub fn file_browser(root: PathBuf) -> Result<FilePicker, std::io::Error> {
let columns = [PickerColumn::new(
"path",
|item: &PathBuf, root: &PathBuf| {
item.strip_prefix(root)
.unwrap_or(item)
.to_string_lossy()
.into()
let name = item.strip_prefix(root).unwrap_or(item).to_string_lossy();
if item.is_dir() {
format!("{}/", name).into()
} else {
name.into()
}
},
)];
let picker = Picker::new(
@ -316,11 +318,10 @@ fn directory_content(path: &Path) -> Result<Vec<PathBuf>, std::io::Error> {
let mut dirs = Vec::new();
let mut files = Vec::new();
for entry in std::fs::read_dir(path)?.flatten() {
let entry_path = entry.path();
if entry.path().is_dir() {
dirs.push(entry_path);
dirs.push(entry.path());
} else {
files.push(entry_path);
files.push(entry.path());
}
}
dirs.sort();
@ -328,7 +329,6 @@ fn directory_content(path: &Path) -> Result<Vec<PathBuf>, std::io::Error> {
let mut content = Vec::new();
if path.parent().is_some() {
log::warn!("{}", path.to_string_lossy());
content.insert(0, path.join(".."));
}
content.extend(dirs);

10
helix-term/src/ui/picker.rs
View file

@ -614,8 +614,14 @@ impl<T: 'static + Send + Sync, D: 'static + Send + Sync> Picker<T, D> {
let files = super::directory_content(&path)?;
let file_names: Vec<_> = files
.iter()
.filter_map(|file| file.file_name())
.map(|name| name.to_string_lossy().into_owned())
.filter_map(|file| {
let name = file.file_name()?.to_string_lossy();
if file.is_dir() {
Some(format!("{}/", name))
} else {
Some(name.into_owned())
}
})
.collect();
Ok(CachedPreview::Directory(file_names))
} else if metadata.is_file() {