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

Customize language settings JSON schema in language crate

Browse source
This commit is contained in:
Max Brunsfeld 2023-05-17 09:26:32 -07:00
parent 6403bb86e1
commit d2ba18eae9
4 changed files with 77 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/settings/src/settings_store.rs
View file

@ -308,7 +308,8 @@ impl SettingsStore {
default_settings_content: &str,
cx: &AppContext,
) -> Result<()> {
self.default_deserialized_settings = Some(serde_json::from_str(default_settings_content)?);
self.default_deserialized_settings =
Some(parse_json_with_comments(default_settings_content)?);
self.recompute_values(None, cx)?;
Ok(())
}
@ -319,7 +320,7 @@ impl SettingsStore {
user_settings_content: &str,
cx: &AppContext,
) -> Result<()> {
self.user_deserialized_settings = Some(serde_json::from_str(user_settings_content)?);
self.user_deserialized_settings = Some(parse_json_with_comments(user_settings_content)?);
self.recompute_values(None, cx)?;
Ok(())
}
@ -333,7 +334,7 @@ impl SettingsStore {
) -> Result<()> {
if let Some(content) = settings_content {
self.local_deserialized_settings
.insert(path.clone(), serde_json::from_str(content)?);
.insert(path.clone(), parse_json_with_comments(content)?);
} else {
self.local_deserialized_settings.remove(&path);
}