zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-19 02:17:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed failling tests

Browse Source
This commit is contained in:
Mikayla Maki 2023-01-23 15:12:31 -08:00
parent ea39983f78
commit 2802e3a1c6
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/client/src/user.rs
View File

@ -149,12 +149,11 @@ impl UserStore {
);
cx.update(|cx| {
cx.update_global::<StaffMode, _, _>(|staff_mode, _| {
*staff_mode = info
.as_ref()
cx.set_global(
info.as_ref()
.map(|info| StaffMode(info.staff))
.unwrap_or(StaffMode(false));
})
.unwrap_or(StaffMode(false)),
);
});
current_user_tx.send(user).await.ok();

2
crates/theme_selector/src/theme_selector.rs
View File

@ -45,7 +45,7 @@ impl ThemeSelector {
let original_theme = settings.theme.clone();
let mut theme_names = registry
.list(**cx.global::<StaffMode>())
.list(**cx.try_global::<StaffMode>().unwrap_or(&StaffMode(false)))
.collect::<Vec<_>>();
theme_names.sort_unstable_by(|a, b| {
a.is_light

2
crates/zed/src/zed.rs
View File

@ -303,7 +303,7 @@ pub fn initialize_workspace(
let theme_names = app_state
.themes
.list(**cx.global::<StaffMode>())
.list(**cx.try_global::<StaffMode>().unwrap_or(&StaffMode(false)))
.map(|meta| meta.name)
.collect();
let language_names = app_state.languages.language_names();