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

project: Fix issue where Cmd+Click on an import opens the wrong file (#26120)

Browse source 
Closes #21974

`resolve_path_in_worktrees` function looks for provided path in each
worktree until valid file is found.

In this PR we priortize current buffer worktree before other worktrees,
because of edge case where, file with same name might exists in other
worktrees.

Updated tests to handle this case.

Release Notes:

- Fixed an issue where the wrong file from a different worktree would
open when using `Cmd + Click` on a file import.
This commit is contained in:
smit 2025-03-05 16:49:39 +05:30 • committed by GitHub
parent 89d89b8b2d
commit 387ee46c46
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 82 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

81
crates/project/src/project.rs
View file

@ -3462,34 +3462,39 @@ impl Project {
}
}
let worktrees = self.worktrees(cx).collect::<Vec<_>>();
let buffer_worktree_id = buffer.read(cx).file().map(|file| file.worktree_id(cx));
let worktrees_with_ids: Vec<_> = self
.worktrees(cx)
.map(|worktree| {
let id = worktree.read(cx).id();
(worktree, id)
})
.collect();
cx.spawn(|_, mut cx| async move {
for worktree in worktrees {
if let Some(buffer_worktree_id) = buffer_worktree_id {
if let Some((worktree, _)) = worktrees_with_ids
.iter()
.find(|(_, id)| *id == buffer_worktree_id)
{
for candidate in candidates.iter() {
if let Some(path) =
Self::resolve_path_in_worktree(&worktree, candidate, &mut cx)
{
return Some(path);
}
}
}
}
for (worktree, id) in worktrees_with_ids {
if Some(id) == buffer_worktree_id {
continue;
}
for candidate in candidates.iter() {
let path = worktree
.update(&mut cx, |worktree, _| {
let root_entry_path = &worktree.root_entry()?.path;
let resolved = resolve_path(root_entry_path, candidate);
let stripped =
resolved.strip_prefix(root_entry_path).unwrap_or(&resolved);
worktree.entry_for_path(stripped).map(|entry| {
let project_path = ProjectPath {
worktree_id: worktree.id(),
path: entry.path.clone(),
};
ResolvedPath::ProjectPath {
project_path,
is_dir: entry.is_dir(),
}
})
})
.ok()?;
if path.is_some() {
return path;
if let Some(path) =
Self::resolve_path_in_worktree(&worktree, candidate, &mut cx)
{
return Some(path);
}
}
}
@ -3497,6 +3502,30 @@ impl Project {
})
}
fn resolve_path_in_worktree(
worktree: &Entity<Worktree>,
path: &PathBuf,
cx: &mut AsyncApp,
) -> Option<ResolvedPath> {
worktree
.update(cx, |worktree, _| {
let root_entry_path = &worktree.root_entry()?.path;
let resolved = resolve_path(root_entry_path, path);
let stripped = resolved.strip_prefix(root_entry_path).unwrap_or(&resolved);
worktree.entry_for_path(stripped).map(|entry| {
let project_path = ProjectPath {
worktree_id: worktree.id(),
path: entry.path.clone(),
};
ResolvedPath::ProjectPath {
project_path,
is_dir: entry.is_dir(),
}
})
})
.ok()?
}
pub fn list_directory(
&self,
query: String,