From 88e7aac53f744ea6be3ce9cd3113b0fc9155436e Mon Sep 17 00:00:00 2001 From: Olivier Benz Date: Thu, 6 Jan 2022 15:08:15 +0100 Subject: [PATCH] Support both single and double brackets in code-server's URI template (#934) * Update vsc.R * Modify url to allow proxied requests * Minor update * Fix message for webview * Support both single and double brackets Co-authored-by: Kun Ren --- R/session/vsc.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/session/vsc.R b/R/session/vsc.R index c2f0695eb..8f0505a9b 100644 --- a/R/session/vsc.R +++ b/R/session/vsc.R @@ -516,7 +516,7 @@ show_browser <- function(url, title = url, ..., if (nzchar(proxy_uri)) { is_base_path <- grepl("\\:\\d+$", url) url <- sub("^https?\\://(127\\.0\\.0\\.1|localhost)(\\:)?", - sub("{port}", "", proxy_uri, fixed = TRUE), url) + sub("\\{\\{?port\\}\\}?", "", proxy_uri), url) if (is_base_path) { url <- paste0(url, "/") } @@ -573,7 +573,7 @@ show_webview <- function(url, title, ..., viewer) { if (nzchar(proxy_uri)) { is_base_path <- grepl("\\:\\d+$", url) url <- sub("^https?\\://(127\\.0\\.0\\.1|localhost)(\\:)?", - sub("{port}", "", proxy_uri, fixed = TRUE), url) + sub("\\{\\{?port\\}\\}?", "", proxy_uri), url) if (is_base_path) { url <- paste0(url, "/") }