mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-05 03:47:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add a hidden column for the global search line contents

Browse source 
We could expand on this in the future to have different preview modes
that you can toggle between with C-t. Currently that binding just hides
the preview but it could switch between different preview modes and in
one mode hide the path and just show the line contents.
This commit is contained in:
Michael Davis 2024-03-24 11:52:57 -04:00
parent 7b1131adf6
commit 6492f17e7d
No known key found for this signature in database
2 changed files with 27 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
helix-term/src/commands.rs
View file

@ -2243,15 +2243,13 @@ fn global_search(cx: &mut Context) {
path: PathBuf,
/// 0 indexed lines
line_num: usize,
line_content: String,
}
impl FileResult {
fn new(path: &Path, line_num: usize, line_content: String) -> Self {
fn new(path: &Path, line_num: usize) -> Self {
Self {
path: path.to_path_buf(),
line_num,
line_content,
}
}
}
@ -2272,10 +2270,7 @@ fn global_search(cx: &mut Context) {
let path = helix_stdx::path::get_relative_path(&item.path);
format!("{}:{}", path.to_string_lossy(), item.line_num + 1).into()
}),
PickerColumn::new("contents", |item: &FileResult, _| {
item.line_content.as_str().into()
})
.without_filtering(),
PickerColumn::hidden("contents"),
];
let get_files = |query: &str,
@ -2355,13 +2350,9 @@ fn global_search(cx: &mut Context) {
};
let mut stop = false;
let sink = sinks::UTF8(|line_num, line_content| {
let sink = sinks::UTF8(|line_num, _line_content| {
stop = injector
.push(FileResult::new(
entry.path(),
line_num as usize - 1,
line_content.to_string(),
))
.push(FileResult::new(entry.path(), line_num as usize - 1))
.is_err();
Ok(!stop)