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

Async terminal construction

Browse source
This commit is contained in:
Lukas Wirth 2025-08-18 20:01:40 +02:00
parent 0ce4dbb641
commit b2ba2de7b4
6 changed files with 206 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/terminal_view/src/persistence.rs
View file

@ -5,7 +5,7 @@ use futures::{StreamExt as _, stream::FuturesUnordered};
use gpui::{AppContext as _, AsyncWindowContext, Axis, Entity, Task, WeakEntity};
use project::Project;
use serde::{Deserialize, Serialize};
use std::path::{Path, PathBuf};
use std::path::PathBuf;
use ui::{App, Context, Pixels, Window};
use util::ResultExt as _;
@ -243,10 +243,7 @@ async fn deserialize_pane_group(
.ok()
.flatten();
let terminal = project.update(cx, |project, cx| {
project.create_terminal_shell(
working_directory.as_deref().map(Path::to_path_buf),
cx,
)
project.create_terminal_shell(working_directory, cx, None)
});
Some(Some(terminal))
} else {
@ -256,7 +253,7 @@ async fn deserialize_pane_group(
.ok()
.flatten()?;
if let Some(terminal) = terminal {
let terminal = terminal.ok()?;
let terminal = terminal.await.ok()?;
pane.update_in(cx, |pane, window, cx| {
let terminal_view = Box::new(cx.new(|cx| {
TerminalView::new(