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

Removed debugs, simplified settings

Browse source
This commit is contained in:
Mikayla Maki 2022-10-03 17:43:05 -07:00
parent 6f7547d28f
commit 499e95d16a
6 changed files with 61 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -57,34 +57,19 @@ impl FeatureFlags {
#[derive(Copy, Clone, Debug, Default, Deserialize, JsonSchema)]
pub struct GitSettings {
pub git_gutter: Option<GitGutter>,
pub gutter_debounce: Option<u64>,
}
#[derive(Clone, Copy, Debug, Default, Deserialize, JsonSchema)]
pub struct GitGutter {
pub files_included: Option<GitFilesIncluded>,
pub debounce_delay_millis: Option<u64>,
}
impl GitGutter {
pub fn files_included(&self, settings: &Settings) -> GitFilesIncluded {
self.files_included.unwrap_or_else(|| {
settings
.git.git_gutter.expect("git_gutter must be some in defaults.json")
.files_included
.expect("Should be some in defaults.json")
})
}
}
#[derive(Clone, Copy, Debug, Default, Deserialize, JsonSchema, PartialEq, Eq)]
#[serde(rename_all = "snake_case")]
pub enum GitFilesIncluded {
pub enum GitGutter {
#[default]
All,
OnlyTracked,
None,
TrackedFiles,
Hide,
}
pub struct GitGutterConfig {}
#[derive(Clone, Debug, Default, Deserialize, JsonSchema)]
pub struct EditorSettings {
pub tab_size: Option<NonZeroU32>,
@ -428,12 +413,7 @@ impl Settings {
editor_overrides: Default::default(),
terminal_defaults: Default::default(),
terminal_overrides: Default::default(),
git: GitSettings {
git_gutter: Some(GitGutter {
files_included: Some(GitFilesIncluded::All),
debounce_delay_millis: None,
}),
},
git: Default::default(),
git_overrides: Default::default(),
language_defaults: Default::default(),
language_overrides: Default::default(),