9d52b6c538
Closes #40576 This PR makes Conda activation configurable and transparent by adding a `terminal.detect_venv.on.conda_manager` setting (`"auto" | "conda" | "mamba" | "micromamba"`, default `"auto"`), updating Python environment activation to honor this preference (or the detected manager executable) and fall back to `conda` when necessary. The preference is passed via `ZED_CONDA_MANAGER` from the terminal settings, and the activation command is built accordingly (with proper quoting for paths). Changes span `zed/crates/terminal/src/terminal_settings.rs` (new `CondaManager` and setting), `zed/crates/project/src/terminals.rs` (inject env var), `zed/crates/languages/src/python.rs` (activation logic), and `zed/assets/settings/default.json` (document the setting). Default behavior remains unchanged for most users while enabling explicit selection of `mamba` or `micromamba`. Release Notes: - Added: terminal.detect_venv.on.conda_manager setting to choose the Conda manager (auto, conda, mamba, micromamba). Default: auto. - Changed: Python Conda environment activation now respects the configured manager, otherwise uses the detected environment manager executable, and falls back to conda. - Reliability: Activation commands quote manager paths to handle spaces across platforms. - Compatibility: No breaking changes; non-Conda environments are unaffected; remote terminals are supported. --------- Co-authored-by: Lukas Wirth <me@lukaswirth.dev> Co-authored-by: Lukas Wirth <lukas@zed.dev>
108 lines
3.1 KiB
TOML
108 lines
3.1 KiB
TOML
[package]
|
|
name = "languages"
|
|
version = "0.1.0"
|
|
edition.workspace = true
|
|
publish.workspace = true
|
|
license = "GPL-3.0-or-later"
|
|
|
|
[lints]
|
|
workspace = true
|
|
|
|
[features]
|
|
test-support = [
|
|
"load-grammars"
|
|
]
|
|
load-grammars = [
|
|
"tree-sitter",
|
|
"tree-sitter-bash",
|
|
"tree-sitter-c",
|
|
"tree-sitter-cpp",
|
|
"tree-sitter-css",
|
|
"tree-sitter-diff",
|
|
"tree-sitter-gitcommit",
|
|
"tree-sitter-go",
|
|
"tree-sitter-go-mod",
|
|
"tree-sitter-gowork",
|
|
"tree-sitter-jsdoc",
|
|
"tree-sitter-json",
|
|
"tree-sitter-md",
|
|
"tree-sitter-python",
|
|
"tree-sitter-regex",
|
|
"tree-sitter-rust",
|
|
"tree-sitter-typescript",
|
|
"tree-sitter-yaml",
|
|
]
|
|
|
|
[dependencies]
|
|
anyhow.workspace = true
|
|
async-compression.workspace = true
|
|
async-fs.workspace = true
|
|
async-tar.workspace = true
|
|
async-trait.workspace = true
|
|
chrono.workspace = true
|
|
collections.workspace = true
|
|
futures.workspace = true
|
|
gpui.workspace = true
|
|
http_client.workspace = true
|
|
json_schema_store.workspace = true
|
|
itertools.workspace = true
|
|
language.workspace = true
|
|
log.workspace = true
|
|
lsp.workspace = true
|
|
node_runtime.workspace = true
|
|
parking_lot.workspace = true
|
|
pet-conda.workspace = true
|
|
pet-core.workspace = true
|
|
pet-fs.workspace = true
|
|
pet-poetry.workspace = true
|
|
pet-reporter.workspace = true
|
|
pet-virtualenv.workspace = true
|
|
pet.workspace = true
|
|
project.workspace = true
|
|
regex.workspace = true
|
|
rope.workspace = true
|
|
rust-embed.workspace = true
|
|
serde.workspace = true
|
|
serde_json.workspace = true
|
|
serde_json_lenient.workspace = true
|
|
settings.workspace = true
|
|
smol.workspace = true
|
|
url.workspace = true
|
|
task.workspace = true
|
|
terminal.workspace = true
|
|
theme.workspace = true
|
|
toml.workspace = true
|
|
tree-sitter = { workspace = true, optional = true }
|
|
tree-sitter-bash = { workspace = true, optional = true }
|
|
tree-sitter-c = { workspace = true, optional = true }
|
|
tree-sitter-cpp = { workspace = true, optional = true }
|
|
tree-sitter-css = { workspace = true, optional = true }
|
|
tree-sitter-diff = { workspace = true, optional = true }
|
|
tree-sitter-gitcommit = { workspace = true, optional = true }
|
|
tree-sitter-go = { workspace = true, optional = true }
|
|
tree-sitter-go-mod = { workspace = true, optional = true }
|
|
tree-sitter-gowork = { workspace = true, optional = true }
|
|
tree-sitter-jsdoc = { workspace = true, optional = true }
|
|
tree-sitter-json = { workspace = true, optional = true }
|
|
tree-sitter-md = { workspace = true, optional = true }
|
|
tree-sitter-python = { workspace = true, optional = true }
|
|
tree-sitter-regex = { workspace = true, optional = true }
|
|
tree-sitter-rust = { workspace = true, optional = true }
|
|
tree-sitter-typescript = { workspace = true, optional = true }
|
|
tree-sitter-yaml = { workspace = true, optional = true }
|
|
util.workspace = true
|
|
|
|
[dev-dependencies]
|
|
pretty_assertions.workspace = true
|
|
text.workspace = true
|
|
theme = { workspace = true, features = ["test-support"] }
|
|
tree-sitter-bash.workspace = true
|
|
tree-sitter-c.workspace = true
|
|
tree-sitter-css.workspace = true
|
|
tree-sitter-go.workspace = true
|
|
tree-sitter-python.workspace = true
|
|
tree-sitter-typescript.workspace = true
|
|
tree-sitter.workspace = true
|
|
unindent.workspace = true
|
|
workspace = { workspace = true, features = ["test-support"] }
|