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

Merge pull request #2347 from zed-industries/disable-yaml-key-ordering

Browse source 
Disable key ordering diagnostic for YAML
This commit is contained in:
Antonio Scandurra 2023-04-04 10:00:48 +02:00 • committed by GitHub
commit abf158a9e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/lsp/src/lsp.rs
View file

@ -335,6 +335,7 @@ impl LanguageServer {
did_change_configuration: Some(DynamicRegistrationClientCapabilities { did_change_configuration: Some(DynamicRegistrationClientCapabilities {
dynamic_registration: Some(true), dynamic_registration: Some(true),
}), }),
workspace_folders: Some(true),
..Default::default() ..Default::default()
}), }),
text_document: Some(TextDocumentClientCapabilities { text_document: Some(TextDocumentClientCapabilities {

3
crates/zed/src/languages/yaml.rs
View file

@ -106,6 +106,9 @@ impl LspAdapter for YamlLspAdapter {
let settings = cx.global::<Settings>(); let settings = cx.global::<Settings>();
Some( Some(
future::ready(serde_json::json!({ future::ready(serde_json::json!({
"yaml": {
"keyOrdering": false
},
"[yaml]": { "[yaml]": {
"editor.tabSize": settings.tab_size(Some("YAML")) "editor.tabSize": settings.tab_size(Some("YAML"))
} }