From 8fba25bb86e4294daa19e4ea1c12dc8c469c63da Mon Sep 17 00:00:00 2001 From: oxcrow Date: Fri, 14 Mar 2025 02:14:55 +0530 Subject: [PATCH] fix: separate line content in local_search result Separate the line number and the line content rendering logic. Use "line" as column header instead of "path". --- helix-term/src/commands.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index 8d1bb8fee..96a0ac7bb 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -2680,7 +2680,7 @@ fn local_search(cx: &mut Context) { }; let columns = [ - PickerColumn::new("path", |item: &FileResult, config: &LocalSearchConfig| { + PickerColumn::new("line", |item: &FileResult, config: &LocalSearchConfig| { let line_num = (item.line_num + 1).to_string(); // files can never contain more than 99_999_999 lines // thus using maximum line length to be 8 for this formatter is valid @@ -2688,16 +2688,18 @@ fn local_search(cx: &mut Context) { // whitespace padding to align results after the line number let padding_length = max_line_num_length - line_num.len(); let padding = " ".repeat(padding_length); - // extract line content to be displayed in the picker - let line_content = item.line_content.clone(); // create column value to be displayed in the picker Cell::from(Spans::from(vec![ Span::styled(line_num, config.number_style), Span::raw(padding), - Span::raw(line_content), ])) }), - PickerColumn::hidden("contents"), + PickerColumn::new("", |item: &FileResult, _config: &LocalSearchConfig| { + // extract line content to be displayed in the picker + let line_content = item.line_content.clone(); + // create column value to be displayed in the picker + Cell::from(Spans::from(vec![Span::raw(line_content)])) + }), ]; let get_files = |query: &str,