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

Merge pull request #2264 from zed-industries/make-terminal-default-better

Browse source 
Make terminal fallback correctly when unable to deserialize a cwd
This commit is contained in:
Mikayla Maki 2023-03-10 12:27:54 -08:00 • committed by GitHub
commit 74b10e4ba5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/terminal_view/src/terminal_view.rs
View file

@ -653,7 +653,7 @@ impl Item for TerminalView {
fn deserialize( fn deserialize(
project: ModelHandle<Project>, project: ModelHandle<Project>,
_workspace: WeakViewHandle<Workspace>, workspace: WeakViewHandle<Workspace>,
workspace_id: workspace::WorkspaceId, workspace_id: workspace::WorkspaceId,
item_id: workspace::ItemId, item_id: workspace::ItemId,
cx: &mut ViewContext<Pane>, cx: &mut ViewContext<Pane>,
@ -663,7 +663,18 @@ impl Item for TerminalView {
let cwd = TERMINAL_DB let cwd = TERMINAL_DB
.get_working_directory(item_id, workspace_id) .get_working_directory(item_id, workspace_id)
.log_err() .log_err()
.flatten(); .flatten()
.or_else(|| {
cx.read(|cx| {
let strategy = cx.global::<Settings>().terminal_strategy();
workspace
.upgrade(cx)
.map(|workspace| {
get_working_directory(workspace.read(cx), cx, strategy)
})
.flatten()
})
});
cx.update(|cx| { cx.update(|cx| {
let terminal = project.update(cx, |project, cx| { let terminal = project.update(cx, |project, cx| {