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

Revert "Basic feature flag implementation"

Browse source
This commit is contained in:
Mikayla Maki 2022-08-22 13:54:18 -07:00 • committed by GitHub
parent 1b414b698f
commit b6785c5624
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/zed/src/main.rs
View file

@ -95,12 +95,6 @@ fn main() {
.spawn(languages::init(languages.clone(), cx.background().clone()));
let user_store = cx.add_model(|cx| UserStore::new(client.clone(), http.clone(), cx));
let (settings_file, keymap_file) = cx.background().block(config_files).unwrap();
//Make sure to load settings before initialization, so we know what features to toggle
watch_settings_file(default_settings, settings_file, themes.clone(), cx);
watch_keymap_file(keymap_file, cx);
context_menu::init(cx);
project::Project::init(&client);
client::Channel::init(&client);
@ -120,7 +114,10 @@ fn main() {
terminal::init(cx);
let db = cx.background().block(db);
let (settings_file, keymap_file) = cx.background().block(config_files).unwrap();
watch_settings_file(default_settings, settings_file, themes.clone(), cx);
watch_keymap_file(keymap_file, cx);
cx.spawn(|cx| watch_themes(fs.clone(), themes.clone(), cx))
.detach();