From da22e0dd0bad953e4d3a691e49e44003ab53c1e3 Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Thu, 27 Jun 2024 11:36:17 +0200 Subject: [PATCH] Revert "vue: Release 0.0.4" (#13584) Reverts zed-industries/zed#13580 as it turned out that the issue lied in incorrect user settings. Release notes: - N/A --- Cargo.lock | 2 +- extensions/vue/Cargo.toml | 2 +- extensions/vue/extension.toml | 2 +- extensions/vue/src/vue.rs | 23 +++++++---------------- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index de4bcb531a..c565aa3a83 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13854,7 +13854,7 @@ dependencies = [ [[package]] name = "zed_vue" -version = "0.0.4" +version = "0.0.3" dependencies = [ "zed_extension_api 0.0.6", ] diff --git a/extensions/vue/Cargo.toml b/extensions/vue/Cargo.toml index 08d14ea5dc..219281c9a1 100644 --- a/extensions/vue/Cargo.toml +++ b/extensions/vue/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zed_vue" -version = "0.0.4" +version = "0.0.3" edition = "2021" publish = false license = "Apache-2.0" diff --git a/extensions/vue/extension.toml b/extensions/vue/extension.toml index 8cbb70399f..dad02ec590 100644 --- a/extensions/vue/extension.toml +++ b/extensions/vue/extension.toml @@ -1,7 +1,7 @@ id = "vue" name = "Vue" description = "Vue support." -version = "0.0.4" +version = "0.0.3" schema_version = 1 authors = ["Piotr Osiewicz "] repository = "https://github.com/zed-industries/zed" diff --git a/extensions/vue/src/vue.rs b/extensions/vue/src/vue.rs index d286616e67..27d4a5d399 100644 --- a/extensions/vue/src/vue.rs +++ b/extensions/vue/src/vue.rs @@ -1,7 +1,6 @@ use std::{env, fs}; use zed::lsp::{Completion, CompletionKind}; use zed::CodeLabelSpan; -use zed_extension_api::settings::LspSettings; use zed_extension_api::{self as zed, serde_json, Result}; struct VueExtension { @@ -87,22 +86,14 @@ impl zed::Extension for VueExtension { fn language_server_initialization_options( &mut self, - language_server_id: &zed::LanguageServerId, - worktree: &zed::Worktree, + _: &zed::LanguageServerId, + _: &zed::Worktree, ) -> Result> { - let initialization_options = - LspSettings::for_worktree(language_server_id.as_ref(), worktree) - .ok() - .and_then(|lsp_settings| lsp_settings.initialization_options.clone()) - .unwrap_or_else(|| { - serde_json::json!({ - "typescript": { - "tsdk": "node_modules/typescript/lib" - } - }) - }); - - Ok(Some(serde_json::json!(initialization_options))) + Ok(Some(serde_json::json!({ + "typescript": { + "tsdk": "node_modules/typescript/lib" + } + }))) } fn label_for_completion(