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

Merge branch 'main' into ui-scrollbar-teardown

Browse source
This commit is contained in:
MrSubidubi 2025-08-20 10:48:16 +02:00
commit 76842eed31
598 changed files with 18423 additions and 13109 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/recent_projects/src/disconnected_overlay.rs
View file

@ -37,7 +37,7 @@ impl ModalView for DisconnectedOverlay {
_window: &mut Window,
_: &mut Context<Self>,
) -> workspace::DismissDecision {
return workspace::DismissDecision::Dismiss(self.finished);
workspace::DismissDecision::Dismiss(self.finished)
}
fn fade_out_background(&self) -> bool {
true
@ -88,11 +88,8 @@ impl DisconnectedOverlay {
self.finished = true;
cx.emit(DismissEvent);
match &self.host {
Host::SshRemoteProject(ssh_connection_options) => {
self.reconnect_to_ssh_remote(ssh_connection_options.clone(), window, cx);
}
_ => {}
if let Host::SshRemoteProject(ssh_connection_options) = &self.host {
self.reconnect_to_ssh_remote(ssh_connection_options.clone(), window, cx);
}
}

10
crates/recent_projects/src/remote_servers.rs
View file

@ -663,10 +663,10 @@ impl RemoteServerProjects {
let text = Some(state.editor.read(cx).text(cx)).filter(|text| !text.is_empty());
let index = state.index;
self.update_settings_file(cx, move |setting, _| {
if let Some(connections) = setting.ssh_connections.as_mut() {
if let Some(connection) = connections.get_mut(index) {
connection.nickname = text;
}
if let Some(connections) = setting.ssh_connections.as_mut()
&& let Some(connection) = connections.get_mut(index)
{
connection.nickname = text;
}
});
self.mode = Mode::default_mode(&self.ssh_config_servers, cx);
@ -1409,7 +1409,7 @@ impl RemoteServerProjects {
if ssh_settings
.ssh_connections
.as_ref()
.map_or(false, |connections| {
.is_some_and(|connections| {
state
.servers
.iter()

2
crates/recent_projects/src/ssh_connections.rs
View file

@ -436,7 +436,7 @@ impl ModalView for SshConnectionModal {
_window: &mut Window,
_: &mut Context<Self>,
) -> workspace::DismissDecision {
return workspace::DismissDecision::Dismiss(self.finished);
workspace::DismissDecision::Dismiss(self.finished)
}
fn fade_out_background(&self) -> bool {