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

Don't override top-level settings with language defaults

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2022-06-23 16:40:57 +02:00
parent f2f9cad375
commit 2cb8a3ccfb
6 changed files with 152 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/project/src/project.rs
View file

@ -6673,7 +6673,7 @@ mod tests {
cx.update_global(|settings: &mut Settings, _| {
settings.language_overrides.insert(
Arc::from("Rust"),
settings::LanguageOverride {
settings::LanguageSettings {
enable_language_server: Some(false),
..Default::default()
},
@ -6690,14 +6690,14 @@ mod tests {
cx.update_global(|settings: &mut Settings, _| {
settings.language_overrides.insert(
Arc::from("Rust"),
settings::LanguageOverride {
settings::LanguageSettings {
enable_language_server: Some(true),
..Default::default()
},
);
settings.language_overrides.insert(
Arc::from("JavaScript"),
settings::LanguageOverride {
settings::LanguageSettings {
enable_language_server: Some(false),
..Default::default()
},