aboutsummaryrefslogtreecommitdiff
path: root/helix-term/src/commands.rs
diff options
context:
space:
mode:
authorBlaž Hrastnik2021-08-24 00:56:09 +0000
committerBlaž Hrastnik2021-08-24 00:56:09 +0000
commit1d45f50781f34bccf29a3e4f576cc48651038b09 (patch)
tree4308bba5e4efa8f865a5d363afcf0bf58d9f8a1e /helix-term/src/commands.rs
parente1c9f132637bcf2406c7c1403ab3d8dfd882369e (diff)
fix: Don't internally use relative paths in the buffer picker
Fixes #619
Diffstat (limited to 'helix-term/src/commands.rs')
-rw-r--r--helix-term/src/commands.rs9
1 files changed, 5 insertions, 4 deletions
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 56e4f1b6..7434d4cd 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2288,16 +2288,17 @@ fn buffer_picker(cx: &mut Context) {
cx.editor
.documents
.iter()
- .map(|(id, doc)| (id, doc.relative_path()))
+ .map(|(id, doc)| (id, doc.path().cloned()))
.collect(),
move |(id, path): &(DocumentId, Option<PathBuf>)| {
- // format_fn
+ use helix_view::document::relative_path;
+ let path = path.as_deref().map(relative_path);
match path.as_ref().and_then(|path| path.to_str()) {
Some(path) => {
if *id == current {
- format!("{} (*)", path).into()
+ format!("{} (*)", &path).into()
} else {
- path.into()
+ path.to_owned().into()
}
}
None => "[scratch buffer]".into(),