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

Merge remote-tracking branch 'origin/main' into go-to-definition

Browse source
This commit is contained in:
Nathan Sobo 2022-01-21 11:12:38 -07:00
commit 19751e9200
5 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1432,10 +1432,11 @@ pub fn open_paths(
// Open paths in existing workspace if possible
let mut existing = None;
for window_id in cx.window_ids().collect::<Vec<_>>() {
if let Some(workspace) = cx.root_view::<Workspace>(window_id) {
if workspace.update(cx, |view, cx| {
if view.contains_paths(abs_paths, cx.as_ref()) {
existing = Some(workspace.clone());
if let Some(workspace_handle) = cx.root_view::<Workspace>(window_id) {
if workspace_handle.update(cx, |workspace, cx| {
if workspace.contains_paths(abs_paths, cx.as_ref()) {
cx.activate_window(window_id);
existing = Some(workspace_handle.clone());
true
} else {
false