Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
python: Respect user settings for toolchain discovery over the toolchain set in Zed (#48262)
Piotr Osiewiczd7d1b5404499
diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rsindex 17a1d24be76..dd059313b6d 100644--- a/crates/languages/src/python.rs+++ b/crates/languages/src/python.rs@@ -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())