From 679278821663074836084bb80cdb8a1ba469a197 Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Fri, 19 May 2023 11:08:58 -0700 Subject: [PATCH 1/2] Remove unnescessary double lookup --- crates/project/src/worktree.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/project/src/worktree.rs b/crates/project/src/worktree.rs index 403d8934259e864a427e690fe497e2cd87f23ef6..61f12f7de971cfa566aaa28c11e3302f6eb6dcf6 100644 --- a/crates/project/src/worktree.rs +++ b/crates/project/src/worktree.rs @@ -125,7 +125,7 @@ impl Snapshot { let mut max_len = 0; let mut current_candidate = None; for (work_directory, repo) in (&self.repository_entries).iter() { - if repo.contains(self, path) { + if path.starts_with(&work_directory.0) { if work_directory.0.as_os_str().len() >= max_len { current_candidate = Some(repo); max_len = work_directory.0.as_os_str().len(); From 9f157bdb6712734e86285347c389906f8ddd60d8 Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Fri, 19 May 2023 11:30:10 -0700 Subject: [PATCH 2/2] Remove unescessary methods --- crates/project/src/worktree.rs | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/crates/project/src/worktree.rs b/crates/project/src/worktree.rs index 61f12f7de971cfa566aaa28c11e3302f6eb6dcf6..f178d7162aa8d33a35aa858e032e762626d79579 100644 --- a/crates/project/src/worktree.rs +++ b/crates/project/src/worktree.rs @@ -169,10 +169,6 @@ impl RepositoryEntry { .map(|entry| RepositoryWorkDirectory(entry.path.clone())) } - pub(crate) fn contains(&self, snapshot: &Snapshot, path: &Path) -> bool { - self.work_directory.contains(snapshot, path) - } - pub fn status_for_file(&self, snapshot: &Snapshot, path: &Path) -> Option { self.work_directory .relativize(snapshot, path) @@ -305,14 +301,6 @@ impl AsRef for RepositoryWorkDirectory { pub struct WorkDirectoryEntry(ProjectEntryId); impl WorkDirectoryEntry { - // Note that these paths should be relative to the worktree root. - pub(crate) fn contains(&self, snapshot: &Snapshot, path: &Path) -> bool { - snapshot - .entry_for_id(self.0) - .map(|entry| path.starts_with(&entry.path)) - .unwrap_or(false) - } - pub(crate) fn relativize(&self, worktree: &Snapshot, path: &Path) -> Option { worktree.entry_for_id(self.0).and_then(|entry| { path.strip_prefix(&entry.path)