Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make search context larger (#10289)

Browse source 
This increases search context from 1 above, 2 below, to 2 above and 2
below, matching the Sublime Text search results.

Release Notes:

- Increased search result context from 3 lines to 4 lines
This commit is contained in:
Mikayla Maki 2024-04-08 10:57:36 -07:00 • committed by GitHub
parent 44aed4a0cb
commit d2bf80ca3d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/multi_buffer/src/multi_buffer.rs
View file

@ -4288,7 +4288,8 @@ where
.peekable(); .peekable();
while let Some(range) = range_iter.next() { while let Some(range) = range_iter.next() {
let excerpt_start = Point::new(range.start.row.saturating_sub(context_line_count), 0); let excerpt_start = Point::new(range.start.row.saturating_sub(context_line_count), 0);
let mut excerpt_end = Point::new(range.end.row + 1 + context_line_count, 0).min(max_point); let mut excerpt_end = Point::new(range.end.row + context_line_count, 0).min(max_point);
let mut ranges_in_excerpt = 1; let mut ranges_in_excerpt = 1;
while let Some(next_range) = range_iter.peek() { while let Some(next_range) = range_iter.peek() {
@ -4779,7 +4780,7 @@ mod tests {
let snapshot = multibuffer.read(cx).snapshot(cx); let snapshot = multibuffer.read(cx).snapshot(cx);
assert_eq!( assert_eq!(
snapshot.text(), snapshot.text(),
"bbb\nccc\nddd\neee\nfff\nggg\nhhh\niii\njjj\n\nnnn\nooo\nppp\nqqq\nrrr\n" "bbb\nccc\nddd\neee\nfff\nggg\nhhh\niii\njjj\n\nnnn\nooo\nppp\nqqq\n"
); );
assert_eq!( assert_eq!(
@ -4821,7 +4822,7 @@ mod tests {
let snapshot = multibuffer.update(cx, |multibuffer, cx| multibuffer.snapshot(cx)); let snapshot = multibuffer.update(cx, |multibuffer, cx| multibuffer.snapshot(cx));
assert_eq!( assert_eq!(
snapshot.text(), snapshot.text(),
"bbb\nccc\nddd\neee\nfff\nggg\nhhh\niii\njjj\n\nnnn\nooo\nppp\nqqq\nrrr\n" "bbb\nccc\nddd\neee\nfff\nggg\nhhh\niii\njjj\n\nnnn\nooo\nppp\nqqq\n"
); );
assert_eq!( assert_eq!(

10
crates/search/src/project_search.rs
View file

@ -55,6 +55,8 @@ struct ActiveSettings(HashMap<WeakModel<Project>, ProjectSearchSettings>);
impl Global for ActiveSettings {} impl Global for ActiveSettings {}
const SEARCH_CONTEXT: u32 = 2;
pub fn init(cx: &mut AppContext) { pub fn init(cx: &mut AppContext) {
cx.set_global(ActiveSettings::default()); cx.set_global(ActiveSettings::default());
cx.observe_new_views(|workspace: &mut Workspace, _cx| { cx.observe_new_views(|workspace: &mut Workspace, _cx| {
@ -235,8 +237,12 @@ impl ProjectSearch {
.update(&mut cx, |this, cx| { .update(&mut cx, |this, cx| {
this.no_results = Some(false); this.no_results = Some(false);
this.excerpts.update(cx, |excerpts, cx| { this.excerpts.update(cx, |excerpts, cx| {
excerpts excerpts.stream_excerpts_with_context_lines(
.stream_excerpts_with_context_lines(buffer, ranges, 1, cx) buffer,
ranges,
SEARCH_CONTEXT,
cx,
)
}) })
}) })
.ok()?; .ok()?;