zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-07 20:39:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rename workspace::Restart action into workspace::Reload (#12672)

Browse Source 
Closes https://github.com/zed-industries/zed/issues/12609

Instead of adding some ordering mechanism to the actions, rename the
action so that it's not interfering with the `editor: restart language
server` command.

Before:

![image](https://github.com/zed-industries/zed/assets/2690773/b5e86eda-d766-49fc-a25b-f8b9fdb7b521)

![image](https://github.com/zed-industries/zed/assets/2690773/c5edeb56-12aa-496b-bb6f-dc705cbb9ae3)


After:

![image](https://github.com/zed-industries/zed/assets/2690773/ed30c68d-bfdd-4e00-bb5d-0be52fbe4e16)
![Screenshot 2024-06-05 at 09 46
25](https://github.com/zed-industries/zed/assets/2690773/9fe4eb52-0399-4321-85a9-3b07c11395ce)


Release Notes:

- Improved language server restart command ergonomics by renaming
`workspace::Restart` action into `workspace::Reload` to remove any other
"restart"-worded actions in the list
This commit is contained in:
Kirill Bulatov 2024-06-08 13:23:59 +03:00 committed by GitHub
parent 75f8be6a0f
commit 953393f6ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/activity_indicator/src/activity_indicator.rs
View File

@ -285,10 +285,10 @@ impl ActivityIndicator {
icon: None, icon: None,
message: "Click to restart and update Zed".to_string(), message: "Click to restart and update Zed".to_string(),
on_click: Some(Arc::new({ on_click: Some(Arc::new({
let restart = workspace::Restart { let reload = workspace::Reload {
binary_path: Some(binary_path.clone()), binary_path: Some(binary_path.clone()),
}; };
move |_, cx| workspace::restart(&restart, cx) move |_, cx| workspace::reload(&reload, cx)
})), })),
}, },
AutoUpdateStatus::Errored => Content { AutoUpdateStatus::Errored => Content {

2
crates/collab_ui/src/collab_titlebar_item.rs
View File

@ -686,7 +686,7 @@ impl CollabTitlebarItem {
.on_click(|_, cx| { .on_click(|_, cx| {
if let Some(auto_updater) = auto_update::AutoUpdater::get(cx) { if let Some(auto_updater) = auto_update::AutoUpdater::get(cx) {
if auto_updater.read(cx).status().is_updated() { if auto_updater.read(cx).status().is_updated() {
workspace::restart(&Default::default(), cx); workspace::reload(&Default::default(), cx);
return; return;
} }
} }

10
crates/workspace/src/workspace.rs
View File

@ -185,7 +185,7 @@ pub struct CloseInactiveTabsAndPanes {
pub struct SendKeystrokes(pub String); pub struct SendKeystrokes(pub String);
#[derive(Clone, Deserialize, PartialEq, Default)] #[derive(Clone, Deserialize, PartialEq, Default)]
pub struct Restart { pub struct Reload {
pub binary_path: Option<PathBuf>, pub binary_path: Option<PathBuf>,
} }
@ -198,7 +198,7 @@ impl_actions!(
CloseInactiveTabsAndPanes, CloseInactiveTabsAndPanes,
NewFileInDirection, NewFileInDirection,
OpenTerminal, OpenTerminal,
Restart, Reload,
Save, Save,
SaveAll, SaveAll,
SwapPaneInDirection, SwapPaneInDirection,
@ -282,7 +282,7 @@ pub fn init(app_state: Arc<AppState>, cx: &mut AppContext) {
notifications::init(cx); notifications::init(cx);
cx.on_action(Workspace::close_global); cx.on_action(Workspace::close_global);
cx.on_action(restart); cx.on_action(reload);
cx.on_action({ cx.on_action({
let app_state = Arc::downgrade(&app_state); let app_state = Arc::downgrade(&app_state);
@ -5085,7 +5085,7 @@ pub fn join_in_room_project(
}) })
} }
pub fn restart(restart: &Restart, cx: &mut AppContext) { pub fn reload(reload: &Reload, cx: &mut AppContext) {
let should_confirm = WorkspaceSettings::get_global(cx).confirm_quit; let should_confirm = WorkspaceSettings::get_global(cx).confirm_quit;
let mut workspace_windows = cx let mut workspace_windows = cx
.windows() .windows()
@ -5111,7 +5111,7 @@ pub fn restart(restart: &Restart, cx: &mut AppContext) {
.ok(); .ok();
} }
let binary_path = restart.binary_path.clone(); let binary_path = reload.binary_path.clone();
cx.spawn(|mut cx| async move { cx.spawn(|mut cx| async move {
if let Some(prompt) = prompt { if let Some(prompt) = prompt {
let answer = prompt.await?; let answer = prompt.await?;