From fbbea7ab018599b354e09aaf6a3679fae8ed5781 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Thu, 25 Jul 2024 08:46:17 -0400 Subject: [PATCH] prisma: Upgrade `zed_extension_api` to v0.0.6 (#15180) This PR upgrades the Prisma extension to use v0.0.6 of the `zed_extension_api`. Release Notes: - N/A --- Cargo.lock | 2 +- extensions/prisma/Cargo.toml | 2 +- extensions/prisma/src/prisma.rs | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 741ec69ae370f25d7af7d729d957073d7a5e4db9..0f5b0c8628e26bac86522730be17b6cdabecd4e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13860,7 +13860,7 @@ dependencies = [ name = "zed_prisma" version = "0.0.3" dependencies = [ - "zed_extension_api 0.0.4", + "zed_extension_api 0.0.6", ] [[package]] diff --git a/extensions/prisma/Cargo.toml b/extensions/prisma/Cargo.toml index 456fb879e8bad314c900de341ee899af457885aa..842385540a1d2e905561ced2a677a69fac07d5b5 100644 --- a/extensions/prisma/Cargo.toml +++ b/extensions/prisma/Cargo.toml @@ -13,4 +13,4 @@ path = "src/prisma.rs" crate-type = ["cdylib"] [dependencies] -zed_extension_api = "0.0.4" +zed_extension_api = "0.0.6" diff --git a/extensions/prisma/src/prisma.rs b/extensions/prisma/src/prisma.rs index 08646f8896af496b6700396d70e5c0b5f0e19eca..8fb731b224a963138243181b1ec0fe7a39dcba66 100644 --- a/extensions/prisma/src/prisma.rs +++ b/extensions/prisma/src/prisma.rs @@ -13,14 +13,14 @@ impl PrismaExtension { fs::metadata(SERVER_PATH).map_or(false, |stat| stat.is_file()) } - fn server_script_path(&mut self, config: zed::LanguageServerConfig) -> Result { + fn server_script_path(&mut self, language_server_id: &zed::LanguageServerId) -> Result { let server_exists = self.server_exists(); if self.did_find_server && server_exists { return Ok(SERVER_PATH.to_string()); } zed::set_language_server_installation_status( - &config.name, + language_server_id, &zed::LanguageServerInstallationStatus::CheckingForUpdate, ); let version = zed::npm_package_latest_version(PACKAGE_NAME)?; @@ -29,7 +29,7 @@ impl PrismaExtension { || zed::npm_package_installed_version(PACKAGE_NAME)?.as_ref() != Some(&version) { zed::set_language_server_installation_status( - &config.name, + language_server_id, &zed::LanguageServerInstallationStatus::Downloading, ); let result = zed::npm_install_package(PACKAGE_NAME, &version); @@ -63,10 +63,10 @@ impl zed::Extension for PrismaExtension { fn language_server_command( &mut self, - config: zed::LanguageServerConfig, + language_server_id: &zed::LanguageServerId, _worktree: &zed::Worktree, ) -> Result { - let server_path = self.server_script_path(config)?; + let server_path = self.server_script_path(language_server_id)?; Ok(zed::Command { command: zed::node_binary_path()?, args: vec![