purescript: Upgrade zed_extension_api
to v0.0.6 (#15181)
This PR upgrades the PureScript extension to use v0.0.6 of the `zed_extension_api`. Release Notes: - N/A
This commit is contained in:
parent
856a8ef5e8
commit
8ba392bba6
3 changed files with 12 additions and 14 deletions
2
Cargo.lock
generated
2
Cargo.lock
generated
|
@ -13867,7 +13867,7 @@ dependencies = [
|
||||||
name = "zed_purescript"
|
name = "zed_purescript"
|
||||||
version = "0.0.1"
|
version = "0.0.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"zed_extension_api 0.0.4",
|
"zed_extension_api 0.0.6",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
|
@ -13,4 +13,4 @@ path = "src/purescript.rs"
|
||||||
crate-type = ["cdylib"]
|
crate-type = ["cdylib"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
zed_extension_api = "0.0.4"
|
zed_extension_api = "0.0.6"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
use std::{env, fs};
|
use std::{env, fs};
|
||||||
use zed_extension_api::{self as zed, Result};
|
use zed_extension_api::{self as zed, serde_json, Result};
|
||||||
|
|
||||||
const SERVER_PATH: &str = "node_modules/.bin/purescript-language-server";
|
const SERVER_PATH: &str = "node_modules/.bin/purescript-language-server";
|
||||||
const PACKAGE_NAME: &str = "purescript-language-server";
|
const PACKAGE_NAME: &str = "purescript-language-server";
|
||||||
|
@ -13,14 +13,14 @@ impl PurescriptExtension {
|
||||||
fs::metadata(SERVER_PATH).map_or(false, |stat| stat.is_file())
|
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();
|
let server_exists = self.server_exists();
|
||||||
if self.did_find_server && server_exists {
|
if self.did_find_server && server_exists {
|
||||||
return Ok(SERVER_PATH.to_string());
|
return Ok(SERVER_PATH.to_string());
|
||||||
}
|
}
|
||||||
|
|
||||||
zed::set_language_server_installation_status(
|
zed::set_language_server_installation_status(
|
||||||
&config.name,
|
language_server_id,
|
||||||
&zed::LanguageServerInstallationStatus::CheckingForUpdate,
|
&zed::LanguageServerInstallationStatus::CheckingForUpdate,
|
||||||
);
|
);
|
||||||
let version = zed::npm_package_latest_version(PACKAGE_NAME)?;
|
let version = zed::npm_package_latest_version(PACKAGE_NAME)?;
|
||||||
|
@ -29,7 +29,7 @@ impl PurescriptExtension {
|
||||||
|| zed::npm_package_installed_version(PACKAGE_NAME)?.as_ref() != Some(&version)
|
|| zed::npm_package_installed_version(PACKAGE_NAME)?.as_ref() != Some(&version)
|
||||||
{
|
{
|
||||||
zed::set_language_server_installation_status(
|
zed::set_language_server_installation_status(
|
||||||
&config.name,
|
language_server_id,
|
||||||
&zed::LanguageServerInstallationStatus::Downloading,
|
&zed::LanguageServerInstallationStatus::Downloading,
|
||||||
);
|
);
|
||||||
let result = zed::npm_install_package(PACKAGE_NAME, &version);
|
let result = zed::npm_install_package(PACKAGE_NAME, &version);
|
||||||
|
@ -63,10 +63,10 @@ impl zed::Extension for PurescriptExtension {
|
||||||
|
|
||||||
fn language_server_command(
|
fn language_server_command(
|
||||||
&mut self,
|
&mut self,
|
||||||
config: zed::LanguageServerConfig,
|
language_server_id: &zed::LanguageServerId,
|
||||||
_worktree: &zed::Worktree,
|
_worktree: &zed::Worktree,
|
||||||
) -> Result<zed::Command> {
|
) -> Result<zed::Command> {
|
||||||
let server_path = self.server_script_path(config)?;
|
let server_path = self.server_script_path(language_server_id)?;
|
||||||
Ok(zed::Command {
|
Ok(zed::Command {
|
||||||
command: zed::node_binary_path()?,
|
command: zed::node_binary_path()?,
|
||||||
args: vec![
|
args: vec![
|
||||||
|
@ -83,16 +83,14 @@ impl zed::Extension for PurescriptExtension {
|
||||||
|
|
||||||
fn language_server_initialization_options(
|
fn language_server_initialization_options(
|
||||||
&mut self,
|
&mut self,
|
||||||
_config: zed::LanguageServerConfig,
|
_language_server_id: &zed::LanguageServerId,
|
||||||
_worktree: &zed::Worktree,
|
_worktree: &zed::Worktree,
|
||||||
) -> Result<Option<String>> {
|
) -> Result<Option<serde_json::Value>> {
|
||||||
let initialization_options = r#"{
|
Ok(Some(serde_json::json!({
|
||||||
"purescript": {
|
"purescript": {
|
||||||
"addSpagoSources": true
|
"addSpagoSources": true
|
||||||
}
|
}
|
||||||
}"#;
|
})))
|
||||||
|
|
||||||
Ok(Some(initialization_options.to_string()))
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue