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

When opening projects, only reuse the current window if it is empty

Browse source
This commit is contained in:
Max Brunsfeld 2023-04-18 17:05:26 -07:00
parent 44d26b69ae
commit 7cc868bc8c
2 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/recent_projects/src/recent_projects.rs
View file

@ -167,7 +167,7 @@ impl PickerDelegate for RecentProjectsView {
fn confirm(&mut self, cx: &mut ViewContext<Self>) { fn confirm(&mut self, cx: &mut ViewContext<Self>) {
if let Some(selected_match) = &self.matches.get(self.selected_index()) { if let Some(selected_match) = &self.matches.get(self.selected_index()) {
let workspace_location = &self.workspace_locations[selected_match.candidate_id]; let workspace_location = &self.workspace_locations[selected_match.candidate_id];
cx.dispatch_global_action(OpenPaths { cx.dispatch_action(OpenPaths {
paths: workspace_location.paths().as_ref().clone(), paths: workspace_location.paths().as_ref().clone(),
}); });
cx.emit(Event::Dismissed); cx.emit(Event::Dismissed);

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

@ -302,14 +302,26 @@ pub fn init(app_state: Arc<AppState>, cx: &mut AppContext) {
let app_state = app_state.upgrade()?; let app_state = app_state.upgrade()?;
let window_id = cx.window_id(); let window_id = cx.window_id();
let action = action.clone(); let action = action.clone();
let close = workspace.prepare_to_close(false, cx); let is_remote = workspace.project.read(cx).is_remote();
let has_worktree = workspace.project.read(cx).worktrees(cx).next().is_some();
let has_dirty_items = workspace.items(cx).any(|item| item.is_dirty(cx));
let close_task = if is_remote || has_worktree || has_dirty_items {
None
} else {
Some(workspace.prepare_to_close(false, cx))
};
Some(cx.spawn_weak(|_, mut cx| async move { Some(cx.spawn_weak(|_, mut cx| async move {
let can_close = close.await?; let window_id_to_replace = if let Some(close_task) = close_task {
if can_close { if !close_task.await? {
cx.update(|cx| open_paths(&action.paths, &app_state, Some(window_id), cx)) return Ok(());
.await; }
} Some(window_id)
} else {
None
};
cx.update(|cx| open_paths(&action.paths, &app_state, window_id_to_replace, cx))
.await;
Ok(()) Ok(())
})) }))
} }