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/workspace/src/item.rs
+3 -27
View File
@@ -30,7 +30,7 @@ use std::{
};
use theme::Theme;
use ui::{Color, Icon, IntoElement, Label, LabelCommon};
use util::{MergeFrom as _, ResultExt};
use util::ResultExt;
pub const LEADER_UPDATE_THROTTLE: Duration = Duration::from_millis(200);
@@ -65,7 +65,7 @@ pub struct PreviewTabsSettings {
}
impl Settings for ItemSettings {
fn from_defaults(content: &settings::SettingsContent, _cx: &mut App) -> Self {
fn from_settings(content: &settings::SettingsContent, _cx: &mut App) -> Self {
let tabs = content.tabs.as_ref().unwrap();
Self {
git_status: tabs.git_status.unwrap(),
@@ -77,18 +77,6 @@ impl Settings for ItemSettings {
}
}
fn refine(&mut self, content: &settings::SettingsContent, _cx: &mut App) {
let Some(tabs) = content.tabs.as_ref() else {
return;
};
self.git_status.merge_from(&tabs.git_status);
self.close_position.merge_from(&tabs.close_position);
self.activate_on_close.merge_from(&tabs.activate_on_close);
self.file_icons.merge_from(&tabs.file_icons);
self.show_diagnostics.merge_from(&tabs.show_diagnostics);
self.show_close_button.merge_from(&tabs.show_close_button);
}
fn import_from_vscode(
vscode: &settings::VsCodeSettings,
current: &mut settings::SettingsContent,
@@ -125,7 +113,7 @@ impl Settings for ItemSettings {
}
impl Settings for PreviewTabsSettings {
fn from_defaults(content: &settings::SettingsContent, _cx: &mut App) -> Self {
fn from_settings(content: &settings::SettingsContent, _cx: &mut App) -> Self {
let preview_tabs = content.preview_tabs.as_ref().unwrap();
Self {
enabled: preview_tabs.enabled.unwrap(),
@@ -136,18 +124,6 @@ impl Settings for PreviewTabsSettings {
}
}
fn refine(&mut self, content: &settings::SettingsContent, _cx: &mut App) {
let Some(preview_tabs) = content.preview_tabs.as_ref() else {
return;
};
self.enabled.merge_from(&preview_tabs.enabled);
self.enable_preview_from_file_finder
.merge_from(&preview_tabs.enable_preview_from_file_finder);
self.enable_preview_from_code_navigation
.merge_from(&preview_tabs.enable_preview_from_code_navigation);
}
fn import_from_vscode(
vscode: &settings::VsCodeSettings,
current: &mut settings::SettingsContent,
crates/workspace/src/workspace_settings.rs
+2 -73
View File
@@ -10,7 +10,6 @@ pub use settings::{
BottomDockLayout, PaneSplitDirectionHorizontal, PaneSplitDirectionVertical,
RestoreOnStartupBehavior,
};
use util::MergeFrom as _;
pub struct WorkspaceSettings {
pub active_pane_modifiers: ActivePanelModifiers,
@@ -63,7 +62,7 @@ pub struct TabBarSettings {
}
impl Settings for WorkspaceSettings {
fn from_defaults(content: &settings::SettingsContent, _cx: &mut App) -> Self {
fn from_settings(content: &settings::SettingsContent, _cx: &mut App) -> Self {
let workspace = &content.workspace;
Self {
active_pane_modifiers: ActivePanelModifiers {
@@ -111,65 +110,6 @@ impl Settings for WorkspaceSettings {
}
}
fn refine(&mut self, content: &settings::SettingsContent, _cx: &mut App) {
let workspace = &content.workspace;
if let Some(border_size) = workspace
.active_pane_modifiers
.and_then(|modifier| modifier.border_size)
{
self.active_pane_modifiers.border_size = Some(border_size);
}
if let Some(inactive_opacity) = workspace
.active_pane_modifiers
.and_then(|modifier| modifier.inactive_opacity)
{
self.active_pane_modifiers.inactive_opacity = Some(inactive_opacity);
}
self.bottom_dock_layout
.merge_from(&workspace.bottom_dock_layout);
self.pane_split_direction_horizontal
.merge_from(&workspace.pane_split_direction_horizontal);
self.pane_split_direction_vertical
.merge_from(&workspace.pane_split_direction_vertical);
self.centered_layout.merge_from(&workspace.centered_layout);
self.confirm_quit.merge_from(&workspace.confirm_quit);
self.show_call_status_icon
.merge_from(&workspace.show_call_status_icon);
self.autosave.merge_from(&workspace.autosave);
self.restore_on_startup
.merge_from(&workspace.restore_on_startup);
self.restore_on_file_reopen
.merge_from(&workspace.restore_on_file_reopen);
self.drop_target_size
.merge_from(&workspace.drop_target_size);
self.use_system_path_prompts
.merge_from(&workspace.use_system_path_prompts);
self.use_system_prompts
.merge_from(&workspace.use_system_prompts);
self.command_aliases
.extend(workspace.command_aliases.clone());
if let Some(max_tabs) = workspace.max_tabs {
self.max_tabs = Some(max_tabs);
}
self.when_closing_with_no_tabs
.merge_from(&workspace.when_closing_with_no_tabs);
self.on_last_window_closed
.merge_from(&workspace.on_last_window_closed);
self.resize_all_panels_in_dock.merge_from(
&workspace
.resize_all_panels_in_dock
.as_ref()
.map(|resize| resize.clone().into_iter().map(Into::into).collect()),
);
self.close_on_file_delete
.merge_from(&workspace.close_on_file_delete);
self.use_system_window_tabs
.merge_from(&workspace.use_system_window_tabs);
self.zoomed_padding.merge_from(&workspace.zoomed_padding);
}
fn import_from_vscode(
vscode: &settings::VsCodeSettings,
current: &mut settings::SettingsContent,
@@ -257,7 +197,7 @@ impl Settings for WorkspaceSettings {
}
impl Settings for TabBarSettings {
fn from_defaults(content: &settings::SettingsContent, _cx: &mut App) -> Self {
fn from_settings(content: &settings::SettingsContent, _cx: &mut App) -> Self {
let tab_bar = content.tab_bar.clone().unwrap();
TabBarSettings {
show: tab_bar.show.unwrap(),
@@ -266,17 +206,6 @@ impl Settings for TabBarSettings {
}
}
fn refine(&mut self, content: &settings::SettingsContent, _cx: &mut App) {
let Some(tab_bar) = &content.tab_bar else {
return;
};
self.show.merge_from(&tab_bar.show);
self.show_nav_history_buttons
.merge_from(&tab_bar.show_nav_history_buttons);
self.show_tab_bar_buttons
.merge_from(&tab_bar.show_tab_bar_buttons);
}
fn import_from_vscode(
vscode: &settings::VsCodeSettings,
current: &mut settings::SettingsContent,