From d3dda2401b157ca6f931775bed41731c7e88ca7d Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Wed, 22 Oct 2025 18:54:24 +0200 Subject: [PATCH] Weed out shlex from project crate --- Cargo.lock | 1 - crates/project/Cargo.toml | 1 - crates/project/src/lsp_store/lsp_ext_command.rs | 3 ++- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index aa91f1964f22a90a7f9c660c21120b396889ce58..96544a9e7fcb9015ff2624b28548aafdd9412f08 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12854,7 +12854,6 @@ dependencies = [ "settings", "sha2", "shellexpand 2.1.2", - "shlex", "smallvec", "smol", "snippet", diff --git a/crates/project/Cargo.toml b/crates/project/Cargo.toml index 0297611d101ad883c3d68d7dff9e0a92f00c5b71..d9285a8c24ec5130dd8ce8abf5bbd77c830e0f3f 100644 --- a/crates/project/Cargo.toml +++ b/crates/project/Cargo.toml @@ -72,7 +72,6 @@ serde_json.workspace = true settings.workspace = true sha2.workspace = true shellexpand.workspace = true -shlex.workspace = true smallvec.workspace = true smol.workspace = true snippet.workspace = true diff --git a/crates/project/src/lsp_store/lsp_ext_command.rs b/crates/project/src/lsp_store/lsp_ext_command.rs index c79e3df178290fa614e08a8abd85a527a696b003..5066143244da890a63ead6650cb61fdb71d3964a 100644 --- a/crates/project/src/lsp_store/lsp_ext_command.rs +++ b/crates/project/src/lsp_store/lsp_ext_command.rs @@ -657,6 +657,7 @@ impl LspCommand for GetLspRunnables { ); task_template.args.extend(cargo.cargo_args); if !cargo.executable_args.is_empty() { + let shell_kind = task_template.shell.shell_kind(cfg!(windows)); task_template.args.push("--".to_string()); task_template.args.extend( cargo @@ -682,7 +683,7 @@ impl LspCommand for GetLspRunnables { // That bit is not auto-expanded when using single quotes. // Escape extra cargo args unconditionally as those are unlikely to contain `~`. .flat_map(|extra_arg| { - shlex::try_quote(&extra_arg).ok().map(|s| s.to_string()) + shell_kind.try_quote(&extra_arg).map(|s| s.to_string()) }), ); }