suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added command to differentiate duplicate names in bufferline 

Refactored logic, uses HashMap for efficiency

Changed conditional
pull/5092/head
Dylan Bulfin 2022-12-08 16:24:46 -05:00
parent d14de27709
commit 57c990e280
No known key found for this signature in database
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
helix-term/src/ui/editor.rs
View File

@ -671,6 +671,9 @@ impl EditorView {
let mut x = viewport.x;
let current_doc = view!(editor).doc;
use std::collections::HashMap;
let mut names_map: HashMap<&str, usize> = HashMap::new();
for doc in editor.documents() {
let fname = doc
.path()
@ -680,6 +683,28 @@ impl EditorView {
.to_str()
.unwrap_or_default();
if names_map.contains_key(fname) {
names_map.insert(fname, names_map.get(fname).unwrap() + 1);
} else {
names_map.insert(fname, 1);
}
}
for doc in editor.documents() {
let mut fname = doc
.path()
.unwrap_or(&scratch)
.file_name()
.unwrap_or_default()
.to_str()
.unwrap_or_default();
let rel_path = doc.relative_path().unwrap_or_default();
if *names_map.get(fname).unwrap() > 1 {
fname = rel_path.to_str().unwrap_or_default();
}
let style = if current_doc == doc.id() {
bufferline_active
} else {