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

Use read-only access methods for read-only entity operations (#31479)

Browse source 
Another follow-up to #31254

Release Notes:

- N/A
This commit is contained in:
Joseph T. Lyons 2025-05-26 23:04:31 -04:00 • committed by GitHub
parent 4a577fff4a
commit c208532693
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
79 changed files with 319 additions and 306 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crates/project_panel/src/project_panel.rs
View file

@ -694,7 +694,7 @@ impl ProjectPanel {
fn serialize(&mut self, cx: &mut Context<Self>) {
let Some(serialization_key) = self
.workspace
.update(cx, |workspace, _| {
.read_with(cx, |workspace, _| {
ProjectPanel::serialization_key(workspace)
})
.ok()
@ -3457,7 +3457,7 @@ impl ProjectPanel {
.read(cx)
.repo_snapshots(cx);
let worktree = self.project.read(cx).worktree_for_id(worktree_id, cx)?;
worktree.update(cx, |tree, _| {
worktree.read_with(cx, |tree, _| {
utils::ReversibleIterable::new(
GitTraversal::new(&repo_snapshots, tree.entries(true, 0usize)),
reverse_search,
@ -3492,16 +3492,17 @@ impl ProjectPanel {
let worktree = self
.project
.read(cx)
.worktree_for_id(start.worktree_id, cx)?;
.worktree_for_id(start.worktree_id, cx)?
.read(cx);
let search = worktree.update(cx, |tree, _| {
let entry = tree.entry_for_id(start.entry_id)?;
let root_entry = tree.root_entry()?;
let tree_id = tree.id();
let search = {
let entry = worktree.entry_for_id(start.entry_id)?;
let root_entry = worktree.root_entry()?;
let tree_id = worktree.id();
let mut first_iter = GitTraversal::new(
&repo_snapshots,
tree.traverse_from_path(true, true, true, entry.path.as_ref()),
worktree.traverse_from_path(true, true, true, entry.path.as_ref()),
);
if reverse_search {
@ -3515,7 +3516,8 @@ impl ProjectPanel {
.find(|ele| predicate(*ele, tree_id))
.map(|ele| ele.to_owned());
let second_iter = GitTraversal::new(&repo_snapshots, tree.entries(true, 0usize));
let second_iter =
GitTraversal::new(&repo_snapshots, worktree.entries(true, 0usize));
let second = if reverse_search {
second_iter
@ -3536,7 +3538,7 @@ impl ProjectPanel {
} else {
Some((first, second))
}
});
};
if let Some((first, second)) = search {
let first = first.map(|entry| SelectedEntry {