Merge branch 'main' into unborked-git-zed2-diagnostics-view

2023-11-17 16:32:35 -05:00
parent 967ef9d414 8837045abb
commit 3655a96e54
128 changed files with 16288 additions and 2752 deletions
@@ -8277,7 +8277,7 @@ pub(crate) fn init_test(cx: &mut TestAppContext, f: fn(&mut AllLanguageSettingsC
    cx.update(|cx| {
        let store = SettingsStore::test(cx);
        cx.set_global(store);
-        theme::init(cx);
+        theme::init(theme::LoadThemes::JustBase, cx);
        client::init_settings(cx);
        language::init(cx);
        Project::init_settings(cx);