yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

python: Respect user settings for toolchain discovery over the toolchain set in Zed (#48262)

Browse Source 
Closes #46754

Release Notes:

- python: User settings now take precedence over toolchain set in Zed
for pyright/basedpyright
This commit is contained in:
Piotr Osiewicz authored and GitHub committed 2026-04-27 08:40:41 +00:00
1 parent 729484e834
commit 650e3ffcc3
1 file changed
+29 -1
Download Patch File Download Diff File Expand all files Collapse all files
crates/languages/src/python.rs
+29 -1
View File
@@ -658,8 +658,22 @@ impl LspAdapter for PyrightLspAdapter {
.and_then(|s| s.settings.clone())
.unwrap_or_default();
// If we have a detected toolchain, configure Pyright to use it
// If we have a detected toolchain, configure Pyright to use it - unless the user sets it themselves.
let should_insert_toolchain = || {
user_settings.as_object().is_none_or(|object| {
[
"venvPath",
"venv",
"python",
"pythonPath",
"defaultInterpreterPath",
]
.into_iter()
.any(|known_key| object.contains_key(known_key))
})
};
if let Some(toolchain) = toolchain
&& should_insert_toolchain()
&& let Ok(env) =
serde_json::from_value::<PythonToolchainData>(toolchain.as_json.clone())
{
@@ -2075,7 +2089,21 @@ impl LspAdapter for BasedPyrightLspAdapter {
.unwrap_or_default();
// If we have a detected toolchain, configure Pyright to use it
let should_insert_toolchain = || {
user_settings.as_object().is_none_or(|object| {
[
"venvPath",
"venv",
"python",
"pythonPath",
"defaultInterpreterPath",
]
.into_iter()
.any(|known_key| object.contains_key(known_key))
})
};
if let Some(toolchain) = toolchain
&& should_insert_toolchain()
&& let Ok(env) = serde_json::from_value::<
pet_core::python_environment::PythonEnvironment,
>(toolchain.as_json.clone())