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

Define language settings in the language crate

Browse source
This commit is contained in:
Max Brunsfeld 2023-05-11 14:40:35 -07:00
parent 9ae10a5dd9
commit 39618ae32d
54 changed files with 1348 additions and 1161 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/journal/src/journal.rs
View file

@ -1,3 +1,4 @@
use anyhow::Result;
use chrono::{Datelike, Local, NaiveTime, Timelike};
use editor::{scroll::autoscroll::Autoscroll, Editor};
use gpui::{actions, AppContext};
@ -40,21 +41,8 @@ impl settings::Setting for JournalSettings {
type FileContent = Self;
fn load(default_value: &Self, user_values: &[&Self], _: &AppContext) -> Self {
Self {
path: Some(
user_values
.first()
.and_then(|s| s.path.clone())
.unwrap_or(default_value.path.clone().unwrap()),
),
hour_format: Some(
user_values
.first()
.and_then(|s| s.hour_format.clone())
.unwrap_or(default_value.hour_format.clone().unwrap()),
),
}
fn load(default_value: &Self, user_values: &[&Self], _: &AppContext) -> Result<Self> {
Self::load_via_json_merge(default_value, user_values)
}
}