Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

toml: Bump to v0.1.0 (#10482)

Browse source 
This PR bumps the TOML extension to v0.1.0.

This version of the extension has been updated to use v0.0.6 of the
`zed_extension_api`.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-04-12 12:39:43 -04:00 • committed by GitHub
parent 3ea17248c8
commit a4d6c5da7c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -12682,9 +12682,9 @@ dependencies = [
[[package]] [[package]]
name = "zed_toml" name = "zed_toml"
version = "0.0.2" version = "0.1.0"
dependencies = [ dependencies = [
"zed_extension_api 0.0.5", "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]

4
extensions/toml/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "zed_toml" name = "zed_toml"
version = "0.0.2" version = "0.1.0"
edition = "2021" edition = "2021"
publish = false publish = false
license = "Apache-2.0" license = "Apache-2.0"
@ -13,4 +13,4 @@ path = "src/toml.rs"
crate-type = ["cdylib"] crate-type = ["cdylib"]
[dependencies] [dependencies]
zed_extension_api = "0.0.5" zed_extension_api = "0.0.6"

2
extensions/toml/extension.toml
View file

@ -1,7 +1,7 @@
id = "toml" id = "toml"
name = "TOML" name = "TOML"
description = "TOML support." description = "TOML support."
version = "0.0.2" version = "0.1.0"
schema_version = 1 schema_version = 1
authors = [ authors = [
"Max Brunsfeld <max@zed.dev>", "Max Brunsfeld <max@zed.dev>",

14
extensions/toml/src/toml.rs
View file

@ -1,4 +1,5 @@
use std::fs; use std::fs;
use zed::LanguageServerId;
use zed_extension_api::{self as zed, Result}; use zed_extension_api::{self as zed, Result};
struct TomlExtension { struct TomlExtension {
@ -6,7 +7,10 @@ struct TomlExtension {
} }
impl TomlExtension { impl TomlExtension {
fn language_server_binary_path(&mut self, config: zed::LanguageServerConfig) -> Result<String> { fn language_server_binary_path(
&mut self,
language_server_id: &LanguageServerId,
) -> Result<String> {
if let Some(path) = &self.cached_binary_path { if let Some(path) = &self.cached_binary_path {
if fs::metadata(path).map_or(false, |stat| stat.is_file()) { if fs::metadata(path).map_or(false, |stat| stat.is_file()) {
return Ok(path.clone()); return Ok(path.clone());
@ -14,7 +18,7 @@ impl TomlExtension {
} }
zed::set_language_server_installation_status( zed::set_language_server_installation_status(
&config.name, &language_server_id,
&zed::LanguageServerInstallationStatus::CheckingForUpdate, &zed::LanguageServerInstallationStatus::CheckingForUpdate,
); );
let release = zed::latest_github_release( let release = zed::latest_github_release(
@ -58,7 +62,7 @@ impl TomlExtension {
if !fs::metadata(&binary_path).map_or(false, |stat| stat.is_file()) { if !fs::metadata(&binary_path).map_or(false, |stat| stat.is_file()) {
zed::set_language_server_installation_status( zed::set_language_server_installation_status(
&config.name, &language_server_id,
&zed::LanguageServerInstallationStatus::Downloading, &zed::LanguageServerInstallationStatus::Downloading,
); );
@ -98,11 +102,11 @@ impl zed::Extension for TomlExtension {
fn language_server_command( fn language_server_command(
&mut self, &mut self,
config: zed::LanguageServerConfig, language_server_id: &LanguageServerId,
_worktree: &zed::Worktree, _worktree: &zed::Worktree,
) -> Result<zed::Command> { ) -> Result<zed::Command> {
Ok(zed::Command { Ok(zed::Command {
command: self.language_server_binary_path(config)?, command: self.language_server_binary_path(language_server_id)?,
args: vec!["lsp".to_string(), "stdio".to_string()], args: vec!["lsp".to_string(), "stdio".to_string()],
env: Default::default(), env: Default::default(),
}) })