Add support for language server settings and initialization options

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "powershell"
-version = "0.4.0"
+version = "0.5.0"
 edition = "2021"
 
 [lib]

extension.toml

@@ -1,6 +1,6 @@
 id = "powershell"
 name = "PowerShell"
-version = "0.4.0"
+version = "0.5.0"
 schema_version = 1
 authors = ["Thanabodee Charoenpiriyakij <wingyminus@gmail.com>"]
 description = "PowerShell support"

src/powershell.rs

@@ -1,6 +1,7 @@
-use std::env;
 use std::fs;
+use std::path;
 use zed_extension_api::{self as zed, Result};
+use zed_extension_api::settings::LspSettings;
 
 struct PowerShellExtension {
     /// The PowerShell binary, default to `pwsh`.
@@ -27,7 +28,7 @@ impl zed::Extension for PowerShellExtension {
 
         let bundle_path = self
             .language_server_path(language_server_id)
-            .map_err(|err| format!("failed to get editor services: {err}"))?;
+            .map_err(|err| format!("failed to get editor services: {}", err))?;
 
         let command = format!(
             "Import-Module ( \
@@ -56,18 +57,36 @@ impl zed::Extension for PowerShellExtension {
             env: Default::default(),
         })
     }
+
+    fn language_server_initialization_options(
+        &mut self,
+        language_server_id: &zed_extension_api::LanguageServerId,
+        worktree: &zed_extension_api::Worktree,
+    ) -> zed_extension_api::Result<Option<zed_extension_api::serde_json::Value>> {
+        let settings = LspSettings::for_worktree(language_server_id.as_ref(), worktree)?;
+        Ok(settings.initialization_options)
+    }
+
+    fn language_server_workspace_configuration(
+        &mut self,
+        language_server_id: &zed_extension_api::LanguageServerId,
+        worktree: &zed_extension_api::Worktree,
+    ) -> zed_extension_api::Result<Option<zed_extension_api::serde_json::Value>> {
+        let settings = LspSettings::for_worktree(language_server_id.as_ref(), worktree)?;
+        Ok(settings.settings)
+    }
 }
 
 impl PowerShellExtension {
     fn powershell_binary_path(&mut self, worktree: &zed::Worktree) -> Result<String> {
         let pwsh_path = match &self.powershell_bin {
-            Some(path) if fs::metadata(path).is_ok_and(|stat| stat.is_file()) => path.clone(),
+            Some(path) if fs::metadata(path).map_or(false, |stat| stat.is_file()) => path.clone(),
             Some(path) => worktree
                 .which(path.clone().as_str())
-                .ok_or("PowerShell must be installed for PowerShell Extension")?,
+                .ok_or_else(|| "PowerShell must be installed for PowerShell Extension")?,
             None => worktree
                 .which("pwsh")
-                .ok_or("PowerShell must be installed for PowerShell Extension")?,
+                .ok_or_else(|| "PowerShell must be installed for PowerShell Extension")?,
         };
         self.powershell_bin = Some(pwsh_path.clone());
         Ok(pwsh_path)
@@ -94,23 +113,23 @@ impl PowerShellExtension {
             .assets
             .iter()
             .find(|asset| asset.name == "PowerShellEditorServices.zip")
-            .ok_or_else(|| "no PowerShellEditorServices.zip found".to_string())?;
+            .ok_or_else(|| format!("no PowerShellEditorServices.zip found"))?;
 
         let version_dir = format!("powershell-es-{}", release.version);
         let lsp_path = format!("{version_dir}/PowerShellEditorServices/Start-EditorServices.ps1");
 
-        if !fs::metadata(&lsp_path).is_ok_and(|stat| stat.is_file()) {
+        if !fs::metadata(&lsp_path).map_or(false, |stat| stat.is_file()) {
             // Download the asset
             zed::set_language_server_installation_status(
-                language_server_id,
+                &language_server_id,
                 &zed::LanguageServerInstallationStatus::Downloading,
             );
             zed::download_file(
                 &asset.download_url,
                 &version_dir,
                 zed::DownloadedFileType::Zip,
             )
-            .map_err(|err| format!("download error {err}"))?;
+            .map_err(|err| format!("download error {}", err))?;
 
             // Ensure the binary exists
             let entries =
@@ -123,9 +142,8 @@ impl PowerShellExtension {
             }
         }
 
-        let abs_path = env::current_dir()
-            .map_err(|_| "Failed to get current path".to_string())?
-            .join(version_dir);
+        let abs_path =
+            path::absolute(&version_dir).map_err(|e| format!("failed to get absolute path {e}"))?;
         Ok(abs_path.display().to_string())
     }
 }