pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify merging of options

Browse source
This commit is contained in:
a-kenji 2021-07-09 13:09:05 +02:00
parent 6299660d5c
commit 89f84ecd3f
1 changed files with 8 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
zellij-utils/src/input/options.rs
View file

@ -74,42 +74,16 @@ impl Options {
/// will supercede a `Some` in `self` /// will supercede a `Some` in `self`
// TODO: Maybe a good candidate for a macro? // TODO: Maybe a good candidate for a macro?
pub fn merge(&self, other: Options) -> Options { pub fn merge(&self, other: Options) -> Options {
let simplified_ui = if other.simplified_ui { let merge_bool = |opt_other, opt_self| if opt_other { true } else { opt_self };
true
} else {
self.simplified_ui
};
let default_mode = match other.default_mode { let simplified_ui = merge_bool(other.simplified_ui, self.simplified_ui);
None => self.default_mode, let disable_mouse_mode = merge_bool(other.disable_mouse_mode, self.disable_mouse_mode);
other => other,
};
let default_shell = match other.default_shell { let default_mode = other.default_mode.or(self.default_mode);
None => self.default_shell.clone(), let default_shell = other.default_shell.or_else(|| self.default_shell.clone());
other => other, let layout_dir = other.layout_dir.or_else(|| self.layout_dir.clone());
}; let theme = other.theme.or_else(|| self.theme.clone());
let on_force_close = other.on_force_close.or(self.on_force_close);
let layout_dir = match other.layout_dir {
None => self.layout_dir.clone(),
other => other,
};
let theme = match other.theme {
None => self.theme.clone(),
other => other,
};
let disable_mouse_mode = if other.disable_mouse_mode {
true
} else {
self.disable_mouse_mode
};
let on_force_close = match other.on_force_close {
None => self.on_force_close,
other => other,
};
Options { Options {
simplified_ui, simplified_ui,