
There were a couple of things preventing this from working: - our hack to stop the node REPL from appearing broke in recent versions of the JS DAP that started passing `--experimental-network-inspection` by default - we had lost the ability to create a debug terminal without specifying a program This PR fixes those issues. We also fixed environment variables from the **runInTerminal** request not getting passed to the spawned program. Release Notes: - Debugger: Fix RunInTerminal not working for JavaScript debugger. --------- Co-authored-by: Cole Miller <cole@zed.dev>
172 lines
6 KiB
Rust
172 lines
6 KiB
Rust
use crate::Shell;
|
|
|
|
#[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
|
|
enum ShellKind {
|
|
#[default]
|
|
Posix,
|
|
Powershell,
|
|
Cmd,
|
|
}
|
|
|
|
impl ShellKind {
|
|
fn new(program: &str) -> Self {
|
|
if program == "powershell"
|
|
|| program.ends_with("powershell.exe")
|
|
|| program == "pwsh"
|
|
|| program.ends_with("pwsh.exe")
|
|
{
|
|
ShellKind::Powershell
|
|
} else if program == "cmd" || program.ends_with("cmd.exe") {
|
|
ShellKind::Cmd
|
|
} else {
|
|
// Someother shell detected, the user might install and use a
|
|
// unix-like shell.
|
|
ShellKind::Posix
|
|
}
|
|
}
|
|
|
|
fn to_shell_variable(&self, input: &str) -> String {
|
|
match self {
|
|
Self::Powershell => Self::to_powershell_variable(input),
|
|
Self::Cmd => Self::to_cmd_variable(input),
|
|
Self::Posix => input.to_owned(),
|
|
}
|
|
}
|
|
|
|
fn to_cmd_variable(input: &str) -> String {
|
|
if let Some(var_str) = input.strip_prefix("${") {
|
|
if var_str.find(':').is_none() {
|
|
// If the input starts with "${", remove the trailing "}"
|
|
format!("%{}%", &var_str[..var_str.len() - 1])
|
|
} else {
|
|
// `${SOME_VAR:-SOME_DEFAULT}`, we currently do not handle this situation,
|
|
// which will result in the task failing to run in such cases.
|
|
input.into()
|
|
}
|
|
} else if let Some(var_str) = input.strip_prefix('$') {
|
|
// If the input starts with "$", directly append to "$env:"
|
|
format!("%{}%", var_str)
|
|
} else {
|
|
// If no prefix is found, return the input as is
|
|
input.into()
|
|
}
|
|
}
|
|
fn to_powershell_variable(input: &str) -> String {
|
|
if let Some(var_str) = input.strip_prefix("${") {
|
|
if var_str.find(':').is_none() {
|
|
// If the input starts with "${", remove the trailing "}"
|
|
format!("$env:{}", &var_str[..var_str.len() - 1])
|
|
} else {
|
|
// `${SOME_VAR:-SOME_DEFAULT}`, we currently do not handle this situation,
|
|
// which will result in the task failing to run in such cases.
|
|
input.into()
|
|
}
|
|
} else if let Some(var_str) = input.strip_prefix('$') {
|
|
// If the input starts with "$", directly append to "$env:"
|
|
format!("$env:{}", var_str)
|
|
} else {
|
|
// If no prefix is found, return the input as is
|
|
input.into()
|
|
}
|
|
}
|
|
|
|
fn args_for_shell(&self, interactive: bool, combined_command: String) -> Vec<String> {
|
|
match self {
|
|
ShellKind::Powershell => vec!["-C".to_owned(), combined_command],
|
|
ShellKind::Cmd => vec!["/C".to_owned(), combined_command],
|
|
ShellKind::Posix => interactive
|
|
.then(|| "-i".to_owned())
|
|
.into_iter()
|
|
.chain(["-c".to_owned(), combined_command])
|
|
.collect(),
|
|
}
|
|
}
|
|
}
|
|
|
|
fn system_shell() -> String {
|
|
if cfg!(target_os = "windows") {
|
|
// `alacritty_terminal` uses this as default on Windows. See:
|
|
// https://github.com/alacritty/alacritty/blob/0d4ab7bca43213d96ddfe40048fc0f922543c6f8/alacritty_terminal/src/tty/windows/mod.rs#L130
|
|
// We could use `util::get_windows_system_shell()` here, but we are running tasks here, so leave it to `powershell.exe`
|
|
// should be okay.
|
|
"powershell.exe".to_string()
|
|
} else {
|
|
std::env::var("SHELL").unwrap_or("/bin/sh".to_string())
|
|
}
|
|
}
|
|
|
|
/// ShellBuilder is used to turn a user-requested task into a
|
|
/// program that can be executed by the shell.
|
|
pub struct ShellBuilder {
|
|
/// The shell to run
|
|
program: String,
|
|
args: Vec<String>,
|
|
interactive: bool,
|
|
kind: ShellKind,
|
|
}
|
|
|
|
pub static DEFAULT_REMOTE_SHELL: &str = "\"${SHELL:-sh}\"";
|
|
|
|
impl ShellBuilder {
|
|
/// Create a new ShellBuilder as configured.
|
|
pub fn new(is_local: bool, shell: &Shell) -> Self {
|
|
let (program, args) = match shell {
|
|
Shell::System => {
|
|
if is_local {
|
|
(system_shell(), Vec::new())
|
|
} else {
|
|
(DEFAULT_REMOTE_SHELL.to_string(), Vec::new())
|
|
}
|
|
}
|
|
Shell::Program(shell) => (shell.clone(), Vec::new()),
|
|
Shell::WithArguments { program, args, .. } => (program.clone(), args.clone()),
|
|
};
|
|
let kind = ShellKind::new(&program);
|
|
Self {
|
|
program,
|
|
args,
|
|
interactive: true,
|
|
kind,
|
|
}
|
|
}
|
|
pub fn non_interactive(mut self) -> Self {
|
|
self.interactive = false;
|
|
self
|
|
}
|
|
/// Returns the label to show in the terminal tab
|
|
pub fn command_label(&self, command_label: &str) -> String {
|
|
match self.kind {
|
|
ShellKind::Powershell => {
|
|
format!("{} -C '{}'", self.program, command_label)
|
|
}
|
|
ShellKind::Cmd => {
|
|
format!("{} /C '{}'", self.program, command_label)
|
|
}
|
|
ShellKind::Posix => {
|
|
let interactivity = self.interactive.then_some("-i ").unwrap_or_default();
|
|
format!("{} {interactivity}-c '{}'", self.program, command_label)
|
|
}
|
|
}
|
|
}
|
|
/// Returns the program and arguments to run this task in a shell.
|
|
pub fn build(
|
|
mut self,
|
|
task_command: Option<String>,
|
|
task_args: &Vec<String>,
|
|
) -> (String, Vec<String>) {
|
|
if let Some(task_command) = task_command {
|
|
let combined_command = task_args
|
|
.into_iter()
|
|
.fold(task_command, |mut command, arg| {
|
|
command.push(' ');
|
|
command.push_str(&self.kind.to_shell_variable(arg));
|
|
command
|
|
});
|
|
|
|
self.args
|
|
.extend(self.kind.args_for_shell(self.interactive, combined_command));
|
|
}
|
|
|
|
(self.program, self.args)
|
|
}
|
|
}
|