Allow running certain Zed actions when headless (#32095)
Rework of https://github.com/zed-industries/zed/pull/30783 Before: <img width="483" alt="before_1" src="https://github.com/user-attachments/assets/c08531ce-0c1c-4a91-8375-4542220fc1b1" /> <img width="250" alt="before_2" src="https://github.com/user-attachments/assets/e6f5404e-4e00-4125-bf2b-59a5bc6c41c1" /> <img width="369" alt="before_3" src="https://github.com/user-attachments/assets/6a17c63d-80f6-4d91-a63b-69a9d8fe533a" /> After: <img width="443" alt="after_1" src="https://github.com/user-attachments/assets/4f7203c2-0065-41da-b7df-02aeba89ab7b" /> <img width="246" alt="after_2" src="https://github.com/user-attachments/assets/585e2e25-bf06-4cdc-bfa5-930e0405c8d0" /> <img width="371" alt="after_3" src="https://github.com/user-attachments/assets/54585f1a-6a9b-45a3-9d77-b0bb1ace580b" /> Release Notes: - Allowed running certain Zed actions when headless
This commit is contained in:
parent
f8ab51307a
commit
ff6ac60bad
9 changed files with 178 additions and 151 deletions
|
@ -27,14 +27,42 @@ use ui::{KeyBinding, ListItem, ListItemSpacing, Tooltip, prelude::*, tooltip_con
|
|||
use util::{ResultExt, paths::PathExt};
|
||||
use workspace::{
|
||||
CloseIntent, HistoryManager, ModalView, OpenOptions, SerializedWorkspaceLocation, WORKSPACE_DB,
|
||||
Workspace, WorkspaceId,
|
||||
Workspace, WorkspaceId, with_active_or_new_workspace,
|
||||
};
|
||||
use zed_actions::{OpenRecent, OpenRemote};
|
||||
|
||||
pub fn init(cx: &mut App) {
|
||||
SshSettings::register(cx);
|
||||
cx.observe_new(RecentProjects::register).detach();
|
||||
cx.observe_new(RemoteServerProjects::register).detach();
|
||||
cx.on_action(|open_recent: &OpenRecent, cx| {
|
||||
let create_new_window = open_recent.create_new_window;
|
||||
with_active_or_new_workspace(cx, move |workspace, window, cx| {
|
||||
let Some(recent_projects) = workspace.active_modal::<RecentProjects>(cx) else {
|
||||
RecentProjects::open(workspace, create_new_window, window, cx);
|
||||
return;
|
||||
};
|
||||
|
||||
recent_projects.update(cx, |recent_projects, cx| {
|
||||
recent_projects
|
||||
.picker
|
||||
.update(cx, |picker, cx| picker.cycle_selection(window, cx))
|
||||
});
|
||||
});
|
||||
});
|
||||
cx.on_action(|open_remote: &OpenRemote, cx| {
|
||||
let from_existing_connection = open_remote.from_existing_connection;
|
||||
with_active_or_new_workspace(cx, move |workspace, window, cx| {
|
||||
if from_existing_connection {
|
||||
cx.propagate();
|
||||
return;
|
||||
}
|
||||
let handle = cx.entity().downgrade();
|
||||
let fs = workspace.project().read(cx).fs().clone();
|
||||
workspace.toggle_modal(window, cx, |window, cx| {
|
||||
RemoteServerProjects::new(fs, window, cx, handle)
|
||||
})
|
||||
});
|
||||
});
|
||||
|
||||
cx.observe_new(DisconnectedOverlay::register).detach();
|
||||
}
|
||||
|
||||
|
@ -86,25 +114,6 @@ impl RecentProjects {
|
|||
}
|
||||
}
|
||||
|
||||
fn register(
|
||||
workspace: &mut Workspace,
|
||||
_window: Option<&mut Window>,
|
||||
_cx: &mut Context<Workspace>,
|
||||
) {
|
||||
workspace.register_action(|workspace, open_recent: &OpenRecent, window, cx| {
|
||||
let Some(recent_projects) = workspace.active_modal::<Self>(cx) else {
|
||||
Self::open(workspace, open_recent.create_new_window, window, cx);
|
||||
return;
|
||||
};
|
||||
|
||||
recent_projects.update(cx, |recent_projects, cx| {
|
||||
recent_projects
|
||||
.picker
|
||||
.update(cx, |picker, cx| picker.cycle_selection(window, cx))
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
pub fn open(
|
||||
workspace: &mut Workspace,
|
||||
create_new_window: bool,
|
||||
|
|
|
@ -50,7 +50,6 @@ use workspace::{
|
|||
open_ssh_project_with_existing_connection,
|
||||
};
|
||||
|
||||
use crate::OpenRemote;
|
||||
use crate::ssh_config::parse_ssh_config_hosts;
|
||||
use crate::ssh_connections::RemoteSettingsContent;
|
||||
use crate::ssh_connections::SshConnection;
|
||||
|
@ -362,22 +361,6 @@ impl Mode {
|
|||
}
|
||||
}
|
||||
impl RemoteServerProjects {
|
||||
pub fn register(
|
||||
workspace: &mut Workspace,
|
||||
_window: Option<&mut Window>,
|
||||
_: &mut Context<Workspace>,
|
||||
) {
|
||||
workspace.register_action(|workspace, action: &OpenRemote, window, cx| {
|
||||
if action.from_existing_connection {
|
||||
cx.propagate();
|
||||
return;
|
||||
}
|
||||
let handle = cx.entity().downgrade();
|
||||
let fs = workspace.project().read(cx).fs().clone();
|
||||
workspace.toggle_modal(window, cx, |window, cx| Self::new(fs, window, cx, handle))
|
||||
});
|
||||
}
|
||||
|
||||
pub fn open(workspace: Entity<Workspace>, window: &mut Window, cx: &mut App) {
|
||||
workspace.update(cx, |workspace, cx| {
|
||||
let handle = cx.entity().downgrade();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue