oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

settings: Use a derive macro for refine (#38451)

Browse Source 
When we refactored settings to not pass JSON blobs around, we ended up
needing
to write *a lot* of code that just merged things (like json merge used
to do).

Use a derive macro to prevent typos in this logic.

Release Notes:

- N/A
This commit is contained in:
Conrad Irwin
2025-09-18 21:13:49 +00:00
committed by GitHub
parent 5f4f0a873e
commit b09764c54a
74 changed files with 1089 additions and 2818 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/git_ui/src/git_panel_settings.rs
+1 -21
View File
@@ -7,7 +7,6 @@ use ui::{
px,
scrollbars::{ScrollbarVisibility, ShowScrollbar},
};
use util::MergeFrom;
use workspace::dock::DockPosition;
#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
@@ -52,7 +51,7 @@ impl ScrollbarVisibility for GitPanelSettings {
}
impl Settings for GitPanelSettings {
fn from_defaults(content: &settings::SettingsContent, _cx: &mut ui::App) -> Self {
fn from_settings(content: &settings::SettingsContent, _cx: &mut ui::App) -> Self {
let git_panel = content.git_panel.clone().unwrap();
Self {
button: git_panel.button.unwrap(),
@@ -68,25 +67,6 @@ impl Settings for GitPanelSettings {
}
}
fn refine(&mut self, content: &settings::SettingsContent, _cx: &mut ui::App) {
let Some(git_panel) = &content.git_panel else {
return;
};
self.button.merge_from(&git_panel.button);
self.dock.merge_from(&git_panel.dock.map(Into::into));
self.default_width
.merge_from(&git_panel.default_width.map(px));
self.status_style.merge_from(&git_panel.status_style);
self.fallback_branch_name
.merge_from(&git_panel.fallback_branch_name);
self.sort_by_path.merge_from(&git_panel.sort_by_path);
self.collapse_untracked_diff
.merge_from(&git_panel.collapse_untracked_diff);
if let Some(show) = git_panel.scrollbar.as_ref().and_then(|s| s.show) {
self.scrollbar.show = Some(show.into())
}
}
fn import_from_vscode(vscode: &settings::VsCodeSettings, current: &mut SettingsContent) {
if let Some(git_enabled) = vscode.read_bool("git.enabled") {
current.git_panel.get_or_insert_default().button = Some(git_enabled);