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

Drop active searchable item subscription when changing active item (#4220)

Browse source 
We were leaking the previous active item's subscription, which meant
that we would receive the `MatchesInvalidated` event as many times as we
changed items.

Release Notes:

- Fixed a performance issue when switching the active item while the
search bar was open.
This commit is contained in:
Antonio Scandurra 2024-01-23 18:50:01 +01:00 • committed by GitHub
commit 8ce7594a26
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/search/src/buffer_search.rs
View file

@ -396,8 +396,8 @@ impl ToolbarItemView for BufferSearchBar {
{ {
let this = cx.view().downgrade(); let this = cx.view().downgrade();
searchable_item_handle self.active_searchable_item_subscription =
.subscribe_to_search_events( Some(searchable_item_handle.subscribe_to_search_events(
cx, cx,
Box::new(move |search_event, cx| { Box::new(move |search_event, cx| {
if let Some(this) = this.upgrade() { if let Some(this) = this.upgrade() {
@ -406,8 +406,7 @@ impl ToolbarItemView for BufferSearchBar {
}); });
} }
}), }),
) ));
.detach();
self.active_searchable_item = Some(searchable_item_handle); self.active_searchable_item = Some(searchable_item_handle);
let _ = self.update_matches(cx); let _ = self.update_matches(cx);