Merge branch 'main' into setting-store

2023-05-17 09:55:24 -07:00 · 2023-05-17 09:55:24 -07:00 · 89204e85c0
commit 89204e85c0
parent d2ba18eae9 0a0769d4b9
60 changed files with 3284 additions and 716 deletions
--- a/crates/diagnostics/src/diagnostics.rs
+++ b/crates/diagnostics/src/diagnostics.rs
@ -1499,6 +1499,7 @@ mod tests {
            cx.set_global(Settings::test(cx));
            cx.set_global(SettingsStore::test(cx));
            language::init(cx);
+            client::init_settings(cx);
            workspace::init_settings(cx);
        });
    }