Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remoting fixes #12137

Merged
merged 3 commits into from
May 22, 2024
Merged

remoting fixes #12137

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
181a1aa
Don't allow relative project paths
ConradIrwin May 22, 2024
b11e6dc
Don't jump back to SSH mode
ConradIrwin May 22, 2024
614dbfd
Fix opening state of remoting dialogue
ConradIrwin May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions crates/recent_projects/src/dev_servers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,7 @@ impl DevServerProjects {
let markdown = cx.new_view(|cx| Markdown::new("".to_string(), markdown_style, None, cx));

Self {
mode: Mode::CreateDevServer(CreateDevServer {
creating: false,
dev_server_id: None,
access_token: None,
manual_setup: false,
}),
mode: Mode::Default(None),
focus_handle,
scroll_handle: ScrollHandle::new(),
dev_server_store,
Expand All @@ -154,12 +149,16 @@ impl DevServerProjects {
dev_server_id: DevServerId,
cx: &mut ViewContext<Self>,
) {
let path = self.project_path_input.read(cx).text(cx).trim().to_string();
let mut path = self.project_path_input.read(cx).text(cx).trim().to_string();

if path == "" {
return;
}

if !path.starts_with('/') && !path.starts_with('~') {
path = format!("~/{}", path);
}

if self
.dev_server_store
.read(cx)
Expand Down Expand Up @@ -381,7 +380,7 @@ impl DevServerProjects {
creating: false,
dev_server_id: Some(DevServerId(dev_server.dev_server_id)),
access_token: Some(dev_server.access_token),
manual_setup: false,
manual_setup,
});
cx.notify();
})?;
Expand Down
Loading