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

feat: add line content in local_search result 

Store and display line content in local_search result.

TODO: Fix the awful formatting of the displayed line content.
pull/13053/head
oxcrow 2025-03-14 01:24:02 +05:30
parent fc7955094d
commit b21e6748d1
No known key found for this signature in database
GPG Key ID: 2057528A3E83A137
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2653,13 +2653,15 @@ fn local_search(cx: &mut Context) {
struct FileResult { struct FileResult {
path: PathBuf, path: PathBuf,
line_num: usize, line_num: usize,
line_content: String,
} }
impl FileResult { impl FileResult {
fn new(path: &Path, line_num: usize) -> Self { fn new(path: &Path, line_num: usize, line_content: String) -> Self {
Self { Self {
path: path.to_path_buf(), path: path.to_path_buf(),
line_num, line_num,
line_content,
} }
} }
} }
@ -2686,8 +2688,8 @@ fn local_search(cx: &mut Context) {
// whitespace padding to align results after the line number // whitespace padding to align results after the line number
let padding_length = max_line_num_length - line_num.len(); let padding_length = max_line_num_length - line_num.len();
let padding = " ".repeat(padding_length); let padding = " ".repeat(padding_length);
// extract line content from the editor // extract line content to be displayed in the picker
let line_content = "<insert line content here>"; let line_content = item.line_content.clone();
// create column value to be displayed in the picker // create column value to be displayed in the picker
Cell::from(Spans::from(vec![ Cell::from(Spans::from(vec![
Span::styled(line_num, config.number_style), Span::styled(line_num, config.number_style),
@ -2775,9 +2777,13 @@ fn local_search(cx: &mut Context) {
}; };
let mut stop = false; let mut stop = false;
let sink = sinks::UTF8(|line_num, _line_content| { let sink = sinks::UTF8(|line_num, line_content| {
stop = injector stop = injector
.push(FileResult::new(entry.path(), line_num as usize - 1)) .push(FileResult::new(
entry.path(),
line_num as usize - 1,
line_content.to_string(),
))
.is_err(); .is_err();
Ok(!stop) Ok(!stop)