From aded3dfb053620dc072508f68ab8232d83893b3c Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Thu, 25 Jul 2024 08:34:45 -0400
Subject: [PATCH] emmet: Upgrade `zed_extension_api` to v0.0.6 (#15177)

This PR upgrades the Emmet extension to use v0.0.6 of the
`zed_extension_api`.

Release Notes:

- N/A
---
 Cargo.lock                    |  2 +-
 extensions/emmet/Cargo.toml   |  2 +-
 extensions/emmet/src/emmet.rs | 20 ++++++--------------
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4f2671f35c..741ec69ae3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -13767,7 +13767,7 @@ dependencies = [
 name = "zed_emmet"
 version = "0.0.3"
 dependencies = [
- "zed_extension_api 0.0.4",
+ "zed_extension_api 0.0.6",
 ]
 
 [[package]]
diff --git a/extensions/emmet/Cargo.toml b/extensions/emmet/Cargo.toml
index 82053088e5..7f2a16711b 100644
--- a/extensions/emmet/Cargo.toml
+++ b/extensions/emmet/Cargo.toml
@@ -13,4 +13,4 @@ path = "src/emmet.rs"
 crate-type = ["cdylib"]
 
 [dependencies]
-zed_extension_api = "0.0.4"
+zed_extension_api = "0.0.6"
diff --git a/extensions/emmet/src/emmet.rs b/extensions/emmet/src/emmet.rs
index 40874b7b84..83fe809c34 100644
--- a/extensions/emmet/src/emmet.rs
+++ b/extensions/emmet/src/emmet.rs
@@ -13,14 +13,14 @@ impl EmmetExtension {
         fs::metadata(SERVER_PATH).map_or(false, |stat| stat.is_file())
     }
 
-    fn server_script_path(&mut self, config: zed::LanguageServerConfig) -> Result<String> {
+    fn server_script_path(&mut self, language_server_id: &zed::LanguageServerId) -> Result<String> {
         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 EmmetExtension {
             || 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 EmmetExtension {
 
     fn language_server_command(
         &mut self,
-        config: zed::LanguageServerConfig,
-        _: &zed::Worktree,
+        language_server_id: &zed::LanguageServerId,
+        _worktree: &zed::Worktree,
     ) -> Result<zed::Command> {
-        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![
@@ -80,14 +80,6 @@ impl zed::Extension for EmmetExtension {
             env: Default::default(),
         })
     }
-
-    fn language_server_initialization_options(
-        &mut self,
-        _: zed::LanguageServerConfig,
-        _: &zed::Worktree,
-    ) -> Result<Option<String>> {
-        Ok(None)
-    }
 }
 
 zed::register_extension!(EmmetExtension);