mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-28 09:54:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Revert "vue: Release 0.0.4" (#13584)
Some checks are pending
CI / Check formatting and spelling (push) Waiting to run
Details
CI / (macOS) Run Clippy and tests (push) Waiting to run
Details
CI / (Linux) Run Clippy and tests (push) Waiting to run
Details
CI / (Windows) Run Clippy and tests (push) Waiting to run
Details
CI / Create a macOS bundle (push) Blocked by required conditions
Details
CI / Create a Linux bundle (push) Blocked by required conditions
Details
CI / Create arm64 Linux bundle (push) Blocked by required conditions
Details
Deploy Docs / Deploy Docs (push) Waiting to run
Details

Browse source 
Reverts zed-industries/zed#13580 as it turned out that the issue lied in
incorrect user settings.

Release notes:
- N/A
This commit is contained in:
Piotr Osiewicz 2024-06-27 11:36:17 +02:00 committed by GitHub
parent fb3ef0d140
commit da22e0dd0b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -13854,7 +13854,7 @@ dependencies = [
[[package]]
name = "zed_vue"
version = "0.0.4"
version = "0.0.3"
dependencies = [
"zed_extension_api 0.0.6",
]

2
extensions/vue/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "zed_vue"
version = "0.0.4"
version = "0.0.3"
edition = "2021"
publish = false
license = "Apache-2.0"

2
extensions/vue/extension.toml
View file

@ -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 <piotr@zed.dev>"]
repository = "https://github.com/zed-industries/zed"

23
extensions/vue/src/vue.rs
View file

@ -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<Option<serde_json::Value>> {
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(