Remoting: Fix connecting to servers with long hostnames (#20093)

Closes #20018

Release Notes:

- Remoting: Fixed connecting to hosts with long (>~50 character)
hostnames
This commit is contained in:
Conrad Irwin 2024-11-01 13:52:21 -06:00 committed by GitHub
parent 273173ec8a
commit b5c38e9a09
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 50 additions and 34 deletions

View file

@ -16,6 +16,7 @@ use gpui::{
};
use picker::Picker;
use project::Project;
use remote::ssh_session::ConnectionIdentifier;
use remote::SshConnectionOptions;
use remote::SshRemoteClient;
use settings::update_settings_file;
@ -384,7 +385,7 @@ impl RemoteServerProjects {
let ssh_prompt = cx.new_view(|cx| SshPrompt::new(&connection_options, cx));
let connection = connect_over_ssh(
connection_options.remote_server_identifier(),
ConnectionIdentifier::Setup,
connection_options.clone(),
ssh_prompt.clone(),
cx,
@ -475,7 +476,7 @@ impl RemoteServerProjects {
.clone();
let connect = connect_over_ssh(
connection_options.remote_server_identifier(),
ConnectionIdentifier::Setup,
connection_options.clone(),
prompt,
cx,

View file

@ -14,6 +14,7 @@ use gpui::{AppContext, Model};
use language::CursorShape;
use markdown::{Markdown, MarkdownStyle};
use release_channel::ReleaseChannel;
use remote::ssh_session::ConnectionIdentifier;
use remote::{SshConnectionOptions, SshPlatform, SshRemoteClient};
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
@ -534,7 +535,7 @@ pub fn is_connecting_over_ssh(workspace: &Workspace, cx: &AppContext) -> bool {
}
pub fn connect_over_ssh(
unique_identifier: String,
unique_identifier: ConnectionIdentifier,
connection_options: SshConnectionOptions,
ui: View<SshPrompt>,
cx: &mut WindowContext,