diff options
| author | Ethan Frei | 2021-10-08 02:08:10 +0000 |
|---|---|---|
| committer | GitHub | 2021-10-08 02:08:10 +0000 |
| commit | 9f27be429d0b4848a01876cd0eb192f2db8a830b (patch) | |
| tree | deaf4f638ec618d073c6531110332066828c55ab /helix-term | |
| parent | 2e692dc184d86c674da9e77afe93896743f67ebd (diff) | |
relative paths showing active file in global search (#803)
Diffstat (limited to 'helix-term')
| -rw-r--r-- | helix-term/src/commands.rs | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index ec76c81d..c1fd7bfe 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -1291,7 +1291,8 @@ fn global_search(cx: &mut Context) { cx.push_layer(Box::new(prompt)); - let root = find_root(None).unwrap_or_else(|| PathBuf::from("./")); + let current_path = doc_mut!(cx.editor).path().cloned(); + let show_picker = async move { let all_matches: Vec<(usize, PathBuf)> = UnboundedReceiverStream::new(all_matches_rx).collect().await; @@ -1301,14 +1302,19 @@ fn global_search(cx: &mut Context) { editor.set_status("No matches found".to_string()); return; } + let picker = FilePicker::new( all_matches, move |(_line_num, path)| { - path.strip_prefix(&root) - .unwrap_or(path) + let relative_path = helix_core::path::get_relative_path(path) .to_str() .unwrap() - .into() + .to_owned(); + if current_path.as_ref().map(|p| p == path).unwrap_or(false) { + format!("{} (*)", relative_path).into() + } else { + relative_path.into() + } }, move |editor: &mut Editor, (line_num, path), action| { match editor.open(path.into(), action) { |