Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
languages: Avoid probing unresolved macOS Python shim (#62534)
Connor Edwards93f6b2e59725
diff --git a/Cargo.lock b/Cargo.lockindex 1e69f12677e..a8d41d773ff 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -13083,7 +13083,7 @@ dependencies = [[[package]]name = "pet"version = "0.1.0"-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=9e61a22af989fe54937bf07c9f9cff1bc53d9056#9e61a22af989fe54937bf07c9f9cff1bc53d9056"+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0#bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0"dependencies = ["clap","env_logger 0.10.2",@@ -13095,6 +13095,7 @@ dependencies = ["pet-env-var-path","pet-fs","pet-global-virtualenvs",+ "pet-hatch","pet-homebrew","pet-jsonrpc","pet-linux-global-python",@@ -13125,7 +13126,7 @@ dependencies = [[[package]]name = "pet-conda"version = "0.1.0"-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=9e61a22af989fe54937bf07c9f9cff1bc53d9056#9e61a22af989fe54937bf07c9f9cff1bc53d9056"+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0#bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0"dependencies = ["env_logger 0.10.2","lazy_static",@@ -13145,7 +13146,7 @@ dependencies = [[[package]]name = "pet-core"version = "0.1.0"-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=9e61a22af989fe54937bf07c9f9cff1bc53d9056#9e61a22af989fe54937bf07c9f9cff1bc53d9056"+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0#bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0"dependencies = ["clap","lazy_static",@@ -13160,7 +13161,7 @@ dependencies = [[[package]]name = "pet-env-var-path"version = "0.1.0"-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=9e61a22af989fe54937bf07c9f9cff1bc53d9056#9e61a22af989fe54937bf07c9f9cff1bc53d9056"+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0#bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0"dependencies = ["lazy_static","log",@@ -13176,9 +13177,10 @@ dependencies = [[[package]]name = "pet-fs"version = "0.1.0"-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=9e61a22af989fe54937bf07c9f9cff1bc53d9056#9e61a22af989fe54937bf07c9f9cff1bc53d9056"+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0#bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0"dependencies = ["glob",+ "lazy_static","log","msvc_spectre_libs","windows-sys 0.59.0",@@ -13187,7 +13189,7 @@ dependencies = [[[package]]name = "pet-global-virtualenvs"version = "0.1.0"-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=9e61a22af989fe54937bf07c9f9cff1bc53d9056#9e61a22af989fe54937bf07c9f9cff1bc53d9056"+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0#bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0"dependencies = ["log","msvc_spectre_libs",@@ -13197,10 +13199,23 @@ dependencies = ["pet-virtualenv",]+[[package]]+name = "pet-hatch"+version = "0.1.0"+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0#bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0"+dependencies = [+ "log",+ "pet-core",+ "pet-fs",+ "pet-python-utils",+ "serde",+ "toml 0.9.8",+]+[[package]]name = "pet-homebrew"version = "0.1.0"-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=9e61a22af989fe54937bf07c9f9cff1bc53d9056#9e61a22af989fe54937bf07c9f9cff1bc53d9056"+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0#bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0"dependencies = ["lazy_static","log",@@ -13219,7 +13234,7 @@ dependencies = [[[package]]name = "pet-jsonrpc"version = "0.1.0"-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=9e61a22af989fe54937bf07c9f9cff1bc53d9056#9e61a22af989fe54937bf07c9f9cff1bc53d9056"+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0#bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0"dependencies = ["env_logger 0.10.2","log",@@ -13232,7 +13247,7 @@ dependencies = [[[package]]name = "pet-linux-global-python"version = "0.1.0"-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=9e61a22af989fe54937bf07c9f9cff1bc53d9056#9e61a22af989fe54937bf07c9f9cff1bc53d9056"+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0#bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0"dependencies = ["log","msvc_spectre_libs",@@ -13245,7 +13260,7 @@ dependencies = [[[package]]name = "pet-mac-commandlinetools"version = "0.1.0"-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=9e61a22af989fe54937bf07c9f9cff1bc53d9056#9e61a22af989fe54937bf07c9f9cff1bc53d9056"+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0#bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0"dependencies = ["log","msvc_spectre_libs",@@ -13258,7 +13273,7 @@ dependencies = [[[package]]name = "pet-mac-python-org"version = "0.1.0"-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=9e61a22af989fe54937bf07c9f9cff1bc53d9056#9e61a22af989fe54937bf07c9f9cff1bc53d9056"+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0#bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0"dependencies = ["log","msvc_spectre_libs",@@ -13271,7 +13286,7 @@ dependencies = [[[package]]name = "pet-mac-xcode"version = "0.1.0"-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=9e61a22af989fe54937bf07c9f9cff1bc53d9056#9e61a22af989fe54937bf07c9f9cff1bc53d9056"+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0#bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0"dependencies = ["log","msvc_spectre_libs",@@ -13284,7 +13299,7 @@ dependencies = [[[package]]name = "pet-pipenv"version = "0.1.0"-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=9e61a22af989fe54937bf07c9f9cff1bc53d9056#9e61a22af989fe54937bf07c9f9cff1bc53d9056"+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0#bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0"dependencies = ["lazy_static","log",@@ -13299,7 +13314,7 @@ dependencies = [[[package]]name = "pet-pixi"version = "0.1.0"-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=9e61a22af989fe54937bf07c9f9cff1bc53d9056#9e61a22af989fe54937bf07c9f9cff1bc53d9056"+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0#bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0"dependencies = ["log","msvc_spectre_libs",@@ -13311,7 +13326,7 @@ dependencies = [[[package]]name = "pet-poetry"version = "0.1.0"-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=9e61a22af989fe54937bf07c9f9cff1bc53d9056#9e61a22af989fe54937bf07c9f9cff1bc53d9056"+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0#bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0"dependencies = ["base64 0.22.1","lazy_static",@@ -13332,7 +13347,7 @@ dependencies = [[[package]]name = "pet-pyenv"version = "0.1.0"-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=9e61a22af989fe54937bf07c9f9cff1bc53d9056#9e61a22af989fe54937bf07c9f9cff1bc53d9056"+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0#bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0"dependencies = ["lazy_static","log",@@ -13350,7 +13365,7 @@ dependencies = [[[package]]name = "pet-python-utils"version = "0.1.0"-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=9e61a22af989fe54937bf07c9f9cff1bc53d9056#9e61a22af989fe54937bf07c9f9cff1bc53d9056"+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0#bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0"dependencies = ["env_logger 0.10.2","lazy_static",@@ -13367,7 +13382,7 @@ dependencies = [[[package]]name = "pet-reporter"version = "0.1.0"-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=9e61a22af989fe54937bf07c9f9cff1bc53d9056#9e61a22af989fe54937bf07c9f9cff1bc53d9056"+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0#bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0"dependencies = ["env_logger 0.10.2","log",@@ -13381,7 +13396,7 @@ dependencies = [[[package]]name = "pet-telemetry"version = "0.1.0"-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=9e61a22af989fe54937bf07c9f9cff1bc53d9056#9e61a22af989fe54937bf07c9f9cff1bc53d9056"+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0#bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0"dependencies = ["env_logger 0.10.2","lazy_static",@@ -13396,10 +13411,12 @@ dependencies = [[[package]]name = "pet-uv"version = "0.1.0"-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=9e61a22af989fe54937bf07c9f9cff1bc53d9056#9e61a22af989fe54937bf07c9f9cff1bc53d9056"+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0#bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0"dependencies = [+ "glob","log","pet-core",+ "pet-fs","pet-python-utils","serde","toml 0.9.8",@@ -13408,7 +13425,7 @@ dependencies = [[[package]]name = "pet-venv"version = "0.1.0"-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=9e61a22af989fe54937bf07c9f9cff1bc53d9056#9e61a22af989fe54937bf07c9f9cff1bc53d9056"+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0#bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0"dependencies = ["log","msvc_spectre_libs",@@ -13420,7 +13437,7 @@ dependencies = [[[package]]name = "pet-virtualenv"version = "0.1.0"-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=9e61a22af989fe54937bf07c9f9cff1bc53d9056#9e61a22af989fe54937bf07c9f9cff1bc53d9056"+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0#bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0"dependencies = ["log","msvc_spectre_libs",@@ -13432,7 +13449,7 @@ dependencies = [[[package]]name = "pet-virtualenvwrapper"version = "0.1.0"-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=9e61a22af989fe54937bf07c9f9cff1bc53d9056#9e61a22af989fe54937bf07c9f9cff1bc53d9056"+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0#bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0"dependencies = ["log","msvc_spectre_libs",@@ -13445,7 +13462,7 @@ dependencies = [[[package]]name = "pet-windows-registry"version = "0.1.0"-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=9e61a22af989fe54937bf07c9f9cff1bc53d9056#9e61a22af989fe54937bf07c9f9cff1bc53d9056"+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0#bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0"dependencies = ["lazy_static","log",@@ -13463,7 +13480,7 @@ dependencies = [[[package]]name = "pet-windows-store"version = "0.1.0"-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=9e61a22af989fe54937bf07c9f9cff1bc53d9056#9e61a22af989fe54937bf07c9f9cff1bc53d9056"+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0#bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0"dependencies = ["lazy_static","log",@@ -13479,7 +13496,7 @@ dependencies = [[[package]]name = "pet-winpython"version = "0.1.0"-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=9e61a22af989fe54937bf07c9f9cff1bc53d9056#9e61a22af989fe54937bf07c9f9cff1bc53d9056"+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0#bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0"dependencies = ["lazy_static","log",@@ -14454,7 +14471,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"dependencies = ["bytes 1.11.1",- "heck 0.5.0",+ "heck 0.4.1","itertools 0.11.0","log","multimap",@@ -17340,7 +17357,7 @@ version = "0.8.9"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "c1c97747dbf44bb1ca44a561ece23508e99cb592e862f22222dcf42f51d1e451"dependencies = [- "heck 0.5.0",+ "heck 0.4.1","proc-macro2","quote","syn 2.0.117",diff --git a/Cargo.toml b/Cargo.tomlindex 4b9768ee4cc..9af94b2395a 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -733,13 +733,13 @@ pathfinder_geometry = "0.5"pciid-parser = "0.8.0"pathdiff = "0.2"percent-encoding = "2.3.2"-pet = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "9e61a22af989fe54937bf07c9f9cff1bc53d9056" }-pet-conda = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "9e61a22af989fe54937bf07c9f9cff1bc53d9056" }-pet-core = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "9e61a22af989fe54937bf07c9f9cff1bc53d9056" }-pet-fs = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "9e61a22af989fe54937bf07c9f9cff1bc53d9056" }-pet-poetry = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "9e61a22af989fe54937bf07c9f9cff1bc53d9056" }-pet-reporter = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "9e61a22af989fe54937bf07c9f9cff1bc53d9056" }-pet-virtualenv = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "9e61a22af989fe54937bf07c9f9cff1bc53d9056" }+pet = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0" }+pet-conda = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0" }+pet-core = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0" }+pet-fs = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0" }+pet-poetry = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0" }+pet-reporter = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0" }+pet-virtualenv = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "bb8e04607b96a3865d6aa4bb2a5a5a82ce05b5f0" }piper = "0.2"portable-pty = "0.9.0"postage = { version = "0.5", features = ["futures-traits"] }diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rsindex 01d2b450c5b..a25431175ec 100644--- a/crates/languages/src/python.rs+++ b/crates/languages/src/python.rs@@ -1148,6 +1148,7 @@ fn python_env_kind_display(k: &PythonEnvironmentKind) -> &'static str {PythonEnvironmentKind::PyenvVirtualEnv => "Pyenv",PythonEnvironmentKind::Pipenv => "Pipenv",PythonEnvironmentKind::Poetry => "Poetry",+ PythonEnvironmentKind::Hatch => "Hatch",PythonEnvironmentKind::MacPythonOrg => "global (Python.org)",PythonEnvironmentKind::MacCommandLineTools => "global (Command Line Tools for Xcode)",PythonEnvironmentKind::LinuxGlobal => "global",@@ -1319,7 +1320,7 @@ impl ToolchainLister for PythonToolchainProvider {}let reporter = pet_reporter::collect::create_reporter();- pet::find::find_and_report_envs(&reporter, config, &locators, &environment, None);+ pet::find::find_and_report_envs(&reporter, config, &locators, &environment, None, None);let mut toolchains = reporter.environments