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

global search: show file names as relative paths (#802) 

This commit fixes #786
pull/804/head
Dylan Richardson 2021-10-02 18:41:52 -05:00 committed by GitHub
parent e47632114a
commit 4a92a79da4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
helix-term/src/commands.rs
View File

@ -1291,6 +1291,7 @@ fn global_search(cx: &mut Context) {
cx.push_layer(Box::new(prompt)); cx.push_layer(Box::new(prompt));
let root = find_root(None).unwrap_or_else(|| PathBuf::from("./"));
let show_picker = async move { let show_picker = async move {
let all_matches: Vec<(usize, PathBuf)> = let all_matches: Vec<(usize, PathBuf)> =
UnboundedReceiverStream::new(all_matches_rx).collect().await; UnboundedReceiverStream::new(all_matches_rx).collect().await;
@ -1302,7 +1303,13 @@ fn global_search(cx: &mut Context) {
} }
let picker = FilePicker::new( let picker = FilePicker::new(
all_matches, all_matches,
move |(_line_num, path)| path.to_str().unwrap().into(), move |(_line_num, path)| {
path.strip_prefix(&root)
.unwrap_or(path)
.to_str()
.unwrap()
.into()
},
move |editor: &mut Editor, (line_num, path), action| { move |editor: &mut Editor, (line_num, path), action| {
match editor.open(path.into(), action) { match editor.open(path.into(), action) {
Ok(_) => {} Ok(_) => {}