zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-08 05:47:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Optimize search when regex doesn't contain newlines

Browse Source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
This commit is contained in:
Antonio Scandurra 2022-01-28 17:26:08 +01:00
parent 5b9d791269
commit d2a64f2171
1 changed files with 44 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
crates/find/src/find.rs
View File

@ -115,7 +115,8 @@ impl Toolbar for FindBar {
impl FindBar { impl FindBar {
fn new(settings: watch::Receiver<Settings>, cx: &mut ViewContext<Self>) -> Self { fn new(settings: watch::Receiver<Settings>, cx: &mut ViewContext<Self>) -> Self {
let query_editor = cx.add_view(|cx| { let query_editor = cx.add_view(|cx| {
Editor::single_line( Editor::auto_height(
2,
{ {
let settings = settings.clone(); let settings = settings.clone();
Arc::new(move |_| { Arc::new(move |_| {
@ -349,16 +350,49 @@ async fn regex_search(
let mut ranges = Vec::new(); let mut ranges = Vec::new();
let regex = RegexBuilder::new(&query) if query.contains("\n") || query.contains("\\n") {
.case_insensitive(!case_sensitive) let regex = RegexBuilder::new(&query)
.multi_line(true) .case_insensitive(!case_sensitive)
.build()?; .multi_line(true)
for (ix, mat) in regex.find_iter(&buffer.text()).enumerate() { .build()?;
if (ix + 1) % YIELD_INTERVAL == 0 { for (ix, mat) in regex.find_iter(&buffer.text()).enumerate() {
yield_now().await; if (ix + 1) % YIELD_INTERVAL == 0 {
} yield_now().await;
}
ranges.push(buffer.anchor_after(mat.start())..buffer.anchor_before(mat.end())); ranges.push(buffer.anchor_after(mat.start())..buffer.anchor_before(mat.end()));
}
} else {
let regex = RegexBuilder::new(&query)
.case_insensitive(!case_sensitive)
.build()?;
let mut line = String::new();
let mut line_offset = 0;
for (chunk_ix, chunk) in buffer
.chunks(0..buffer.len(), None)
.map(|c| c.text)
.chain(["\n"])
.enumerate()
{
if (chunk_ix + 1) % YIELD_INTERVAL == 0 {
yield_now().await;
}
for (newline_ix, text) in chunk.split('\n').enumerate() {
if newline_ix > 0 {
for mat in regex.find_iter(&line) {
let start = line_offset + mat.start();
let end = line_offset + mat.end();
ranges.push(buffer.anchor_after(start)..buffer.anchor_before(end));
}
line_offset += line.len() + 1;
line.clear();
}
line.push_str(text);
}
}
} }
Ok(ranges) Ok(ranges)