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

Changed name to experiments

Browse source
This commit is contained in:
Mikayla Maki 2022-08-22 13:27:36 -07:00
parent 9b6116e1e2
commit 7efeb0662a
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@ pub use keymap_file::{keymap_file_json_schema, KeymapFileContent};
#[derive(Clone)] #[derive(Clone)]
pub struct Settings { pub struct Settings {
pub nightly: FeatureFlags, pub experiments: FeatureFlags,
pub projects_online_by_default: bool, pub projects_online_by_default: bool,
pub buffer_font_family: FamilyId, pub buffer_font_family: FamilyId,
pub default_buffer_font_size: f32, pub default_buffer_font_size: f32,
@ -197,7 +197,7 @@ impl Settings {
.unwrap(); .unwrap();
Self { Self {
nightly: FeatureFlags::default(), experiments: FeatureFlags::default(),
buffer_font_family: font_cache buffer_font_family: font_cache
.load_family(&[defaults.buffer_font_family.as_ref().unwrap()]) .load_family(&[defaults.buffer_font_family.as_ref().unwrap()])
.unwrap(), .unwrap(),
@ -256,7 +256,7 @@ impl Settings {
); );
merge(&mut self.vim_mode, data.vim_mode); merge(&mut self.vim_mode, data.vim_mode);
merge(&mut self.autosave, data.autosave); merge(&mut self.autosave, data.autosave);
merge(&mut self.nightly, data.nightly); merge(&mut self.experiments, data.nightly);
// Ensure terminal font is loaded, so we can request it in terminal_element layout // Ensure terminal font is loaded, so we can request it in terminal_element layout
if let Some(terminal_font) = &data.terminal.font_family { if let Some(terminal_font) = &data.terminal.font_family {
font_cache.load_family(&[terminal_font]).log_err(); font_cache.load_family(&[terminal_font]).log_err();
@ -317,7 +317,7 @@ impl Settings {
#[cfg(any(test, feature = "test-support"))] #[cfg(any(test, feature = "test-support"))]
pub fn test(cx: &gpui::AppContext) -> Settings { pub fn test(cx: &gpui::AppContext) -> Settings {
Settings { Settings {
nightly: FeatureFlags::default(), experiments: FeatureFlags::default(),
buffer_font_family: cx.font_cache().load_family(&["Monaco"]).unwrap(), buffer_font_family: cx.font_cache().load_family(&["Monaco"]).unwrap(),
buffer_font_size: 14., buffer_font_size: 14.,
default_buffer_font_size: 14., default_buffer_font_size: 14.,

2
crates/terminal/src/terminal.rs
View file

@ -47,7 +47,7 @@ use crate::mappings::{
///Initialize and register all of our action handlers ///Initialize and register all of our action handlers
pub fn init(cx: &mut MutableAppContext) { pub fn init(cx: &mut MutableAppContext) {
let settings = cx.global::<Settings>(); let settings = cx.global::<Settings>();
if settings.nightly.modal_terminal { if settings.experiments.modal_terminal {
cx.add_action(deploy_modal); cx.add_action(deploy_modal);
} }