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

Move StaffMode declaration out of paths

Browse source
This commit is contained in:
Mikayla Maki 2023-01-27 15:37:36 -08:00
parent 2d889f59bf
commit 57781fd7aa
6 changed files with 28 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/zed/src/zed.rs
View file

@ -32,11 +32,7 @@ use serde::Deserialize;
use serde_json::to_string_pretty;
use settings::{keymap_file_json_schema, settings_file_json_schema, Settings};
use std::{borrow::Cow, env, path::Path, str, sync::Arc};
use util::{
channel::ReleaseChannel,
paths::{self, StaffMode},
ResultExt,
};
use util::{channel::ReleaseChannel, paths, ResultExt, StaffMode};
use uuid::Uuid;
pub use workspace;
use workspace::{sidebar::SidebarSide, AppState, Workspace};
@ -303,7 +299,7 @@ pub fn initialize_workspace(
let theme_names = app_state
.themes
.list(**cx.try_global::<StaffMode>().unwrap_or(&StaffMode(false)))
.list(**cx.default_global::<StaffMode>())
.map(|meta| meta.name)
.collect();
let language_names = app_state.languages.language_names();