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

Allow comments in setting and keymap JSON files

Browse source
This commit is contained in:
Max Brunsfeld 2022-04-21 11:58:18 -07:00
parent 066e572767
commit 3a28f09979
10 changed files with 47 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/zed/src/settings_file.rs
View file

@ -4,7 +4,7 @@ use postage::sink::Sink as _;
use postage::{prelude::Stream, watch};
use project::Fs;
use serde::Deserialize;
use settings::{KeymapFile, Settings, SettingsFileContent};
use settings::{parse_json_with_comments, KeymapFileContent, Settings, SettingsFileContent};
use std::{path::Path, sync::Arc, time::Duration};
use theme::ThemeRegistry;
use util::ResultExt;
@ -44,7 +44,7 @@ where
fs.load(&path)
.await
.log_err()
.and_then(|data| serde_json::from_str(&data).log_err())
.and_then(|data| parse_json_with_comments(&data).log_err())
} else {
Some(T::default())
}
@ -76,11 +76,14 @@ pub fn settings_from_files(
})
}
pub async fn watch_keymap_file(mut file: WatchedJsonFile<KeymapFile>, mut cx: AsyncAppContext) {
pub async fn watch_keymap_file(
mut file: WatchedJsonFile<KeymapFileContent>,
mut cx: AsyncAppContext,
) {
while let Some(content) = file.0.recv().await {
cx.update(|cx| {
cx.clear_bindings();
settings::KeymapFile::load_defaults(cx);
settings::KeymapFileContent::load_defaults(cx);
content.add(cx).log_err();
});
}