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

Reduce accessibility of multibuffer read to reduce risk of borrowing snapshot and buffer refcells twice

Browse source
This commit is contained in:
Keith Simmons 2022-05-13 16:58:30 -07:00
parent 2f7eb6dbc5
commit a2fd41174f
9 changed files with 36 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -265,7 +265,7 @@ impl BufferSearchBar {
fn set_query(&mut self, query: &str, cx: &mut ViewContext<Self>) {
self.query_editor.update(cx, |query_editor, cx| {
query_editor.buffer().update(cx, |query_buffer, cx| {
let len = query_buffer.read(cx).len();
let len = query_buffer.len(cx);
query_buffer.edit([(0..len, query)], cx);
});
});
@ -388,7 +388,7 @@ impl BufferSearchBar {
&editor.selections.newest_anchor().head(),
index,
direction,
&editor.buffer().read(cx).read(cx),
&editor.buffer().read(cx).snapshot(cx),
);
let range_to_select = ranges[new_index].clone();
editor.unfold_ranges([range_to_select.clone()], false, cx);
@ -565,7 +565,7 @@ impl BufferSearchBar {
active_match_index(
&ranges,
&editor.selections.newest_anchor().head(),
&editor.buffer().read(cx).read(cx),
&editor.buffer().read(cx).snapshot(cx),
)
});
if new_index != self.active_match_index {

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

@ -457,7 +457,7 @@ impl ProjectSearchView {
&results_editor.selections.newest_anchor().head(),
index,
direction,
&results_editor.buffer().read(cx).read(cx),
&results_editor.buffer().read(cx).snapshot(cx),
);
let range_to_select = model.match_ranges[new_index].clone();
self.results_editor.update(cx, |editor, cx| {
@ -515,7 +515,7 @@ impl ProjectSearchView {
let new_index = active_match_index(
&self.model.read(cx).match_ranges,
&results_editor.selections.newest_anchor().head(),
&results_editor.buffer().read(cx).read(cx),
&results_editor.buffer().read(cx).snapshot(cx),
);
if self.active_match_index != new_index {
self.active_match_index = new_index;