Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
search: Bump fancy-regex dependency and enable CRLF mode (#55471)
Keith Hall6b733d105896
diff --git a/Cargo.lock b/Cargo.lockindex b9b4ea96158..3f71a7000d7 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -6465,9 +6465,9 @@ dependencies = [[[package]]name = "fancy-regex"-version = "0.17.0"+version = "0.18.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "72cf461f865c862bb7dc573f643dd6a2b6842f7c30b07882b56bd148cc2761b8"+checksum = "e1e1dacd0d2082dfcf1351c4bdd566bbe89a2b263235a2b50058f1e130a47277"dependencies = ["bit-set 0.8.0","regex-automata",@@ -14003,7 +14003,7 @@ dependencies = ["dap","encoding_rs","extension",- "fancy-regex 0.17.0",+ "fancy-regex 0.18.0","fs","futures 0.3.32","fuzzy",@@ -15066,9 +15066,9 @@ dependencies = [[[package]]name = "regex-automata"-version = "0.4.13"+version = "0.4.14"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"+checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"dependencies = ["aho-corasick","memchr",diff --git a/Cargo.toml b/Cargo.tomlindex 7a7003ec5eb..916cb147fa5 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -595,7 +595,7 @@ emojis = "0.6.1"env_logger = "0.11"encoding_rs = "0.8"exec = "0.3.1"-fancy-regex = "0.17.0"+fancy-regex = "0.18.0"fork = "0.4.0"futures = "0.3.32"futures-concurrency = "7.7.1"diff --git a/crates/project/src/search.rs b/crates/project/src/search.rsindex c2804f853a3..ccb38746a2b 100644--- a/crates/project/src/search.rs+++ b/crates/project/src/search.rs@@ -251,6 +251,7 @@ impl SearchQuery {let regex = RegexBuilder::new(&pattern).case_insensitive(!case_sensitive)+ .crlf(true).build()?;Ok(Self::Regex {regex,diff --git a/crates/project/tests/integration/search.rs b/crates/project/tests/integration/search.rsindex 79266405084..98cf7dc90ab 100644--- a/crates/project/tests/integration/search.rs+++ b/crates/project/tests/integration/search.rs@@ -1,3 +1,4 @@+use language::Buffer;use project::search::SearchQuery;use text::Rope;use util::{@@ -130,6 +131,30 @@ fn test_case_sensitive_pattern_items() {);}+#[gpui::test]+async fn test_multiline_regex_crlf(cx: &mut gpui::TestAppContext) {+ let search_query = SearchQuery::regex(+ "^hello$\r?\n",+ false,+ false,+ false,+ false,+ Default::default(),+ Default::default(),+ false,+ None,+ )+ .expect("Should be able to create a regex SearchQuery");++ let text = Rope::from("hello\r\nworld\r\nhello\r\nworld");+ let snapshot = cx+ .update(|app| Buffer::build_snapshot(text, None, None, None, app))+ .await;++ let results = search_query.search(&snapshot, None).await;+ assert_eq!(results, vec![0..7, 14..21]);+}+#[gpui::test]async fn test_multiline_regex(cx: &mut gpui::TestAppContext) {let search_query = SearchQuery::regex(@@ -145,7 +170,6 @@ async fn test_multiline_regex(cx: &mut gpui::TestAppContext) {).expect("Should be able to create a regex SearchQuery");- use language::Buffer;let text = Rope::from("hello\nworld\nhello\nworld");let snapshot = cx.update(|app| Buffer::build_snapshot(text, None, None, None, app))