mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-12 13:24:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

I think I'm finished

Browse source
This commit is contained in:
Mikayla Maki 2022-07-20 17:11:36 -07:00
parent 061dde5a9b
commit 741b78a15b
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/terminal/src/modal.rs
View file

@ -32,7 +32,7 @@ pub fn deploy_modal(workspace: &mut Workspace, _: &DeployModal, cx: &mut ViewCon
if let Some(closed_terminal_handle) = workspace.toggle_modal(cx, |workspace, cx| {
let wd = get_wd_for_workspace(workspace, cx);
let this = cx.add_view(|cx| TerminalView::new(wd, true, cx));
let this = cx.add_view(|cx| TerminalView::new(wd, true, cx).unwrap());
let connection_handle = this.read(cx).connection.0.as_ref().unwrap().clone();
cx.subscribe(&connection_handle, on_event).detach();

23
crates/terminal/src/terminal.rs
View file

@ -82,7 +82,11 @@ impl Entity for TerminalView {
impl TerminalView {
///Create a new Terminal view. This spawns a task, a thread, and opens the TTY devices
///To get the right working directory from a workspace, use: `get_wd_for_workspace()`
fn new(working_directory: Option<PathBuf>, modal: bool, cx: &mut ViewContext<Self>) -> Self {
fn new(
working_directory: Option<PathBuf>,
modal: bool,
cx: &mut ViewContext<Self>,
) -> Option<Self> {
//The details here don't matter, the terminal will be resized on the first layout
let size_info = TerminalDimensions::new(
DEBUG_LINE_HEIGHT,
@ -103,7 +107,15 @@ impl TerminalView {
}
});
TerminalView::from_connection(TerminalConnection(connection), modal, cx)
if let Ok(_) = connection {
Some(TerminalView::from_connection(
TerminalConnection(connection),
modal,
cx,
))
} else {
None
}
}
fn from_connection(
@ -150,8 +162,9 @@ impl TerminalView {
///Create a new Terminal in the current working directory or the user's home directory
fn deploy(workspace: &mut Workspace, _: &Deploy, cx: &mut ViewContext<Workspace>) {
let wd = get_wd_for_workspace(workspace, cx);
let view = cx.add_view(|cx| TerminalView::new(wd, false, cx));
workspace.add_item(Box::new(view), cx);
if let Some(view) = cx.add_option_view(|cx| TerminalView::new(wd, false, cx)) {
workspace.add_item(Box::new(view), cx);
}
}
fn clear(&mut self, _: &Clear, cx: &mut ViewContext<Self>) {
@ -327,7 +340,7 @@ impl Item for TerminalView {
Err(e) => e.directory.clone(),
};
Some(TerminalView::new(wd, false, cx))
TerminalView::new(wd, false, cx)
}
fn project_path(&self, _cx: &gpui::AppContext) -> Option<ProjectPath> {