Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-28 12:33:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into cli-extension-update

Browse Source
This commit is contained in:
samhanic
2024-01-07 21:24:26 +01:00
parent 78fee308ca f88bce8fe6
commit 70dda3c792
1519 changed files with 45938 additions and 25606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/src/commands/args.rs
View File

@@ -223,7 +223,7 @@ pub struct CommandShellArgs {
#[clap(long, num_args = 0..=1, default_missing_value = "0")]
pub on_port: Option<u16>,
/// Require the given token string to be given in the handshake.
#[clap(long)]
#[clap(long, env = "VSCODE_CLI_REQUIRE_TOKEN")]
pub require_token: Option<String>,
/// Optional parent process id. If provided, the server will be stopped when the process of the given pid no longer exists
#[clap(long, hide = true)]

12
cli/src/commands/tunnels.rs
View File

@@ -533,7 +533,7 @@ async fn serve_with_csa(
{
vec.push(ShutdownRequest::ParentProcessKilled(p));
}
let shutdown = ShutdownRequest::create_rx(vec);
let mut shutdown = ShutdownRequest::create_rx(vec);
let server = loop {
if shutdown.is_open() {
@@ -576,12 +576,10 @@ async fn serve_with_csa(
{
dt.start_existing_tunnel(t).await
} else {
dt.start_new_launcher_tunnel(
gateway_args.name.as_deref(),
gateway_args.random_name,
&[CONTROL_PORT],
)
.await
tokio::select! {
t = dt.start_new_launcher_tunnel(gateway_args.name.as_deref(), gateway_args.random_name, &[CONTROL_PORT]) => t,
_ = shutdown.wait() => return Ok(1),
}
}?;
csa.connection_token = Some(get_connection_token(&tunnel));

4
cli/src/util/prereqs.rs
View File

@@ -20,8 +20,8 @@ lazy_static! {
static ref GENERIC_VERSION_RE: Regex = Regex::new(r"^([0-9]+)\.([0-9]+)$").unwrap();
static ref LIBSTD_CXX_VERSION_RE: BinRegex =
BinRegex::new(r"GLIBCXX_([0-9]+)\.([0-9]+)(?:\.([0-9]+))?").unwrap();
static ref MIN_CXX_VERSION: SimpleSemver = SimpleSemver::new(3, 4, 18);
static ref MIN_LDD_VERSION: SimpleSemver = SimpleSemver::new(2, 17, 0);
static ref MIN_CXX_VERSION: SimpleSemver = SimpleSemver::new(3, 4, 25);
static ref MIN_LDD_VERSION: SimpleSemver = SimpleSemver::new(2, 28, 0);
}
const NIXOS_TEST_PATH: &str = "/etc/NIXOS";