zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-10 05:37:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix buffer search invalid regexp indicator (#7795)

Browse Source 
This PR fixes the issue with invalid regexp highlighting (red border)
when switching to the simple text searching mode (#7658).

Implementation details:

- `update_matches()` always relied on the caller to reset the
`query_contains_error` flag, which wasn't always the case. Now, it
resets the flag itself.

Release Notes:

- Fix issue with switching between invalid regexp and simple text buffer
search (#7658).

How it works now:


https://github.com/zed-industries/zed/assets/2101250/ac868a5d-5e2f-49a0-90fc-00e62a1d5ee8
This commit is contained in:
Andrew Lygin 2024-02-15 21:33:26 +03:00 committed by GitHub
parent f01763a1fa
commit aa319ccfd0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/search/src/buffer_search.rs
View File

@ -687,7 +687,6 @@ impl BufferSearchBar {
}); });
}); });
self.search_options = options; self.search_options = options;
self.query_contains_error = false;
self.clear_matches(cx); self.clear_matches(cx);
cx.notify(); cx.notify();
} }
@ -804,7 +803,6 @@ impl BufferSearchBar {
editor::EditorEvent::Focused => self.query_editor_focused = true, editor::EditorEvent::Focused => self.query_editor_focused = true,
editor::EditorEvent::Blurred => self.query_editor_focused = false, editor::EditorEvent::Blurred => self.query_editor_focused = false,
editor::EditorEvent::Edited => { editor::EditorEvent::Edited => {
self.query_contains_error = false;
self.clear_matches(cx); self.clear_matches(cx);
let search = self.update_matches(cx); let search = self.update_matches(cx);
cx.spawn(|this, mut cx| async move { cx.spawn(|this, mut cx| async move {
@ -869,6 +867,7 @@ impl BufferSearchBar {
self.pending_search.take(); self.pending_search.take();
if let Some(active_searchable_item) = self.active_searchable_item.as_ref() { if let Some(active_searchable_item) = self.active_searchable_item.as_ref() {
self.query_contains_error = false;
if query.is_empty() { if query.is_empty() {
self.active_match_index.take(); self.active_match_index.take();
active_searchable_item.clear_matches(cx); active_searchable_item.clear_matches(cx);