Ben KunkleandMichael
4aac5642c1
Closes #ISSUE Improves the efficiency of our interactions with the Zed language server. Previously, on startup and after every workspace configuration changed notification, we would send >1MB of JSON Schemas to the JSON LSP. The only reason this had to happen was due to the case where an extension was installed that would result in a change to the JSON schema for settings (i.e. added language, theme, etc). This PR changes the behavior to use the URI LSP extensions of `vscode-json-language-server` in order to send the server URI's that it can then use to fetch the schemas as needed (i.e. the settings schema is only generated and sent when `settings.json` is opened. This brings the JSON we send to on startup and after every workspace configuration changed notification down to a couple of KB. Additionally, using another LSP extension request we can notify the server when a schema has changed using the URI as a key, so we no longer have to send a workspace configuration changed notification, and the schema contents will only be re-requested and regenerated if the schema is in use. Release Notes: - Improved the efficiency of communication with the builtin JSON LSP. JSON Schemas are no longer sent to the JSON language server in their full form. If you wish to view a builtin JSON schema in the language server info tab of the language server logs (`dev: open language server logs`), you must now use the `editor: open url` action with your cursor over the URL that is sent to the server. - Made it so that Zed urls (`zed://...`) are resolved locally when opened within the editor instead of being resolved through the OS. Users who could not previously open `zed://*` URLs in the editor can now do so by pasting the link into a buffer and using the `editor: open url` action (please open an issue if this is the case for you!). --------- Co-authored-by: Michael <michael@zed.dev>
78 lines
2.1 KiB
Rust
78 lines
2.1 KiB
Rust
use collections::HashMap;
|
|
use schemars::{JsonSchema, json_schema};
|
|
use serde::Deserialize;
|
|
use std::borrow::Cow;
|
|
use util::schemars::DefaultDenyUnknownFields;
|
|
|
|
#[derive(Deserialize)]
|
|
pub struct VsSnippetsFile {
|
|
#[serde(flatten)]
|
|
pub(crate) snippets: HashMap<String, VsCodeSnippet>,
|
|
}
|
|
|
|
impl VsSnippetsFile {
|
|
pub fn generate_json_schema() -> serde_json::Value {
|
|
let schema = schemars::generate::SchemaSettings::draft2019_09()
|
|
.with_transform(DefaultDenyUnknownFields)
|
|
.into_generator()
|
|
.root_schema_for::<Self>();
|
|
|
|
serde_json::to_value(schema).unwrap()
|
|
}
|
|
}
|
|
|
|
impl JsonSchema for VsSnippetsFile {
|
|
fn schema_name() -> Cow<'static, str> {
|
|
"VsSnippetsFile".into()
|
|
}
|
|
|
|
fn json_schema(generator: &mut schemars::SchemaGenerator) -> schemars::Schema {
|
|
let snippet_schema = generator.subschema_for::<VsCodeSnippet>();
|
|
json_schema!({
|
|
"type": "object",
|
|
"additionalProperties": snippet_schema
|
|
})
|
|
}
|
|
}
|
|
|
|
#[derive(Deserialize, JsonSchema)]
|
|
#[serde(untagged)]
|
|
pub(crate) enum ListOrDirect {
|
|
Single(String),
|
|
List(Vec<String>),
|
|
}
|
|
|
|
impl From<ListOrDirect> for Vec<String> {
|
|
fn from(list: ListOrDirect) -> Self {
|
|
match list {
|
|
ListOrDirect::Single(entry) => vec![entry],
|
|
ListOrDirect::List(entries) => entries,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl std::fmt::Display for ListOrDirect {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
|
|
write!(
|
|
f,
|
|
"{}",
|
|
match self {
|
|
Self::Single(v) => v.to_owned(),
|
|
Self::List(v) => v.join("\n"),
|
|
}
|
|
)
|
|
}
|
|
}
|
|
|
|
#[derive(Deserialize, JsonSchema)]
|
|
pub(crate) struct VsCodeSnippet {
|
|
/// The snippet prefix used to decide whether a completion menu should be shown.
|
|
pub(crate) prefix: Option<ListOrDirect>,
|
|
|
|
/// The snippet content. Use `$1` and `${1:defaultText}` to define cursor positions and `$0` for final cursor position.
|
|
pub(crate) body: ListOrDirect,
|
|
|
|
/// The snippet description displayed inside the completion menu.
|
|
pub(crate) description: Option<ListOrDirect>,
|
|
}
|