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

Add a test

Browse source 
co-authored-by: Mikayla <mikayla@zed.dev>
This commit is contained in:
Kirill Bulatov 2023-05-27 00:06:09 +03:00
parent cf2bbfc85a
commit 3a3c1c5a5b
4 changed files with 235 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/workspace/src/pane.rs
View file

@ -1018,9 +1018,11 @@ impl Pane {
if let Some(path) = item.project_path(cx) {
let abs_path = self
.workspace()
.upgrade(cx)
.and_then(|workspace| workspace.read(cx).absolute_path(&path, cx));
.nav_history
.borrow()
.paths_by_item
.get(&item.id())
.and_then(|(_, abs_path)| abs_path.clone());
self.nav_history
.borrow_mut()
.paths_by_item

24
crates/workspace/src/workspace.rs
View file

@ -975,23 +975,25 @@ impl Workspace {
});
}
let project = self.project.read(cx);
history
.into_iter()
.sorted_by_key(|(_, (_, timestamp))| *timestamp)
.map(|(project_path, (fs_path, _))| (project_path, fs_path))
.rev()
.filter(|(history_path, abs_path)| {
project
.worktree_for_id(history_path.worktree_id, cx)
.is_some()
|| abs_path
.as_ref()
.and_then(|abs_path| {
let buffers_opened = abs_paths_opened.get(abs_path)?;
Some(buffers_opened.len() < 2)
})
.unwrap_or(false)
let latest_project_path_opened = abs_path
.as_ref()
.and_then(|abs_path| abs_paths_opened.get(abs_path))
.and_then(|project_paths| {
project_paths
.iter()
.max_by(|b1, b2| b1.worktree_id.cmp(&b2.worktree_id))
});
match latest_project_path_opened {
Some(latest_project_path_opened) => latest_project_path_opened == history_path,
None => true,
}
})
.take(limit.unwrap_or(usize::MAX))
.collect()