Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix venv path not being checked for existing

Browse source
This commit is contained in:
Lukas Wirth 2025-08-15 13:23:26 +02:00
parent 7030465d04
commit 9f54112e7f
5 changed files with 121 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -9266,6 +9266,7 @@ dependencies = [
"snippet_provider",
"task",
"tempfile",
"terminal",
"text",
"theme",
"toml 0.8.20",

1
crates/languages/Cargo.toml
View file

@ -72,6 +72,7 @@ smol.workspace = true
snippet_provider.workspace = true
task.workspace = true
tempfile.workspace = true
terminal.workspace = true
toml.workspace = true
tree-sitter = { workspace = true, optional = true }
tree-sitter-bash = { workspace = true, optional = true }

1
crates/languages/src/python.rs
View file

@ -1008,7 +1008,6 @@ const BINARY_DIR: &str = if cfg!(target_os = "windows") {
"bin"
};
// TODO lw: this depends on the shell?
const ACTIVATE_PATH: &str = if cfg!(target_os = "windows") {
"Scripts/activate.bat"
} else {

187
crates/project/src/terminals.rs
View file

@ -123,76 +123,102 @@ impl Project {
cx.spawn(async move |project, cx| {
let python_venv_directory = if let Some(path) = path {
match project.upgrade() {
Some(project) => Self::python_venv_directory(project, path, venv.clone(), cx)
.await?
.zip(Some(venv)),
Some(project) => {
let venv_dir =
Self::python_venv_directory(project.clone(), path, venv.clone(), cx)
.await?;
match venv_dir {
Some(venv_dir)
if project
.update(cx, |project, cx| {
project.resolve_abs_path(
&venv_dir
.join(BINARY_DIR)
.join("activate")
.to_string_lossy(),
cx,
)
})?
.await
.is_some_and(|m| m.is_file()) =>
{
Some((venv_dir, venv))
}
_ => None,
}
}
None => None,
}
} else {
None
};
project.update(cx, |project, cx| {
// todo lw: move all this out of here?
let startup_script = move |shell: &_| {
let Some((python_venv_directory, venv)) = &python_venv_directory else {
return None;
};
// todo: If this returns `None` we may don't have a venv, but we may still have a python toolchiain
// we should modify the PATH here still
let venv_settings = venv.as_option()?;
let script_kind = if venv_settings.activate_script
== terminal_settings::ActivateScript::Default
{
match shell {
Shell::Program(program) => Self::activate_script_kind(Some(program)),
Shell::WithArguments {
program,
args: _,
title_override: _,
} => Self::activate_script_kind(Some(program)),
Shell::System => Self::activate_script_kind(None),
}
} else {
venv_settings.activate_script
};
let activate_script_name = match script_kind {
terminal_settings::ActivateScript::Default
| terminal_settings::ActivateScript::Pyenv => "activate",
terminal_settings::ActivateScript::Csh => "activate.csh",
terminal_settings::ActivateScript::Fish => "activate.fish",
terminal_settings::ActivateScript::Nushell => "activate.nu",
terminal_settings::ActivateScript::PowerShell => "activate.ps1",
};
let activate_keyword = match venv_settings.activate_script {
terminal_settings::ActivateScript::Default => ".",
terminal_settings::ActivateScript::Nushell => "overlay use",
terminal_settings::ActivateScript::PowerShell => ".",
terminal_settings::ActivateScript::Pyenv => "pyenv",
_ => "source",
};
let line_ending = if cfg!(windows) { '\r' } else { 'n' };
if venv_settings.venv_name.is_empty() {
let path = python_venv_directory
.join(BINARY_DIR)
.join(activate_script_name)
.to_string_lossy()
.to_string();
let quoted = shlex::try_quote(&path).ok()?;
Some(format!(
"{} {} ; clear{}",
activate_keyword, quoted, line_ending
))
} else {
Some(format!(
"{activate_keyword} {activate_script_name} {name}; clear{line_ending}",
name = venv_settings.venv_name
))
}
// todo lw: move all this out of here?
let startup_script = move |shell: &_| {
let Some((python_venv_directory, venv)) = &python_venv_directory else {
return None;
};
// todo: If this returns `None` we may don't have a venv, but we may still have a python toolchiain
// we should modify the PATH here still
let venv_settings = venv.as_option()?;
// todo: handle ssh!
let script_kind = if venv_settings.activate_script
== terminal_settings::ActivateScript::Default
{
match shell {
Shell::Program(program) => ActivateScript::by_shell(program),
Shell::WithArguments {
program,
args: _,
title_override: _,
} => ActivateScript::by_shell(program),
Shell::System => None,
}
} else {
Some(venv_settings.activate_script)
}
.or_else(|| ActivateScript::by_env());
let script_kind = match script_kind {
Some(activate) => activate,
None => ActivateScript::Default,
};
let activate_script_name = match script_kind {
terminal_settings::ActivateScript::Default
| terminal_settings::ActivateScript::Pyenv => "activate",
terminal_settings::ActivateScript::Csh => "activate.csh",
terminal_settings::ActivateScript::Fish => "activate.fish",
terminal_settings::ActivateScript::Nushell => "activate.nu",
terminal_settings::ActivateScript::PowerShell => "activate.ps1",
};
let activate_keyword = match script_kind {
terminal_settings::ActivateScript::Nushell => "overlay use",
terminal_settings::ActivateScript::PowerShell => ".",
terminal_settings::ActivateScript::Pyenv => "pyenv",
terminal_settings::ActivateScript::Default
| terminal_settings::ActivateScript::Csh
| terminal_settings::ActivateScript::Fish => "source",
};
let line_ending = if cfg!(windows) { '\r' } else { '\n' };
if venv_settings.venv_name.is_empty() {
let path = python_venv_directory
.join(BINARY_DIR)
.join(activate_script_name)
.to_string_lossy()
.to_string();
let quoted = shlex::try_quote(&path).ok()?;
Some(format!("{activate_keyword} {quoted}{line_ending}",))
} else {
Some(format!(
"{activate_keyword} {activate_script_name} {name}{line_ending}",
name = venv_settings.venv_name
))
}
};
project.update(cx, |project, cx| {
project.create_terminal_with_startup(kind, startup_script, cx)
})?
})
@ -532,23 +558,22 @@ impl Project {
}
let r = this.update(cx, move |_, cx| {
let fs = worktree.read(cx).as_local()?.fs().clone();
let map: Vec<_> = venv_settings
.directories
.iter()
.map(|name| abs_path.join(name))
.collect();
Some(cx.spawn(async move |_, _| {
Some(cx.spawn(async move |project, cx| {
for venv_path in map {
let bin_path = venv_path.join(BINARY_DIR);
// One-time synchronous check is acceptable for terminal/task initialization
// we are within a spawned future anyways
let exists = fs
.metadata(&bin_path)
let exists = project
.upgrade()?
.update(cx, |project, cx| {
project.resolve_abs_path(&bin_path.to_string_lossy(), cx)
})
.ok()?
.await
.ok()
.flatten()
.map_or(false, |meta| meta.is_dir);
.map_or(false, |meta| meta.is_dir());
if exists {
return Some(venv_path);
}
@ -562,22 +587,6 @@ impl Project {
})
}
fn activate_script_kind(shell: Option<&str>) -> ActivateScript {
let shell_env = std::env::var("SHELL").ok();
let shell_path = shell.or_else(|| shell_env.as_deref());
let shell = std::path::Path::new(shell_path.unwrap_or(""))
.file_name()
.and_then(|name| name.to_str())
.unwrap_or("");
match shell {
"fish" => ActivateScript::Fish,
"tcsh" => ActivateScript::Csh,
"nu" => ActivateScript::Nushell,
"powershell" | "pwsh" => ActivateScript::PowerShell,
_ => ActivateScript::Default,
}
}
pub fn local_terminal_handles(&self) -> &Vec<WeakEntity<terminal::Terminal>> {
&self.terminals.local_handles
}

21
crates/terminal/src/terminal_settings.rs
View file

@ -135,6 +135,27 @@ pub enum ActivateScript {
Pyenv,
}
impl ActivateScript {
pub fn by_shell(shell: &str) -> Option<Self> {
Some(match shell {
"fish" => ActivateScript::Fish,
"tcsh" => ActivateScript::Csh,
"nu" => ActivateScript::Nushell,
"powershell" | "pwsh" => ActivateScript::PowerShell,
"sh" => ActivateScript::Default,
_ => return None,
})
}
pub fn by_env() -> Option<Self> {
let shell = std::env::var("SHELL").ok()?;
let shell = std::path::Path::new(&shell)
.file_name()
.and_then(|name| name.to_str())?;
Self::by_shell(shell)
}
}
#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema)]
pub struct TerminalSettingsContent {
/// What shell to use when opening a terminal.