@@ -179,7 +179,13 @@ pub fn init(languages: Arc<LanguageRegistry>, fs: Arc<dyn Fs>, node: NodeRuntime
},
LanguageInfo {
name: "python",
- adapters: vec![basedpyright_lsp_adapter, ruff_lsp_adapter],
+ adapters: vec![
+ basedpyright_lsp_adapter,
+ ruff_lsp_adapter,
+ ty_lsp_adapter,
+ py_lsp_adapter,
+ python_lsp_adapter,
+ ],
context: Some(python_context_provider),
toolchain: Some(python_toolchain_provider),
manifest_name: Some(SharedString::new_static("pyproject.toml").into()),
@@ -281,9 +287,6 @@ pub fn init(languages: Arc<LanguageRegistry>, fs: Arc<dyn Fs>, node: NodeRuntime
typescript_lsp_adapter,
);
- languages.register_available_lsp_adapter(python_lsp_adapter.name(), python_lsp_adapter);
- languages.register_available_lsp_adapter(py_lsp_adapter.name(), py_lsp_adapter);
- languages.register_available_lsp_adapter(ty_lsp_adapter.name(), ty_lsp_adapter);
// Register Tailwind for the existing languages that should have it by default.
//
// This can be driven by the `language_servers` setting once we have a way for
@@ -89,8 +89,8 @@ Configure language servers in Settings ({#kb zed::OpenSettings}) under Languages
"languages": {
"Python": {
"language_servers": [
- // Disable basedpyright and enable ty, and otherwise
- // use the default configuration.
+ // Disable basedpyright and enable ty, and include all
+ // other registered language servers (ruff, pylsp, pyright).
"ty",
"!basedpyright",
"..."