From 4291b4795cf4f92e23fa5960624be42c0733c952 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Houl=C3=A9?= Date: Mon, 1 Jun 2026 21:13:36 +0200 Subject: [PATCH 1/6] settings_ui: Disable settings overridden by current organization configuration Co-Authored-By: probablyneb --- Cargo.lock | 1 + crates/settings_ui/Cargo.toml | 1 + crates/settings_ui/src/components/dropdown.rs | 11 +- crates/settings_ui/src/page_data.rs | 425 +++++++++++++++++- .../pages/edit_prediction_provider_setup.rs | 11 + crates/settings_ui/src/settings_ui.rs | 46 +- 6 files changed, 488 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 635d7c6c10e72a..ad5a8a9b63ec8f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -16536,6 +16536,7 @@ dependencies = [ "agent_skills", "anyhow", "audio", + "cloud_api_types", "codestral", "component", "copilot", diff --git a/crates/settings_ui/Cargo.toml b/crates/settings_ui/Cargo.toml index ee725c0a1d99a6..eed98c1719159f 100644 --- a/crates/settings_ui/Cargo.toml +++ b/crates/settings_ui/Cargo.toml @@ -21,6 +21,7 @@ agent_settings.workspace = true agent_skills.workspace = true anyhow.workspace = true audio.workspace = true +cloud_api_types.workspace = true component.workspace = true codestral.workspace = true copilot.workspace = true diff --git a/crates/settings_ui/src/components/dropdown.rs b/crates/settings_ui/src/components/dropdown.rs index 010a8ec0c04055..37d18a83495a75 100644 --- a/crates/settings_ui/src/components/dropdown.rs +++ b/crates/settings_ui/src/components/dropdown.rs @@ -3,7 +3,8 @@ use std::rc::Rc; use gpui::{App, ElementId, IntoElement, RenderOnce}; use heck::ToTitleCase as _; use ui::{ - ButtonSize, ContextMenu, DropdownMenu, DropdownStyle, FluentBuilder as _, IconPosition, px, + ButtonSize, ContextMenu, Disableable as _, DropdownMenu, DropdownStyle, FluentBuilder as _, + IconPosition, px, }; #[derive(IntoElement)] @@ -17,6 +18,7 @@ where labels: &'static [&'static str], should_do_title_case: bool, tab_index: Option, + disabled: bool, on_change: Rc, } @@ -38,6 +40,7 @@ where labels, should_do_title_case: true, tab_index: None, + disabled: false, on_change: Rc::new(on_change), } } @@ -51,6 +54,11 @@ where self.tab_index = Some(tab_index); self } + + pub fn disabled(mut self, disabled: bool) -> Self { + self.disabled = disabled; + self + } } impl RenderOnce for EnumVariantDropdown @@ -96,6 +104,7 @@ where }, context_menu, ) + .disabled(self.disabled) .when_some(self.tab_index, |elem, tab_index| elem.tab_index(tab_index)) .trigger_size(ButtonSize::Medium) .style(DropdownStyle::Outlined) diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs index e2c69647a686d0..adfce0a8564864 100644 --- a/crates/settings_ui/src/page_data.rs +++ b/crates/settings_ui/src/page_data.rs @@ -1,8 +1,8 @@ use gpui::{Action as _, App}; use itertools::Itertools as _; use settings::{ - AudioInputDeviceName, AudioOutputDeviceName, LanguageSettingsContent, SemanticTokens, - SettingsContent, + AudioInputDeviceName, AudioOutputDeviceName, EditPredictionDataCollectionChoice, + LanguageSettingsContent, SemanticTokens, SettingsContent, }; use std::sync::{Arc, OnceLock}; use strum::{EnumMessage, IntoDiscriminant as _, VariantArray}; @@ -105,6 +105,7 @@ fn developer_page(cx: &App) -> SettingsPage { title: "Performance Profiler", description: "Collect timing data for foreground and background executor tasks so they can be inspected via `zed: open performance profiler`. May lead to increased memory usage.", field: Box::new(SettingField { + org_override: None, json_path: Some("instrumentation.performance_profiler.enabled"), pick: |settings_content| { settings_content @@ -140,6 +141,7 @@ fn general_page(cx: &App) -> SettingsPage { title: "When Closing With No Tabs", description: "What to do when using the 'close active item' action with no tabs.", field: Box::new(SettingField { + org_override: None, json_path: Some("when_closing_with_no_tabs"), pick: |settings_content| { settings_content @@ -158,6 +160,7 @@ fn general_page(cx: &App) -> SettingsPage { title: "On Last Window Closed", description: "What to do when the last window is closed.", field: Box::new(SettingField { + org_override: None, json_path: Some("on_last_window_closed"), pick: |settings_content| { settings_content.workspace.on_last_window_closed.as_ref() @@ -173,6 +176,7 @@ fn general_page(cx: &App) -> SettingsPage { title: "Use System Path Prompts", description: "Use native OS dialogs for 'Open' and 'Save As'.", field: Box::new(SettingField { + org_override: None, json_path: Some("use_system_path_prompts"), pick: |settings_content| { settings_content.workspace.use_system_path_prompts.as_ref() @@ -188,6 +192,7 @@ fn general_page(cx: &App) -> SettingsPage { title: "Use System Prompts", description: "Use native OS dialogs for confirmations.", field: Box::new(SettingField { + org_override: None, json_path: Some("use_system_prompts"), pick: |settings_content| settings_content.workspace.use_system_prompts.as_ref(), write: |settings_content, value, _| { @@ -201,6 +206,7 @@ fn general_page(cx: &App) -> SettingsPage { title: "Redact Private Values", description: "Hide the values of variables in private files.", field: Box::new(SettingField { + org_override: None, json_path: Some("redact_private_values"), pick: |settings_content| settings_content.editor.redact_private_values.as_ref(), write: |settings_content, value, _| { @@ -215,6 +221,7 @@ fn general_page(cx: &App) -> SettingsPage { description: "Globs to match against file paths to determine if a file is private.", field: Box::new( SettingField { + org_override: None, json_path: Some("worktree.private_files"), pick: |settings_content| { settings_content.project.worktree.private_files.as_ref() @@ -232,6 +239,7 @@ fn general_page(cx: &App) -> SettingsPage { title: "CLI Default Open Behavior", description: "How `zed ` opens directories when no flag is specified.", field: Box::new(SettingField { + org_override: None, json_path: Some("cli_default_open_behavior"), pick: |settings_content| { settings_content @@ -258,6 +266,7 @@ fn general_page(cx: &App) -> SettingsPage { title: "Trust All Projects By Default", description: "When opening Zed, avoid Restricted Mode by auto-trusting all projects, enabling use of all features without having to give permission to each new project.", field: Box::new(SettingField { + org_override: None, json_path: Some("session.trust_all_projects"), pick: |settings_content| { settings_content @@ -285,6 +294,7 @@ fn general_page(cx: &App) -> SettingsPage { title: "Restore Unsaved Buffers", description: "Whether or not to restore unsaved buffers on restart.", field: Box::new(SettingField { + org_override: None, json_path: Some("session.restore_unsaved_buffers"), pick: |settings_content| { settings_content @@ -306,6 +316,7 @@ fn general_page(cx: &App) -> SettingsPage { title: "Restore On Startup", description: "What to restore from the previous session when opening Zed.", field: Box::new(SettingField { + org_override: None, json_path: Some("restore_on_startup"), pick: |settings_content| settings_content.workspace.restore_on_startup.as_ref(), write: |settings_content, value, _| { @@ -327,6 +338,7 @@ fn general_page(cx: &App) -> SettingsPage { description: "Which settings should be activated only in Preview build of Zed.", field: Box::new( SettingField { + org_override: None, json_path: Some("preview_channel_settings"), pick: |settings_content| Some(settings_content), write: |_settings_content, _value, _| {}, @@ -341,6 +353,7 @@ fn general_page(cx: &App) -> SettingsPage { description: "Any number of settings profiles that are temporarily applied on top of your existing user settings.", field: Box::new( SettingField { + org_override: None, json_path: Some("settings_profiles"), pick: |settings_content| Some(settings_content), write: |_settings_content, _value, _| {}, @@ -359,6 +372,7 @@ fn general_page(cx: &App) -> SettingsPage { title: "Telemetry Diagnostics", description: "Send debug information like crash reports.", field: Box::new(SettingField { + org_override: None, json_path: Some("telemetry.diagnostics"), pick: |settings_content| { settings_content @@ -380,6 +394,7 @@ fn general_page(cx: &App) -> SettingsPage { title: "Telemetry Metrics", description: "Send anonymized usage data like what languages you're using Zed with.", field: Box::new(SettingField { + org_override: None, json_path: Some("telemetry.metrics"), pick: |settings_content| { settings_content @@ -404,6 +419,7 @@ fn general_page(cx: &App) -> SettingsPage { title: "Auto Update", description: "Whether or not to automatically check for updates.", field: Box::new(SettingField { + org_override: None, json_path: Some("auto_update"), pick: |settings_content| settings_content.auto_update.as_ref(), write: |settings_content, value, _| { @@ -441,6 +457,7 @@ fn appearance_page() -> SettingsPage { title: "Theme Mode", description: "Choose a static, fixed theme or dynamically select themes based on appearance and light/dark modes.", field: Box::new(SettingField { + org_override: None, json_path: Some("theme$"), pick: |settings_content| { Some(&dynamic_variants::()[ @@ -504,6 +521,7 @@ fn appearance_page() -> SettingsPage { title: "Theme Name", description: "The name of your selected theme.", field: Box::new(SettingField { + org_override: None, json_path: Some("theme"), pick: |settings_content| { match settings_content.theme.theme.as_ref() { @@ -532,6 +550,7 @@ fn appearance_page() -> SettingsPage { title: "Mode", description: "Choose whether to use the selected light or dark theme or to follow your OS appearance configuration.", field: Box::new(SettingField { + org_override: None, json_path: Some("theme.mode"), pick: |settings_content| { match settings_content.theme.theme.as_ref() { @@ -558,6 +577,7 @@ fn appearance_page() -> SettingsPage { title: "Light Theme", description: "The theme to use when mode is set to light, or when mode is set to system and it is in light mode.", field: Box::new(SettingField { + org_override: None, json_path: Some("theme.light"), pick: |settings_content| { match settings_content.theme.theme.as_ref() { @@ -584,6 +604,7 @@ fn appearance_page() -> SettingsPage { title: "Dark Theme", description: "The theme to use when mode is set to dark, or when mode is set to system and it is in dark mode.", field: Box::new(SettingField { + org_override: None, json_path: Some("theme.dark"), pick: |settings_content| { match settings_content.theme.theme.as_ref() { @@ -615,6 +636,7 @@ fn appearance_page() -> SettingsPage { title: "Icon Theme", description: "The custom set of icons Zed will associate with files and directories.", field: Box::new(SettingField { + org_override: None, json_path: Some("icon_theme$"), pick: |settings_content| { Some(&dynamic_variants::()[ @@ -680,6 +702,7 @@ fn appearance_page() -> SettingsPage { title: "Icon Theme Name", description: "The name of your selected icon theme.", field: Box::new(SettingField { + org_override: None, json_path: Some("icon_theme$string"), pick: |settings_content| { match settings_content.theme.icon_theme.as_ref() { @@ -708,6 +731,7 @@ fn appearance_page() -> SettingsPage { title: "Mode", description: "Choose whether to use the selected light or dark icon theme or to follow your OS appearance configuration.", field: Box::new(SettingField { + org_override: None, json_path: Some("icon_theme"), pick: |settings_content| { match settings_content.theme.icon_theme.as_ref() { @@ -734,6 +758,7 @@ fn appearance_page() -> SettingsPage { title: "Light Icon Theme", description: "The icon theme to use when mode is set to light, or when mode is set to system and it is in light mode.", field: Box::new(SettingField { + org_override: None, json_path: Some("icon_theme.light"), pick: |settings_content| { match settings_content.theme.icon_theme.as_ref() { @@ -760,6 +785,7 @@ fn appearance_page() -> SettingsPage { title: "Dark Icon Theme", description: "The icon theme to use when mode is set to dark, or when mode is set to system and it is in dark mode.", field: Box::new(SettingField { + org_override: None, json_path: Some("icon_theme.dark"), pick: |settings_content| { match settings_content.theme.icon_theme.as_ref() { @@ -795,6 +821,7 @@ fn appearance_page() -> SettingsPage { title: "Font Family", description: "Font family for editor text.", field: Box::new(SettingField { + org_override: None, json_path: Some("buffer_font_family"), pick: |settings_content| settings_content.theme.buffer_font_family.as_ref(), write: |settings_content, value, _| { @@ -808,6 +835,7 @@ fn appearance_page() -> SettingsPage { title: "Font Size", description: "Font size for editor text.", field: Box::new(SettingField { + org_override: None, json_path: Some("buffer_font_size"), pick: |settings_content| settings_content.theme.buffer_font_size.as_ref(), write: |settings_content, value, _| { @@ -821,6 +849,7 @@ fn appearance_page() -> SettingsPage { title: "Font Weight", description: "Font weight for editor text (100-900).", field: Box::new(SettingField { + org_override: None, json_path: Some("buffer_font_weight"), pick: |settings_content| settings_content.theme.buffer_font_weight.as_ref(), write: |settings_content, value, _| { @@ -836,6 +865,7 @@ fn appearance_page() -> SettingsPage { title: "Line Height", description: "Line height for editor text.", field: Box::new(SettingField { + org_override: None, json_path: Some("buffer_line_height$"), pick: |settings_content| { Some( @@ -893,6 +923,7 @@ fn appearance_page() -> SettingsPage { title: "Custom Line Height", description: "Custom line height value (must be at least 1.0).", field: Box::new(SettingField { + org_override: None, json_path: Some("buffer_line_height"), pick: |settings_content| match settings_content .theme @@ -925,6 +956,7 @@ fn appearance_page() -> SettingsPage { description: "The OpenType features to enable for rendering in text buffers.", field: Box::new( SettingField { + org_override: None, json_path: Some("buffer_font_features"), pick: |settings_content| { settings_content.theme.buffer_font_features.as_ref() @@ -943,6 +975,7 @@ fn appearance_page() -> SettingsPage { description: "The font fallbacks to use for rendering in text buffers.", field: Box::new( SettingField { + org_override: None, json_path: Some("buffer_font_fallbacks"), pick: |settings_content| { settings_content.theme.buffer_font_fallbacks.as_ref() @@ -965,6 +998,7 @@ fn appearance_page() -> SettingsPage { title: "Font Family", description: "Font family for UI elements.", field: Box::new(SettingField { + org_override: None, json_path: Some("ui_font_family"), pick: |settings_content| settings_content.theme.ui_font_family.as_ref(), write: |settings_content, value, _| { @@ -978,6 +1012,7 @@ fn appearance_page() -> SettingsPage { title: "Font Size", description: "Font size for UI elements.", field: Box::new(SettingField { + org_override: None, json_path: Some("ui_font_size"), pick: |settings_content| settings_content.theme.ui_font_size.as_ref(), write: |settings_content, value, _| { @@ -991,6 +1026,7 @@ fn appearance_page() -> SettingsPage { title: "Font Weight", description: "Font weight for UI elements (100-900).", field: Box::new(SettingField { + org_override: None, json_path: Some("ui_font_weight"), pick: |settings_content| settings_content.theme.ui_font_weight.as_ref(), write: |settings_content, value, _| { @@ -1006,6 +1042,7 @@ fn appearance_page() -> SettingsPage { description: "The OpenType features to enable for rendering in UI elements.", field: Box::new( SettingField { + org_override: None, json_path: Some("ui_font_features"), pick: |settings_content| settings_content.theme.ui_font_features.as_ref(), write: |settings_content, value, _| { @@ -1022,6 +1059,7 @@ fn appearance_page() -> SettingsPage { description: "The font fallbacks to use for rendering in the UI.", field: Box::new( SettingField { + org_override: None, json_path: Some("ui_font_fallbacks"), pick: |settings_content| settings_content.theme.ui_font_fallbacks.as_ref(), write: |settings_content, value, _| { @@ -1042,6 +1080,7 @@ fn appearance_page() -> SettingsPage { title: "UI Font Size", description: "Font size for agent response text in the agent panel. Falls back to the regular UI font size.", field: Box::new(SettingField { + org_override: None, json_path: Some("agent_ui_font_size"), pick: |settings_content| { settings_content @@ -1061,6 +1100,7 @@ fn appearance_page() -> SettingsPage { title: "Buffer Font Size", description: "Font size for user messages text in the agent panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("agent_buffer_font_size"), pick: |settings_content| { settings_content @@ -1086,6 +1126,7 @@ fn appearance_page() -> SettingsPage { title: "Text Rendering Mode", description: "The text rendering mode to use.", field: Box::new(SettingField { + org_override: None, json_path: Some("text_rendering_mode"), pick: |settings_content| { settings_content.workspace.text_rendering_mode.as_ref() @@ -1107,6 +1148,7 @@ fn appearance_page() -> SettingsPage { title: "Multi Cursor Modifier", description: "Modifier key for adding multiple cursors.", field: Box::new(SettingField { + org_override: None, json_path: Some("multi_cursor_modifier"), pick: |settings_content| settings_content.editor.multi_cursor_modifier.as_ref(), write: |settings_content, value, _| { @@ -1120,6 +1162,7 @@ fn appearance_page() -> SettingsPage { title: "Cursor Blink", description: "Whether the cursor blinks in the editor.", field: Box::new(SettingField { + org_override: None, json_path: Some("cursor_blink"), pick: |settings_content| settings_content.editor.cursor_blink.as_ref(), write: |settings_content, value, _| { @@ -1133,6 +1176,7 @@ fn appearance_page() -> SettingsPage { title: "Cursor Shape", description: "Cursor shape for the editor.", field: Box::new(SettingField { + org_override: None, json_path: Some("cursor_shape"), pick: |settings_content| settings_content.editor.cursor_shape.as_ref(), write: |settings_content, value, _| { @@ -1146,6 +1190,7 @@ fn appearance_page() -> SettingsPage { title: "Hide Mouse", description: "When to hide the mouse cursor.", field: Box::new(SettingField { + org_override: None, json_path: Some("hide_mouse"), pick: |settings_content| settings_content.hide_mouse.as_ref(), write: |settings_content, value, _| { @@ -1165,6 +1210,7 @@ fn appearance_page() -> SettingsPage { title: "Unnecessary Code Fade", description: "How much to fade out unused code (0.0 - 0.9).", field: Box::new(SettingField { + org_override: None, json_path: Some("unnecessary_code_fade"), pick: |settings_content| settings_content.theme.unnecessary_code_fade.as_ref(), write: |settings_content, value, _| { @@ -1178,6 +1224,7 @@ fn appearance_page() -> SettingsPage { title: "Current Line Highlight", description: "How to highlight the current line.", field: Box::new(SettingField { + org_override: None, json_path: Some("current_line_highlight"), pick: |settings_content| { settings_content.editor.current_line_highlight.as_ref() @@ -1193,6 +1240,7 @@ fn appearance_page() -> SettingsPage { title: "Selection Highlight", description: "Highlight all occurrences of selected text.", field: Box::new(SettingField { + org_override: None, json_path: Some("selection_highlight"), pick: |settings_content| settings_content.editor.selection_highlight.as_ref(), write: |settings_content, value, _| { @@ -1206,6 +1254,7 @@ fn appearance_page() -> SettingsPage { title: "Rounded Selection", description: "Whether the text selection should have rounded corners.", field: Box::new(SettingField { + org_override: None, json_path: Some("rounded_selection"), pick: |settings_content| settings_content.editor.rounded_selection.as_ref(), write: |settings_content, value, _| { @@ -1219,6 +1268,7 @@ fn appearance_page() -> SettingsPage { title: "Minimum Contrast For Highlights", description: "The minimum APCA perceptual contrast to maintain when rendering text over highlight backgrounds.", field: Box::new(SettingField { + org_override: None, json_path: Some("minimum_contrast_for_highlights"), pick: |settings_content| { settings_content @@ -1243,6 +1293,7 @@ fn appearance_page() -> SettingsPage { title: "Show Wrap Guides", description: "Show wrap guides (vertical rulers).", field: Box::new(SettingField { + org_override: None, json_path: Some("show_wrap_guides"), pick: |settings_content| { settings_content @@ -1269,6 +1320,7 @@ fn appearance_page() -> SettingsPage { description: "Character counts at which to show wrap guides.", field: Box::new( SettingField { + org_override: None, json_path: Some("wrap_guides"), pick: |settings_content| { settings_content @@ -1340,6 +1392,7 @@ fn keymap_page() -> SettingsPage { title: "Base Keymap", description: "The name of a base set of key bindings to use.", field: Box::new(SettingField { + org_override: None, json_path: Some("base_keymap"), pick: |settings_content| settings_content.base_keymap.as_ref(), write: |settings_content, value, _| { @@ -1362,6 +1415,7 @@ fn keymap_page() -> SettingsPage { title: "Vim Mode", description: "Enable Vim mode and key bindings.", field: Box::new(SettingField { + org_override: None, json_path: Some("vim_mode"), pick: |settings_content| settings_content.vim_mode.as_ref(), write: write_vim_mode, @@ -1373,6 +1427,7 @@ fn keymap_page() -> SettingsPage { title: "Helix Mode", description: "Enable Helix mode and key bindings.", field: Box::new(SettingField { + org_override: None, json_path: Some("helix_mode"), pick: |settings_content| settings_content.helix_mode.as_ref(), write: write_helix_mode, @@ -1405,6 +1460,7 @@ fn editor_page() -> SettingsPage { title: "Auto Save Mode", description: "When to auto save buffer changes.", field: Box::new(SettingField { + org_override: None, json_path: Some("autosave$"), pick: |settings_content| { Some( @@ -1461,6 +1517,7 @@ fn editor_page() -> SettingsPage { title: "Delay (milliseconds)", description: "Save after inactivity period (in milliseconds).", field: Box::new(SettingField { + org_override: None, json_path: Some("autosave.after_delay.milliseconds"), pick: |settings_content| match settings_content .workspace @@ -1502,6 +1559,7 @@ fn editor_page() -> SettingsPage { title: "Show Which-key Menu", description: "Display the which-key menu with matching bindings while a multi-stroke binding is pending.", field: Box::new(SettingField { + org_override: None, json_path: Some("which_key.enabled"), pick: |settings_content| { settings_content @@ -1520,6 +1578,7 @@ fn editor_page() -> SettingsPage { title: "Menu Delay", description: "Delay in milliseconds before the which-key menu appears.", field: Box::new(SettingField { + org_override: None, json_path: Some("which_key.delay_ms"), pick: |settings_content| { settings_content @@ -1544,6 +1603,7 @@ fn editor_page() -> SettingsPage { title: "Double Click In Multibuffer", description: "What to do when multibuffer is double-clicked in some of its excerpts.", field: Box::new(SettingField { + org_override: None, json_path: Some("double_click_in_multibuffer"), pick: |settings_content| { settings_content.editor.double_click_in_multibuffer.as_ref() @@ -1559,6 +1619,7 @@ fn editor_page() -> SettingsPage { title: "Expand Excerpt Lines", description: "How many lines to expand the multibuffer excerpts by default.", field: Box::new(SettingField { + org_override: None, json_path: Some("expand_excerpt_lines"), pick: |settings_content| settings_content.editor.expand_excerpt_lines.as_ref(), write: |settings_content, value, _| { @@ -1572,6 +1633,7 @@ fn editor_page() -> SettingsPage { title: "Excerpt Context Lines", description: "How many lines of context to provide in multibuffer excerpts by default.", field: Box::new(SettingField { + org_override: None, json_path: Some("excerpt_context_lines"), pick: |settings_content| settings_content.editor.excerpt_context_lines.as_ref(), write: |settings_content, value, _| { @@ -1585,6 +1647,7 @@ fn editor_page() -> SettingsPage { title: "Expand Outlines With Depth", description: "Default depth to expand outline items in the current file.", field: Box::new(SettingField { + org_override: None, json_path: Some("outline_panel.expand_outlines_with_depth"), pick: |settings_content| { settings_content @@ -1608,6 +1671,7 @@ fn editor_page() -> SettingsPage { title: "Diff View Style", description: "How to display diffs in the editor.", field: Box::new(SettingField { + org_override: None, json_path: Some("diff_view_style"), pick: |settings_content| settings_content.editor.diff_view_style.as_ref(), write: |settings_content, value, _| { @@ -1621,6 +1685,7 @@ fn editor_page() -> SettingsPage { title: "Minimum Split Diff Width", description: "The minimum width (in columns) at which the split diff view is used. When the editor is narrower, the diff view automatically switches to unified mode. Set to 0 to disable.", field: Box::new(SettingField { + org_override: None, json_path: Some("minimum_split_diff_width"), pick: |settings_content| { settings_content.editor.minimum_split_diff_width.as_ref() @@ -1642,6 +1707,7 @@ fn editor_page() -> SettingsPage { title: "Scroll Beyond Last Line", description: "Whether the editor will scroll beyond the last line.", field: Box::new(SettingField { + org_override: None, json_path: Some("scroll_beyond_last_line"), pick: |settings_content| { settings_content.editor.scroll_beyond_last_line.as_ref() @@ -1657,6 +1723,7 @@ fn editor_page() -> SettingsPage { title: "Vertical Scroll Margin", description: "The number of lines to keep above/below the cursor when auto-scrolling.", field: Box::new(SettingField { + org_override: None, json_path: Some("vertical_scroll_margin"), pick: |settings_content| { settings_content.editor.vertical_scroll_margin.as_ref() @@ -1672,6 +1739,7 @@ fn editor_page() -> SettingsPage { title: "Horizontal Scroll Margin", description: "The number of characters to keep on either side when scrolling with the mouse.", field: Box::new(SettingField { + org_override: None, json_path: Some("horizontal_scroll_margin"), pick: |settings_content| { settings_content.editor.horizontal_scroll_margin.as_ref() @@ -1687,6 +1755,7 @@ fn editor_page() -> SettingsPage { title: "Scroll Sensitivity", description: "Scroll sensitivity multiplier for both horizontal and vertical scrolling.", field: Box::new(SettingField { + org_override: None, json_path: Some("scroll_sensitivity"), pick: |settings_content| settings_content.editor.scroll_sensitivity.as_ref(), write: |settings_content, value, _| { @@ -1700,6 +1769,7 @@ fn editor_page() -> SettingsPage { title: "Mouse Wheel Zoom", description: "Whether to zoom the editor font size with the mouse wheel while holding the primary modifier key.", field: Box::new(SettingField { + org_override: None, json_path: Some("mouse_wheel_zoom"), pick: |settings_content| settings_content.editor.mouse_wheel_zoom.as_ref(), write: |settings_content, value, _| { @@ -1713,6 +1783,7 @@ fn editor_page() -> SettingsPage { title: "Fast Scroll Sensitivity", description: "Fast scroll sensitivity multiplier for both horizontal and vertical scrolling.", field: Box::new(SettingField { + org_override: None, json_path: Some("fast_scroll_sensitivity"), pick: |settings_content| { settings_content.editor.fast_scroll_sensitivity.as_ref() @@ -1728,6 +1799,7 @@ fn editor_page() -> SettingsPage { title: "Autoscroll On Clicks", description: "Whether to scroll when clicking near the edge of the visible text area.", field: Box::new(SettingField { + org_override: None, json_path: Some("autoscroll_on_clicks"), pick: |settings_content| settings_content.editor.autoscroll_on_clicks.as_ref(), write: |settings_content, value, _| { @@ -1741,6 +1813,7 @@ fn editor_page() -> SettingsPage { title: "Sticky Scroll", description: "Whether to stick scopes to the top of the editor", field: Box::new(SettingField { + org_override: None, json_path: Some("sticky_scroll.enabled"), pick: |settings_content| { settings_content @@ -1770,6 +1843,7 @@ fn editor_page() -> SettingsPage { title: "Auto Signature Help", description: "Automatically show a signature help pop-up.", field: Box::new(SettingField { + org_override: None, json_path: Some("auto_signature_help"), pick: |settings_content| settings_content.editor.auto_signature_help.as_ref(), write: |settings_content, value, _| { @@ -1783,6 +1857,7 @@ fn editor_page() -> SettingsPage { title: "Show Signature Help After Edits", description: "Show the signature help pop-up after completions or bracket pairs are inserted.", field: Box::new(SettingField { + org_override: None, json_path: Some("show_signature_help_after_edits"), pick: |settings_content| { settings_content @@ -1801,6 +1876,7 @@ fn editor_page() -> SettingsPage { title: "Snippet Sort Order", description: "Determines how snippets are sorted relative to other completion items.", field: Box::new(SettingField { + org_override: None, json_path: Some("snippet_sort_order"), pick: |settings_content| settings_content.editor.snippet_sort_order.as_ref(), write: |settings_content, value, _| { @@ -1820,6 +1896,7 @@ fn editor_page() -> SettingsPage { title: "Enabled", description: "Show the informational hover box when moving the mouse over symbols in the editor.", field: Box::new(SettingField { + org_override: None, json_path: Some("hover_popover_enabled"), pick: |settings_content| settings_content.editor.hover_popover_enabled.as_ref(), write: |settings_content, value, _| { @@ -1834,6 +1911,7 @@ fn editor_page() -> SettingsPage { title: "Delay", description: "Time to wait in milliseconds before showing the informational hover box.", field: Box::new(SettingField { + org_override: None, json_path: Some("hover_popover_delay"), pick: |settings_content| settings_content.editor.hover_popover_delay.as_ref(), write: |settings_content, value, _| { @@ -1847,6 +1925,7 @@ fn editor_page() -> SettingsPage { title: "Sticky", description: "Whether the hover popover sticks when the mouse moves toward it, allowing interaction with its contents.", field: Box::new(SettingField { + org_override: None, json_path: Some("hover_popover_sticky"), pick: |settings_content| settings_content.editor.hover_popover_sticky.as_ref(), write: |settings_content, value, _| { @@ -1861,6 +1940,7 @@ fn editor_page() -> SettingsPage { title: "Hiding Delay", description: "Time to wait in milliseconds before hiding the hover popover after the mouse moves away.", field: Box::new(SettingField { + org_override: None, json_path: Some("hover_popover_hiding_delay"), pick: |settings_content| { settings_content.editor.hover_popover_hiding_delay.as_ref() @@ -1882,6 +1962,7 @@ fn editor_page() -> SettingsPage { title: "Enabled", description: "Enable drag and drop selection.", field: Box::new(SettingField { + org_override: None, json_path: Some("drag_and_drop_selection.enabled"), pick: |settings_content| { settings_content @@ -1905,6 +1986,7 @@ fn editor_page() -> SettingsPage { title: "Delay", description: "Delay in milliseconds before drag and drop selection starts.", field: Box::new(SettingField { + org_override: None, json_path: Some("drag_and_drop_selection.delay"), pick: |settings_content| { settings_content @@ -1934,6 +2016,7 @@ fn editor_page() -> SettingsPage { title: "Show Line Numbers", description: "Show line numbers in the gutter.", field: Box::new(SettingField { + org_override: None, json_path: Some("gutter.line_numbers"), pick: |settings_content| { settings_content @@ -1957,6 +2040,7 @@ fn editor_page() -> SettingsPage { title: "Relative Line Numbers", description: "Controls line number display in the editor's gutter. \"disabled\" shows absolute line numbers, \"enabled\" shows relative line numbers for each absolute line, and \"wrapped\" shows relative line numbers for every line, absolute or wrapped.", field: Box::new(SettingField { + org_override: None, json_path: Some("relative_line_numbers"), pick: |settings_content| settings_content.editor.relative_line_numbers.as_ref(), write: |settings_content, value, _| { @@ -1970,6 +2054,7 @@ fn editor_page() -> SettingsPage { title: "Show Runnables", description: "Show runnable buttons in the gutter.", field: Box::new(SettingField { + org_override: None, json_path: Some("gutter.runnables"), pick: |settings_content| { settings_content @@ -1993,6 +2078,7 @@ fn editor_page() -> SettingsPage { title: "Show Breakpoints", description: "Show breakpoints in the gutter.", field: Box::new(SettingField { + org_override: None, json_path: Some("gutter.breakpoints"), pick: |settings_content| { settings_content @@ -2016,6 +2102,7 @@ fn editor_page() -> SettingsPage { title: "Show Bookmarks", description: "Show bookmarks in the gutter.", field: Box::new(SettingField { + org_override: None, json_path: Some("gutter.bookmarks"), pick: |settings_content| { settings_content @@ -2039,6 +2126,7 @@ fn editor_page() -> SettingsPage { title: "Show Folds", description: "Show code folding controls in the gutter.", field: Box::new(SettingField { + org_override: None, json_path: Some("gutter.folds"), pick: |settings_content| { settings_content @@ -2058,6 +2146,7 @@ fn editor_page() -> SettingsPage { title: "Min Line Number Digits", description: "Minimum number of characters to reserve space for in the gutter.", field: Box::new(SettingField { + org_override: None, json_path: Some("gutter.min_line_number_digits"), pick: |settings_content| { settings_content @@ -2081,6 +2170,7 @@ fn editor_page() -> SettingsPage { title: "Inline Code Actions", description: "Show code action button at start of buffer line.", field: Box::new(SettingField { + org_override: None, json_path: Some("inline_code_actions"), pick: |settings_content| settings_content.editor.inline_code_actions.as_ref(), write: |settings_content, value, _| { @@ -2100,6 +2190,7 @@ fn editor_page() -> SettingsPage { title: "Show", description: "When to show the scrollbar in the editor.", field: Box::new(SettingField { + org_override: None, json_path: Some("scrollbar"), pick: |settings_content| { settings_content.editor.scrollbar.as_ref()?.show.as_ref() @@ -2119,6 +2210,7 @@ fn editor_page() -> SettingsPage { title: "Cursors", description: "Show cursor positions in the scrollbar.", field: Box::new(SettingField { + org_override: None, json_path: Some("scrollbar.cursors"), pick: |settings_content| { settings_content.editor.scrollbar.as_ref()?.cursors.as_ref() @@ -2138,6 +2230,7 @@ fn editor_page() -> SettingsPage { title: "Git Diff", description: "Show Git diff indicators in the scrollbar.", field: Box::new(SettingField { + org_override: None, json_path: Some("scrollbar.git_diff"), pick: |settings_content| { settings_content @@ -2162,6 +2255,7 @@ fn editor_page() -> SettingsPage { title: "Search Results", description: "Show buffer search result indicators in the scrollbar.", field: Box::new(SettingField { + org_override: None, json_path: Some("scrollbar.search_results"), pick: |settings_content| { settings_content @@ -2186,6 +2280,7 @@ fn editor_page() -> SettingsPage { title: "Selected Text", description: "Show selected text occurrences in the scrollbar.", field: Box::new(SettingField { + org_override: None, json_path: Some("scrollbar.selected_text"), pick: |settings_content| { settings_content @@ -2210,6 +2305,7 @@ fn editor_page() -> SettingsPage { title: "Selected Symbol", description: "Show selected symbol occurrences in the scrollbar.", field: Box::new(SettingField { + org_override: None, json_path: Some("scrollbar.selected_symbol"), pick: |settings_content| { settings_content @@ -2234,6 +2330,7 @@ fn editor_page() -> SettingsPage { title: "Diagnostics", description: "Which diagnostic indicators to show in the scrollbar.", field: Box::new(SettingField { + org_override: None, json_path: Some("scrollbar.diagnostics"), pick: |settings_content| { settings_content @@ -2258,6 +2355,7 @@ fn editor_page() -> SettingsPage { title: "Horizontal Scrollbar", description: "When false, forcefully disables the horizontal scrollbar.", field: Box::new(SettingField { + org_override: None, json_path: Some("scrollbar.axes.horizontal"), pick: |settings_content| { settings_content @@ -2286,6 +2384,7 @@ fn editor_page() -> SettingsPage { title: "Vertical Scrollbar", description: "When false, forcefully disables the vertical scrollbar.", field: Box::new(SettingField { + org_override: None, json_path: Some("scrollbar.axes.vertical"), pick: |settings_content| { settings_content @@ -2320,6 +2419,7 @@ fn editor_page() -> SettingsPage { title: "Show", description: "When to show the minimap in the editor.", field: Box::new(SettingField { + org_override: None, json_path: Some("minimap.show"), pick: |settings_content| { settings_content.editor.minimap.as_ref()?.show.as_ref() @@ -2335,6 +2435,7 @@ fn editor_page() -> SettingsPage { title: "Display In", description: "Where to show the minimap in the editor.", field: Box::new(SettingField { + org_override: None, json_path: Some("minimap.display_in"), pick: |settings_content| { settings_content @@ -2359,6 +2460,7 @@ fn editor_page() -> SettingsPage { title: "Thumb", description: "When to show the minimap thumb.", field: Box::new(SettingField { + org_override: None, json_path: Some("minimap.thumb"), pick: |settings_content| { settings_content.editor.minimap.as_ref()?.thumb.as_ref() @@ -2378,6 +2480,7 @@ fn editor_page() -> SettingsPage { title: "Thumb Border", description: "Border style for the minimap's scrollbar thumb.", field: Box::new(SettingField { + org_override: None, json_path: Some("minimap.thumb_border"), pick: |settings_content| { settings_content @@ -2402,6 +2505,7 @@ fn editor_page() -> SettingsPage { title: "Current Line Highlight", description: "How to highlight the current line in the minimap.", field: Box::new(SettingField { + org_override: None, json_path: Some("minimap.current_line_highlight"), pick: |settings_content| { settings_content @@ -2426,6 +2530,7 @@ fn editor_page() -> SettingsPage { title: "Max Width Columns", description: "Maximum number of columns to display in the minimap.", field: Box::new(SettingField { + org_override: None, json_path: Some("minimap.max_width_columns"), pick: |settings_content| { settings_content @@ -2456,6 +2561,7 @@ fn editor_page() -> SettingsPage { title: "Breadcrumbs", description: "Show breadcrumbs.", field: Box::new(SettingField { + org_override: None, json_path: Some("toolbar.breadcrumbs"), pick: |settings_content| { settings_content @@ -2480,6 +2586,7 @@ fn editor_page() -> SettingsPage { title: "Quick Actions", description: "Show quick action buttons (e.g., search, selection, editor controls, etc.).", field: Box::new(SettingField { + org_override: None, json_path: Some("toolbar.quick_actions"), pick: |settings_content| { settings_content @@ -2504,6 +2611,7 @@ fn editor_page() -> SettingsPage { title: "Selections Menu", description: "Show the selections menu in the editor toolbar.", field: Box::new(SettingField { + org_override: None, json_path: Some("toolbar.selections_menu"), pick: |settings_content| { settings_content @@ -2528,6 +2636,7 @@ fn editor_page() -> SettingsPage { title: "Agent Review", description: "Show agent review buttons in the editor toolbar.", field: Box::new(SettingField { + org_override: None, json_path: Some("toolbar.agent_review"), pick: |settings_content| { settings_content @@ -2552,6 +2661,7 @@ fn editor_page() -> SettingsPage { title: "Code Actions", description: "Show code action buttons in the editor toolbar.", field: Box::new(SettingField { + org_override: None, json_path: Some("toolbar.code_actions"), pick: |settings_content| { settings_content @@ -2582,6 +2692,7 @@ fn editor_page() -> SettingsPage { title: "Default Mode", description: "The default mode when Vim starts.", field: Box::new(SettingField { + org_override: None, json_path: Some("vim.default_mode"), pick: |settings_content| settings_content.vim.as_ref()?.default_mode.as_ref(), write: |settings_content, value, _| { @@ -2595,6 +2706,7 @@ fn editor_page() -> SettingsPage { title: "Toggle Relative Line Numbers", description: "Toggle relative line numbers in Vim mode.", field: Box::new(SettingField { + org_override: None, json_path: Some("vim.toggle_relative_line_numbers"), pick: |settings_content| { settings_content @@ -2617,6 +2729,7 @@ fn editor_page() -> SettingsPage { title: "Use System Clipboard", description: "Controls when to use system clipboard in Vim mode.", field: Box::new(SettingField { + org_override: None, json_path: Some("vim.use_system_clipboard"), pick: |settings_content| { settings_content.vim.as_ref()?.use_system_clipboard.as_ref() @@ -2635,6 +2748,7 @@ fn editor_page() -> SettingsPage { title: "Use Smartcase Find", description: "Enable smartcase searching in Vim mode.", field: Box::new(SettingField { + org_override: None, json_path: Some("vim.use_smartcase_find"), pick: |settings_content| { settings_content.vim.as_ref()?.use_smartcase_find.as_ref() @@ -2653,6 +2767,7 @@ fn editor_page() -> SettingsPage { title: "Global Substitution Default", description: "When enabled, the :substitute command replaces all matches in a line by default. The 'g' flag then toggles this behavior.", field: Box::new(SettingField { + org_override: None, json_path: Some("vim.gdefault"), pick: |settings_content| settings_content.vim.as_ref()?.gdefault.as_ref(), write: |settings_content, value, _| { @@ -2666,6 +2781,7 @@ fn editor_page() -> SettingsPage { title: "Highlight on Yank Duration", description: "Duration in milliseconds to highlight yanked text in Vim mode.", field: Box::new(SettingField { + org_override: None, json_path: Some("vim.highlight_on_yank_duration"), pick: |settings_content| { settings_content @@ -2688,6 +2804,7 @@ fn editor_page() -> SettingsPage { title: "Regex Search", description: "Use regex search by default in Vim search.", field: Box::new(SettingField { + org_override: None, json_path: Some("vim.use_regex_search"), pick: |settings_content| { settings_content.vim.as_ref()?.use_regex_search.as_ref() @@ -2706,6 +2823,7 @@ fn editor_page() -> SettingsPage { title: "Show Edit Predictions in Normal Mode", description: "Whether edit predictions are shown in normal mode. By default, edit predictions are only shown in insert and replace modes.", field: Box::new(SettingField { + org_override: None, json_path: Some("vim.show_edit_predictions_in_normal_mode"), pick: |settings_content| { settings_content @@ -2728,6 +2846,7 @@ fn editor_page() -> SettingsPage { title: "Cursor Shape - Normal Mode", description: "Cursor shape for normal mode.", field: Box::new(SettingField { + org_override: None, json_path: Some("vim.cursor_shape.normal"), pick: |settings_content| { settings_content @@ -2754,6 +2873,7 @@ fn editor_page() -> SettingsPage { title: "Cursor Shape - Insert Mode", description: "Cursor shape for insert mode. Inherit uses the editor's cursor shape.", field: Box::new(SettingField { + org_override: None, json_path: Some("vim.cursor_shape.insert"), pick: |settings_content| { settings_content @@ -2780,6 +2900,7 @@ fn editor_page() -> SettingsPage { title: "Cursor Shape - Replace Mode", description: "Cursor shape for replace mode.", field: Box::new(SettingField { + org_override: None, json_path: Some("vim.cursor_shape.replace"), pick: |settings_content| { settings_content @@ -2806,6 +2927,7 @@ fn editor_page() -> SettingsPage { title: "Cursor Shape - Visual Mode", description: "Cursor shape for visual mode.", field: Box::new(SettingField { + org_override: None, json_path: Some("vim.cursor_shape.visual"), pick: |settings_content| { settings_content @@ -2833,6 +2955,7 @@ fn editor_page() -> SettingsPage { description: "Custom digraph mappings for Vim mode.", field: Box::new( SettingField { + org_override: None, json_path: Some("vim.custom_digraphs"), pick: |settings_content| { settings_content.vim.as_ref()?.custom_digraphs.as_ref() @@ -2880,6 +3003,7 @@ fn languages_and_tools_page(cx: &App) -> SettingsPage { description: "A mapping from languages to files and file extensions that should be treated as that language.", field: Box::new( SettingField { + org_override: None, json_path: Some("file_type_associations"), pick: |settings_content| { settings_content.project.all_languages.file_types.as_ref() @@ -2903,6 +3027,7 @@ fn languages_and_tools_page(cx: &App) -> SettingsPage { title: "Max Severity", description: "Which level to use to filter out diagnostics displayed in the editor.", field: Box::new(SettingField { + org_override: None, json_path: Some("diagnostics_max_severity"), pick: |settings_content| { settings_content.editor.diagnostics_max_severity.as_ref() @@ -2918,6 +3043,7 @@ fn languages_and_tools_page(cx: &App) -> SettingsPage { title: "Include Warnings", description: "Whether to show warnings or not by default.", field: Box::new(SettingField { + org_override: None, json_path: Some("diagnostics.include_warnings"), pick: |settings_content| { settings_content @@ -2946,6 +3072,7 @@ fn languages_and_tools_page(cx: &App) -> SettingsPage { title: "Enabled", description: "Whether to show diagnostics inline or not.", field: Box::new(SettingField { + org_override: None, json_path: Some("diagnostics.inline.enabled"), pick: |settings_content| { settings_content @@ -2972,6 +3099,7 @@ fn languages_and_tools_page(cx: &App) -> SettingsPage { title: "Update Debounce", description: "The delay in milliseconds to show inline diagnostics after the last diagnostic update.", field: Box::new(SettingField { + org_override: None, json_path: Some("diagnostics.inline.update_debounce_ms"), pick: |settings_content| { settings_content @@ -2998,6 +3126,7 @@ fn languages_and_tools_page(cx: &App) -> SettingsPage { title: "Padding", description: "The amount of padding between the end of the source line and the start of the inline diagnostic.", field: Box::new(SettingField { + org_override: None, json_path: Some("diagnostics.inline.padding"), pick: |settings_content| { settings_content @@ -3024,6 +3153,7 @@ fn languages_and_tools_page(cx: &App) -> SettingsPage { title: "Minimum Column", description: "The minimum column at which to display inline diagnostics.", field: Box::new(SettingField { + org_override: None, json_path: Some("diagnostics.inline.min_column"), pick: |settings_content| { settings_content @@ -3056,6 +3186,7 @@ fn languages_and_tools_page(cx: &App) -> SettingsPage { title: "Enabled", description: "Whether to pull for language server-powered diagnostics or not.", field: Box::new(SettingField { + org_override: None, json_path: Some("diagnostics.lsp_pull_diagnostics.enabled"), pick: |settings_content| { settings_content @@ -3083,6 +3214,7 @@ fn languages_and_tools_page(cx: &App) -> SettingsPage { title: "Debounce", description: "Minimum time to wait before pulling diagnostics from the language server(s).", field: Box::new(SettingField { + org_override: None, json_path: Some("diagnostics.lsp_pull_diagnostics.debounce_ms"), pick: |settings_content| { settings_content @@ -3115,6 +3247,7 @@ fn languages_and_tools_page(cx: &App) -> SettingsPage { title: "Debounce", description: "The debounce delay before querying highlights from the language.", field: Box::new(SettingField { + org_override: None, json_path: Some("lsp_highlight_debounce"), pick: |settings_content| { settings_content.editor.lsp_highlight_debounce.as_ref() @@ -3185,6 +3318,7 @@ fn search_and_files_page() -> SettingsPage { title: "Whole Word", description: "Search for whole words by default.", field: Box::new(SettingField { + org_override: None, json_path: Some("search.whole_word"), pick: |settings_content| { settings_content.editor.search.as_ref()?.whole_word.as_ref() @@ -3204,6 +3338,7 @@ fn search_and_files_page() -> SettingsPage { title: "Case Sensitive", description: "Search case-sensitively by default.", field: Box::new(SettingField { + org_override: None, json_path: Some("search.case_sensitive"), pick: |settings_content| { settings_content @@ -3228,6 +3363,7 @@ fn search_and_files_page() -> SettingsPage { title: "Use Smartcase Search", description: "Whether to automatically enable case-sensitive search based on the search query.", field: Box::new(SettingField { + org_override: None, json_path: Some("use_smartcase_search"), pick: |settings_content| settings_content.editor.use_smartcase_search.as_ref(), write: |settings_content, value, _| { @@ -3241,6 +3377,7 @@ fn search_and_files_page() -> SettingsPage { title: "Include Ignored", description: "Include ignored files in search results by default.", field: Box::new(SettingField { + org_override: None, json_path: Some("search.include_ignored"), pick: |settings_content| { settings_content @@ -3265,6 +3402,7 @@ fn search_and_files_page() -> SettingsPage { title: "Regex", description: "Use regex search by default.", field: Box::new(SettingField { + org_override: None, json_path: Some("search.regex"), pick: |settings_content| { settings_content.editor.search.as_ref()?.regex.as_ref() @@ -3280,6 +3418,7 @@ fn search_and_files_page() -> SettingsPage { title: "Search Wrap", description: "Whether the editor search results will loop.", field: Box::new(SettingField { + org_override: None, json_path: Some("search_wrap"), pick: |settings_content| settings_content.editor.search_wrap.as_ref(), write: |settings_content, value, _| { @@ -3293,6 +3432,7 @@ fn search_and_files_page() -> SettingsPage { title: "Center on Match", description: "Whether to center the current match in the editor", field: Box::new(SettingField { + org_override: None, json_path: Some("editor.search.center_on_match"), pick: |settings_content| { settings_content @@ -3316,6 +3456,7 @@ fn search_and_files_page() -> SettingsPage { title: "Seed Search Query From Cursor", description: "When to populate a new search's query based on the text under the cursor.", field: Box::new(SettingField { + org_override: None, json_path: Some("seed_search_query_from_cursor"), pick: |settings_content| { settings_content @@ -3341,6 +3482,7 @@ fn search_and_files_page() -> SettingsPage { title: "Include Ignored in Search", description: "Use gitignored files when searching.", field: Box::new(SettingField { + org_override: None, json_path: Some("file_finder.include_ignored"), pick: |settings_content| { settings_content @@ -3363,6 +3505,7 @@ fn search_and_files_page() -> SettingsPage { title: "File Icons", description: "Show file icons in the file finder.", field: Box::new(SettingField { + org_override: None, json_path: Some("file_finder.file_icons"), pick: |settings_content| { settings_content.file_finder.as_ref()?.file_icons.as_ref() @@ -3381,6 +3524,7 @@ fn search_and_files_page() -> SettingsPage { title: "Modal Max Width", description: "Determines how much space the file finder can take up in relation to the available window width.", field: Box::new(SettingField { + org_override: None, json_path: Some("file_finder.modal_max_width"), pick: |settings_content| { settings_content @@ -3403,6 +3547,7 @@ fn search_and_files_page() -> SettingsPage { title: "Skip Focus For Active In Search", description: "Whether the file finder should skip focus for the active file in search results.", field: Box::new(SettingField { + org_override: None, json_path: Some("file_finder.skip_focus_for_active_in_search"), pick: |settings_content| { settings_content @@ -3432,6 +3577,7 @@ fn search_and_files_page() -> SettingsPage { description: "Files or globs of files that will be excluded by Zed entirely. They will be skipped during file scans, file searches, and not be displayed in the project file tree. Takes precedence over \"File Scan Inclusions\"", field: Box::new( SettingField { + org_override: None, json_path: Some("file_scan_exclusions"), pick: |settings_content| { settings_content @@ -3454,6 +3600,7 @@ fn search_and_files_page() -> SettingsPage { description: "Files or globs of files that will be included by Zed, even when ignored by git. This is useful for files that are not tracked by git, but are still important to your project. Note that globs that are overly broad can slow down Zed's file scanning. \"File Scan Exclusions\" takes precedence over these inclusions", field: Box::new( SettingField { + org_override: None, json_path: Some("file_scan_inclusions"), pick: |settings_content| { settings_content @@ -3490,6 +3637,7 @@ fn search_and_files_page() -> SettingsPage { title: "Restore File State", description: "Restore previous file state when reopening.", field: Box::new(SettingField { + org_override: None, json_path: Some("restore_on_file_reopen"), pick: |settings_content| { settings_content.workspace.restore_on_file_reopen.as_ref() @@ -3505,6 +3653,7 @@ fn search_and_files_page() -> SettingsPage { title: "Close on File Delete", description: "Automatically close files that have been deleted.", field: Box::new(SettingField { + org_override: None, json_path: Some("close_on_file_delete"), pick: |settings_content| { settings_content.workspace.close_on_file_delete.as_ref() @@ -3533,6 +3682,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Project Panel Button", description: "Show the project panel button in the status bar.", field: Box::new(SettingField { + org_override: None, json_path: Some("project_panel.button"), pick: |settings_content| { settings_content.project_panel.as_ref()?.button.as_ref() @@ -3551,6 +3701,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Active Language Button", description: "Show the active language button in the status bar.", field: Box::new(SettingField { + org_override: None, json_path: Some("status_bar.active_language_button"), pick: |settings_content| { settings_content @@ -3573,6 +3724,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Active Encoding Button", description: "Control when to show the active encoding in the status bar.", field: Box::new(SettingField { + org_override: None, json_path: Some("status_bar.active_encoding_button"), pick: |settings_content| { settings_content @@ -3595,6 +3747,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Cursor Position Button", description: "Show the cursor position button in the status bar.", field: Box::new(SettingField { + org_override: None, json_path: Some("status_bar.cursor_position_button"), pick: |settings_content| { settings_content @@ -3617,6 +3770,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Line Endings Button", description: "Show the active line endings button in the status bar.", field: Box::new(SettingField { + org_override: None, json_path: Some("status_bar.line_endings_button"), pick: |settings_content| { settings_content @@ -3639,6 +3793,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Terminal Button", description: "Show the terminal button in the status bar.", field: Box::new(SettingField { + org_override: None, json_path: Some("terminal.button"), pick: |settings_content| settings_content.terminal.as_ref()?.button.as_ref(), write: |settings_content, value, _| { @@ -3652,6 +3807,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Diagnostics Button", description: "Show the project diagnostics button in the status bar.", field: Box::new(SettingField { + org_override: None, json_path: Some("diagnostics.button"), pick: |settings_content| settings_content.diagnostics.as_ref()?.button.as_ref(), write: |settings_content, value, _| { @@ -3665,6 +3821,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Project Search Button", description: "Show the project search button in the status bar.", field: Box::new(SettingField { + org_override: None, json_path: Some("search.button"), pick: |settings_content| { settings_content.editor.search.as_ref()?.button.as_ref() @@ -3684,6 +3841,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Debugger Button", description: "Show the debugger button in the status bar.", field: Box::new(SettingField { + org_override: None, json_path: Some("debugger.button"), pick: |settings_content| settings_content.debugger.as_ref()?.button.as_ref(), write: |settings_content, value, _| { @@ -3697,6 +3855,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Active File Name", description: "Show the name of the active file in the status bar.", field: Box::new(SettingField { + org_override: None, json_path: Some("status_bar.show_active_file"), pick: |settings_content| { settings_content @@ -3725,6 +3884,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show Branch Status Icon", description: "Show git status indicators on the branch icon in the titlebar.", field: Box::new(SettingField { + org_override: None, json_path: Some("title_bar.show_branch_status_icon"), pick: |settings_content| { settings_content @@ -3747,6 +3907,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show Branch Name", description: "Show the branch name button in the titlebar.", field: Box::new(SettingField { + org_override: None, json_path: Some("title_bar.show_branch_name"), pick: |settings_content| { settings_content @@ -3769,6 +3930,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show Project Items", description: "Show the project host and name in the titlebar.", field: Box::new(SettingField { + org_override: None, json_path: Some("title_bar.show_project_items"), pick: |settings_content| { settings_content @@ -3791,6 +3953,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show Onboarding Banner", description: "Show banners announcing new features in the titlebar.", field: Box::new(SettingField { + org_override: None, json_path: Some("title_bar.show_onboarding_banner"), pick: |settings_content| { settings_content @@ -3813,6 +3976,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show Sign In", description: "Show the sign in button in the titlebar.", field: Box::new(SettingField { + org_override: None, json_path: Some("title_bar.show_sign_in"), pick: |settings_content| { settings_content.title_bar.as_ref()?.show_sign_in.as_ref() @@ -3831,6 +3995,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show User Menu", description: "Show the user menu button in the titlebar.", field: Box::new(SettingField { + org_override: None, json_path: Some("title_bar.show_user_menu"), pick: |settings_content| { settings_content.title_bar.as_ref()?.show_user_menu.as_ref() @@ -3849,6 +4014,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show User Picture", description: "Show user picture in the titlebar.", field: Box::new(SettingField { + org_override: None, json_path: Some("title_bar.show_user_picture"), pick: |settings_content| { settings_content @@ -3871,6 +4037,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show Menus", description: "Show the menus in the titlebar.", field: Box::new(SettingField { + org_override: None, json_path: Some("title_bar.show_menus"), pick: |settings_content| { settings_content.title_bar.as_ref()?.show_menus.as_ref() @@ -3892,6 +4059,7 @@ fn window_and_layout_page() -> SettingsPage { description: "(Linux only) choose how window control buttons are laid out in the titlebar.", field: Box::new(SettingField { + org_override: None, json_path: Some("title_bar.button_layout$"), pick: |settings_content| { Some( @@ -3972,6 +4140,7 @@ fn window_and_layout_page() -> SettingsPage { description: "GNOME-style layout string such as \"close:minimize,maximize\".", field: Box::new(SettingField { + org_override: None, json_path: Some("title_bar.button_layout"), pick: |settings_content| match settings_content .title_bar @@ -4011,6 +4180,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show Tab Bar", description: "Show the tab bar in the editor.", field: Box::new(SettingField { + org_override: None, json_path: Some("tab_bar.show"), pick: |settings_content| settings_content.tab_bar.as_ref()?.show.as_ref(), write: |settings_content, value, _| { @@ -4024,6 +4194,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show Git Status In Tabs", description: "Show the Git file status on a tab item.", field: Box::new(SettingField { + org_override: None, json_path: Some("tabs.git_status"), pick: |settings_content| settings_content.tabs.as_ref()?.git_status.as_ref(), write: |settings_content, value, _| { @@ -4037,6 +4208,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show File Icons In Tabs", description: "Show the file icon for a tab.", field: Box::new(SettingField { + org_override: None, json_path: Some("tabs.file_icons"), pick: |settings_content| settings_content.tabs.as_ref()?.file_icons.as_ref(), write: |settings_content, value, _| { @@ -4050,6 +4222,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Tab Close Position", description: "Position of the close button in a tab.", field: Box::new(SettingField { + org_override: None, json_path: Some("tabs.close_position"), pick: |settings_content| { settings_content.tabs.as_ref()?.close_position.as_ref() @@ -4069,6 +4242,7 @@ fn window_and_layout_page() -> SettingsPage { // is complex, so I'm going to come back to this later field: Box::new( SettingField { + org_override: None, json_path: Some("max_tabs"), pick: |settings_content| settings_content.workspace.max_tabs.as_ref(), write: |settings_content, value, _| { @@ -4083,6 +4257,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show Navigation History Buttons", description: "Show the navigation history buttons in the tab bar.", field: Box::new(SettingField { + org_override: None, json_path: Some("tab_bar.show_nav_history_buttons"), pick: |settings_content| { settings_content @@ -4105,6 +4280,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show Tab Bar Buttons", description: "Show the tab bar buttons (New, Split Pane, Zoom).", field: Box::new(SettingField { + org_override: None, json_path: Some("tab_bar.show_tab_bar_buttons"), pick: |settings_content| { settings_content @@ -4127,6 +4303,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Pinned Tabs Layout", description: "Show pinned tabs in a separate row above unpinned tabs.", field: Box::new(SettingField { + org_override: None, json_path: Some("tab_bar.show_pinned_tabs_in_separate_row"), pick: |settings_content| { settings_content @@ -4155,6 +4332,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Activate On Close", description: "What to do after closing the current tab.", field: Box::new(SettingField { + org_override: None, json_path: Some("tabs.activate_on_close"), pick: |settings_content| { settings_content.tabs.as_ref()?.activate_on_close.as_ref() @@ -4173,6 +4351,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Tab Show Diagnostics", description: "Which files containing diagnostic errors/warnings to mark in the tabs.", field: Box::new(SettingField { + org_override: None, json_path: Some("tabs.show_diagnostics"), pick: |settings_content| { settings_content.tabs.as_ref()?.show_diagnostics.as_ref() @@ -4191,6 +4370,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show Close Button", description: "Controls the appearance behavior of the tab's close button.", field: Box::new(SettingField { + org_override: None, json_path: Some("tabs.show_close_button"), pick: |settings_content| { settings_content.tabs.as_ref()?.show_close_button.as_ref() @@ -4215,6 +4395,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Preview Tabs Enabled", description: "Show opened editors as preview tabs.", field: Box::new(SettingField { + org_override: None, json_path: Some("preview_tabs.enabled"), pick: |settings_content| { settings_content.preview_tabs.as_ref()?.enabled.as_ref() @@ -4233,6 +4414,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Enable Preview From Project Panel", description: "Whether to open tabs in preview mode when opened from the project panel with a single click.", field: Box::new(SettingField { + org_override: None, json_path: Some("preview_tabs.enable_preview_from_project_panel"), pick: |settings_content| { settings_content @@ -4255,6 +4437,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Enable Preview From File Finder", description: "Whether to open tabs in preview mode when selected from the file finder.", field: Box::new(SettingField { + org_override: None, json_path: Some("preview_tabs.enable_preview_from_file_finder"), pick: |settings_content| { settings_content @@ -4277,6 +4460,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Enable Preview From Multibuffer", description: "Whether to open tabs in preview mode when opened from a multibuffer.", field: Box::new(SettingField { + org_override: None, json_path: Some("preview_tabs.enable_preview_from_multibuffer"), pick: |settings_content| { settings_content @@ -4299,6 +4483,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Enable Preview Multibuffer From Code Navigation", description: "Whether to open tabs in preview mode when code navigation is used to open a multibuffer.", field: Box::new(SettingField { + org_override: None, json_path: Some("preview_tabs.enable_preview_multibuffer_from_code_navigation"), pick: |settings_content| { settings_content @@ -4321,6 +4506,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Enable Preview File From Code Navigation", description: "Whether to open tabs in preview mode when code navigation is used to open a single file.", field: Box::new(SettingField { + org_override: None, json_path: Some("preview_tabs.enable_preview_file_from_code_navigation"), pick: |settings_content| { settings_content @@ -4343,6 +4529,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Enable Keep Preview On Code Navigation", description: "Whether to keep tabs in preview mode when code navigation is used to navigate away from them. If `enable_preview_file_from_code_navigation` or `enable_preview_multibuffer_from_code_navigation` is also true, the new tab may replace the existing one.", field: Box::new(SettingField { + org_override: None, json_path: Some("preview_tabs.enable_keep_preview_on_code_navigation"), pick: |settings_content| { settings_content @@ -4371,6 +4558,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Bottom Dock Layout", description: "Layout mode for the bottom dock.", field: Box::new(SettingField { + org_override: None, json_path: Some("bottom_dock_layout"), pick: |settings_content| settings_content.workspace.bottom_dock_layout.as_ref(), write: |settings_content, value, _| { @@ -4385,6 +4573,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Centered Layout Left Padding", description: "Left padding for centered layout.", field: Box::new(SettingField { + org_override: None, json_path: Some("centered_layout.left_padding"), pick: |settings_content| { settings_content @@ -4409,6 +4598,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Centered Layout Right Padding", description: "Right padding for centered layout.", field: Box::new(SettingField { + org_override: None, json_path: Some("centered_layout.right_padding"), pick: |settings_content| { settings_content @@ -4432,6 +4622,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Focus Follows Mouse", description: "Whether to change focus to a pane when the mouse hovers over it.", field: Box::new(SettingField { + org_override: None, json_path: Some("focus_follows_mouse.enabled"), pick: |settings_content| { settings_content @@ -4455,6 +4646,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Focus Follows Mouse Debounce ms", description: "Amount of time to wait before changing focus.", field: Box::new(SettingField { + org_override: None, json_path: Some("focus_follows_mouse.debounce_ms"), pick: |settings_content| { settings_content @@ -4485,6 +4677,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Use System Window Tabs", description: "(macOS only) whether to allow Windows to tab together.", field: Box::new(SettingField { + org_override: None, json_path: Some("use_system_window_tabs"), pick: |settings_content| { settings_content.workspace.use_system_window_tabs.as_ref() @@ -4500,6 +4693,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Window Decorations", description: "(Linux only) whether Zed or your compositor should draw window decorations.", field: Box::new(SettingField { + org_override: None, json_path: Some("window_decorations"), pick: |settings_content| settings_content.workspace.window_decorations.as_ref(), write: |settings_content, value, _| { @@ -4519,6 +4713,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Inactive Opacity", description: "Opacity of inactive panels (0.0 - 1.0).", field: Box::new(SettingField { + org_override: None, json_path: Some("active_pane_modifiers.inactive_opacity"), pick: |settings_content| { settings_content @@ -4543,6 +4738,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Border Size", description: "Size of the border surrounding the active pane.", field: Box::new(SettingField { + org_override: None, json_path: Some("active_pane_modifiers.border_size"), pick: |settings_content| { settings_content @@ -4567,6 +4763,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Zoomed Padding", description: "Show padding for zoomed panes.", field: Box::new(SettingField { + org_override: None, json_path: Some("zoomed_padding"), pick: |settings_content| settings_content.workspace.zoomed_padding.as_ref(), write: |settings_content, value, _| { @@ -4586,6 +4783,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Vertical Split Direction", description: "Direction to split vertically.", field: Box::new(SettingField { + org_override: None, json_path: Some("pane_split_direction_vertical"), pick: |settings_content| { settings_content @@ -4604,6 +4802,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Horizontal Split Direction", description: "Direction to split horizontally.", field: Box::new(SettingField { + org_override: None, json_path: Some("pane_split_direction_horizontal"), pick: |settings_content| { settings_content @@ -4645,6 +4844,7 @@ fn panels_page() -> SettingsPage { title: "Project Panel Dock", description: "Where to dock the project panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("project_panel.dock"), pick: |settings_content| settings_content.project_panel.as_ref()?.dock.as_ref(), write: |settings_content, value, _| { @@ -4658,6 +4858,7 @@ fn panels_page() -> SettingsPage { title: "Project Panel Default Width", description: "Default width of the project panel in pixels.", field: Box::new(SettingField { + org_override: None, json_path: Some("project_panel.default_width"), pick: |settings_content| { settings_content @@ -4680,6 +4881,7 @@ fn panels_page() -> SettingsPage { title: "Hide .gitignore", description: "Whether to hide the gitignore entries in the project panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("project_panel.hide_gitignore"), pick: |settings_content| { settings_content @@ -4702,6 +4904,7 @@ fn panels_page() -> SettingsPage { title: "Entry Spacing", description: "Spacing between worktree entries in the project panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("project_panel.entry_spacing"), pick: |settings_content| { settings_content @@ -4724,6 +4927,7 @@ fn panels_page() -> SettingsPage { title: "File Icons", description: "Show file icons in the project panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("project_panel.file_icons"), pick: |settings_content| { settings_content.project_panel.as_ref()?.file_icons.as_ref() @@ -4742,6 +4946,7 @@ fn panels_page() -> SettingsPage { title: "Folder Icons", description: "Whether to show folder icons or chevrons for directories in the project panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("project_panel.folder_icons"), pick: |settings_content| { settings_content @@ -4764,6 +4969,7 @@ fn panels_page() -> SettingsPage { title: "Git Status", description: "Show the Git status in the project panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("project_panel.git_status"), pick: |settings_content| { settings_content.project_panel.as_ref()?.git_status.as_ref() @@ -4782,6 +4988,7 @@ fn panels_page() -> SettingsPage { title: "Indent Size", description: "Amount of indentation for nested items.", field: Box::new(SettingField { + org_override: None, json_path: Some("project_panel.indent_size"), pick: |settings_content| { settings_content @@ -4804,6 +5011,7 @@ fn panels_page() -> SettingsPage { title: "Auto Reveal Entries", description: "Whether to reveal entries in the project panel automatically when a corresponding project entry becomes active.", field: Box::new(SettingField { + org_override: None, json_path: Some("project_panel.auto_reveal_entries"), pick: |settings_content| { settings_content @@ -4826,6 +5034,7 @@ fn panels_page() -> SettingsPage { title: "Starts Open", description: "Whether the project panel should open on startup.", field: Box::new(SettingField { + org_override: None, json_path: Some("project_panel.starts_open"), pick: |settings_content| { settings_content @@ -4848,6 +5057,7 @@ fn panels_page() -> SettingsPage { title: "Auto Fold Directories", description: "Whether to fold directories automatically and show compact folders when a directory has only one subdirectory inside.", field: Box::new(SettingField { + org_override: None, json_path: Some("project_panel.auto_fold_dirs"), pick: |settings_content| { settings_content @@ -4870,6 +5080,7 @@ fn panels_page() -> SettingsPage { title: "Bold Folder Labels", description: "Whether to show folder names with bold text in the project panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("project_panel.bold_folder_labels"), pick: |settings_content| { settings_content @@ -4892,6 +5103,7 @@ fn panels_page() -> SettingsPage { title: "Show Scrollbar", description: "Show the scrollbar in the project panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("project_panel.scrollbar.show"), pick: |settings_content| { show_scrollbar_or_editor(settings_content, |settings_content| { @@ -4920,6 +5132,7 @@ fn panels_page() -> SettingsPage { title: "Horizontal Scroll", description: "Whether to allow horizontal scrolling in the project panel. When disabled, the view is always locked to the leftmost position and long file names are clipped.", field: Box::new(SettingField { + org_override: None, json_path: Some("project_panel.scrollbar.horizontal_scroll"), pick: |settings_content| { settings_content @@ -4946,6 +5159,7 @@ fn panels_page() -> SettingsPage { title: "Show Diagnostics", description: "Which files containing diagnostic errors/warnings to mark in the project panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("project_panel.show_diagnostics"), pick: |settings_content| { settings_content @@ -4968,6 +5182,7 @@ fn panels_page() -> SettingsPage { title: "Diagnostic Badges", description: "Show error and warning count badges next to file names in the project panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("project_panel.diagnostic_badges"), pick: |settings_content| { settings_content @@ -4990,6 +5205,7 @@ fn panels_page() -> SettingsPage { title: "Git Status Indicator", description: "Show a git status indicator next to file names in the project panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("project_panel.git_status_indicator"), pick: |settings_content| { settings_content @@ -5012,6 +5228,7 @@ fn panels_page() -> SettingsPage { title: "Sticky Scroll", description: "Whether to stick parent directories at top of the project panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("project_panel.sticky_scroll"), pick: |settings_content| { settings_content @@ -5035,6 +5252,7 @@ fn panels_page() -> SettingsPage { title: "Show Indent Guides", description: "Show indent guides in the project panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("project_panel.indent_guides.show"), pick: |settings_content| { settings_content @@ -5060,6 +5278,7 @@ fn panels_page() -> SettingsPage { title: "Drag and Drop", description: "Whether to enable drag-and-drop operations in the project panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("project_panel.drag_and_drop"), pick: |settings_content| { settings_content @@ -5082,6 +5301,7 @@ fn panels_page() -> SettingsPage { title: "Hide Root", description: "Whether to hide the root entry when only one folder is open in the window.", field: Box::new(SettingField { + org_override: None, json_path: Some("project_panel.hide_root"), pick: |settings_content| { settings_content.project_panel.as_ref()?.hide_root.as_ref() @@ -5100,6 +5320,7 @@ fn panels_page() -> SettingsPage { title: "Hide Hidden", description: "Whether to hide the hidden entries in the project panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("project_panel.hide_hidden"), pick: |settings_content| { settings_content @@ -5122,6 +5343,7 @@ fn panels_page() -> SettingsPage { title: "Sort Mode", description: "Sort order for entries in the project panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("project_panel.sort_mode"), pick: |settings_content| { settings_content.project_panel.as_ref()?.sort_mode.as_ref() @@ -5140,6 +5362,7 @@ fn panels_page() -> SettingsPage { title: "Sort Order", description: "Whether to sort file and folder names case-sensitively in the project panel.", field: Box::new(SettingField { + org_override: None, pick: |settings_content| { settings_content.project_panel.as_ref()?.sort_order.as_ref() }, @@ -5158,6 +5381,7 @@ fn panels_page() -> SettingsPage { title: "Auto Open Files On Create", description: "Whether to automatically open newly created files in the editor.", field: Box::new(SettingField { + org_override: None, json_path: Some("project_panel.auto_open.on_create"), pick: |settings_content| { settings_content @@ -5184,6 +5408,7 @@ fn panels_page() -> SettingsPage { title: "Auto Open Files On Paste", description: "Whether to automatically open files after pasting or duplicating them.", field: Box::new(SettingField { + org_override: None, json_path: Some("project_panel.auto_open.on_paste"), pick: |settings_content| { settings_content @@ -5210,6 +5435,7 @@ fn panels_page() -> SettingsPage { title: "Auto Open Files On Drop", description: "Whether to automatically open files dropped from external sources.", field: Box::new(SettingField { + org_override: None, json_path: Some("project_panel.auto_open.on_drop"), pick: |settings_content| { settings_content @@ -5237,6 +5463,7 @@ fn panels_page() -> SettingsPage { description: "Globs to match files that will be considered \"hidden\" and can be hidden from the project panel.", field: Box::new( SettingField { + org_override: None, json_path: Some("worktree.hidden_files"), pick: |settings_content| { settings_content.project.worktree.hidden_files.as_ref() @@ -5260,6 +5487,7 @@ fn panels_page() -> SettingsPage { title: "Terminal Dock", description: "Where to dock the terminal panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("terminal.dock"), pick: |settings_content| settings_content.terminal.as_ref()?.dock.as_ref(), write: |settings_content, value, _| { @@ -5273,6 +5501,7 @@ fn panels_page() -> SettingsPage { title: "Terminal Panel Flexible Sizing", description: "Whether the terminal panel should use flexible (proportional) sizing when docked to the left or right.", field: Box::new(SettingField { + org_override: None, json_path: Some("terminal.flexible"), pick: |settings_content| settings_content.terminal.as_ref()?.flexible.as_ref(), write: |settings_content, value, _| { @@ -5286,6 +5515,7 @@ fn panels_page() -> SettingsPage { title: "Show Count Badge", description: "Show a badge on the terminal panel icon with the count of open terminals.", field: Box::new(SettingField { + org_override: None, json_path: Some("terminal.show_count_badge"), pick: |settings_content| { settings_content @@ -5314,6 +5544,7 @@ fn panels_page() -> SettingsPage { title: "Outline Panel Button", description: "Show the outline panel button in the status bar.", field: Box::new(SettingField { + org_override: None, json_path: Some("outline_panel.button"), pick: |settings_content| { settings_content.outline_panel.as_ref()?.button.as_ref() @@ -5332,6 +5563,7 @@ fn panels_page() -> SettingsPage { title: "Outline Panel Dock", description: "Where to dock the outline panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("outline_panel.dock"), pick: |settings_content| settings_content.outline_panel.as_ref()?.dock.as_ref(), write: |settings_content, value, _| { @@ -5345,6 +5577,7 @@ fn panels_page() -> SettingsPage { title: "Outline Panel Default Width", description: "Default width of the outline panel in pixels.", field: Box::new(SettingField { + org_override: None, json_path: Some("outline_panel.default_width"), pick: |settings_content| { settings_content @@ -5367,6 +5600,7 @@ fn panels_page() -> SettingsPage { title: "File Icons", description: "Show file icons in the outline panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("outline_panel.file_icons"), pick: |settings_content| { settings_content.outline_panel.as_ref()?.file_icons.as_ref() @@ -5385,6 +5619,7 @@ fn panels_page() -> SettingsPage { title: "Folder Icons", description: "Whether to show folder icons or chevrons for directories in the outline panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("outline_panel.folder_icons"), pick: |settings_content| { settings_content @@ -5407,6 +5642,7 @@ fn panels_page() -> SettingsPage { title: "Git Status", description: "Show the Git status in the outline panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("outline_panel.git_status"), pick: |settings_content| { settings_content.outline_panel.as_ref()?.git_status.as_ref() @@ -5425,6 +5661,7 @@ fn panels_page() -> SettingsPage { title: "Indent Size", description: "Amount of indentation for nested items.", field: Box::new(SettingField { + org_override: None, json_path: Some("outline_panel.indent_size"), pick: |settings_content| { settings_content @@ -5447,6 +5684,7 @@ fn panels_page() -> SettingsPage { title: "Auto Reveal Entries", description: "Whether to reveal when a corresponding outline entry becomes active.", field: Box::new(SettingField { + org_override: None, json_path: Some("outline_panel.auto_reveal_entries"), pick: |settings_content| { settings_content @@ -5469,6 +5707,7 @@ fn panels_page() -> SettingsPage { title: "Auto Fold Directories", description: "Whether to fold directories automatically when a directory contains only one subdirectory.", field: Box::new(SettingField { + org_override: None, json_path: Some("outline_panel.auto_fold_dirs"), pick: |settings_content| { settings_content @@ -5492,6 +5731,7 @@ fn panels_page() -> SettingsPage { title: "Show Indent Guides", description: "When to show indent guides in the outline panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("outline_panel.indent_guides.show"), pick: |settings_content| { settings_content @@ -5523,6 +5763,7 @@ fn panels_page() -> SettingsPage { title: "Git Panel Button", description: "Show the Git panel button in the status bar.", field: Box::new(SettingField { + org_override: None, json_path: Some("git_panel.button"), pick: |settings_content| settings_content.git_panel.as_ref()?.button.as_ref(), write: |settings_content, value, _| { @@ -5536,6 +5777,7 @@ fn panels_page() -> SettingsPage { title: "Git Panel Dock", description: "Where to dock the Git panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("git_panel.dock"), pick: |settings_content| settings_content.git_panel.as_ref()?.dock.as_ref(), write: |settings_content, value, _| { @@ -5549,6 +5791,7 @@ fn panels_page() -> SettingsPage { title: "Git Panel Default Width", description: "Default width of the Git panel in pixels.", field: Box::new(SettingField { + org_override: None, json_path: Some("git_panel.default_width"), pick: |settings_content| { settings_content.git_panel.as_ref()?.default_width.as_ref() @@ -5567,6 +5810,7 @@ fn panels_page() -> SettingsPage { title: "Git Panel Status Style", description: "How entry statuses are displayed.", field: Box::new(SettingField { + org_override: None, json_path: Some("git_panel.status_style"), pick: |settings_content| { settings_content.git_panel.as_ref()?.status_style.as_ref() @@ -5585,6 +5829,7 @@ fn panels_page() -> SettingsPage { title: "Fallback Branch Name", description: "Default branch name will be when init.defaultbranch is not set in Git.", field: Box::new(SettingField { + org_override: None, json_path: Some("git_panel.fallback_branch_name"), pick: |settings_content| { settings_content @@ -5607,6 +5852,7 @@ fn panels_page() -> SettingsPage { title: "Sort By Path", description: "Enable to sort entries in the panel by path, disable to sort by status.", field: Box::new(SettingField { + org_override: None, json_path: Some("git_panel.sort_by_path"), pick: |settings_content| { settings_content.git_panel.as_ref()?.sort_by_path.as_ref() @@ -5625,6 +5871,7 @@ fn panels_page() -> SettingsPage { title: "Collapse Untracked Diff", description: "Whether to collapse untracked files in the diff panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("git_panel.collapse_untracked_diff"), pick: |settings_content| { settings_content @@ -5647,6 +5894,7 @@ fn panels_page() -> SettingsPage { title: "Tree View", description: "Enable to show entries in tree view list, disable to show in flat view list.", field: Box::new(SettingField { + org_override: None, json_path: Some("git_panel.tree_view"), pick: |settings_content| { settings_content.git_panel.as_ref()?.tree_view.as_ref() @@ -5662,6 +5910,7 @@ fn panels_page() -> SettingsPage { title: "File Icons", description: "Show file icons next to the Git status icon.", field: Box::new(SettingField { + org_override: None, json_path: Some("git_panel.file_icons"), pick: |settings_content| { settings_content.git_panel.as_ref()?.file_icons.as_ref() @@ -5680,6 +5929,7 @@ fn panels_page() -> SettingsPage { title: "Folder Icons", description: "Whether to show folder icons or chevrons for directories in the git panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("git_panel.folder_icons"), pick: |settings_content| { settings_content.git_panel.as_ref()?.folder_icons.as_ref() @@ -5698,6 +5948,7 @@ fn panels_page() -> SettingsPage { title: "Diff Stats", description: "Whether to show the addition/deletion change count next to each file in the Git panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("git_panel.diff_stats"), pick: |settings_content| { settings_content.git_panel.as_ref()?.diff_stats.as_ref() @@ -5716,6 +5967,7 @@ fn panels_page() -> SettingsPage { title: "Show Count Badge", description: "Whether to show a badge on the git panel icon with the count of uncommitted changes.", field: Box::new(SettingField { + org_override: None, json_path: Some("git_panel.show_count_badge"), pick: |settings_content| { settings_content @@ -5738,6 +5990,7 @@ fn panels_page() -> SettingsPage { title: "Commit Title Max Length", description: "Maximum length of the commit message title before a warning is shown. Set to 0 to disable.", field: Box::new(SettingField { + org_override: None, json_path: Some("git_panel.commit_title_max_length"), pick: |settings_content| { settings_content @@ -5760,6 +6013,7 @@ fn panels_page() -> SettingsPage { title: "Scroll Bar", description: "How and when the scrollbar should be displayed.", field: Box::new(SettingField { + org_override: None, json_path: Some("git_panel.scrollbar.show"), pick: |settings_content| { show_scrollbar_or_editor(settings_content, |settings_content| { @@ -5794,6 +6048,7 @@ fn panels_page() -> SettingsPage { title: "Debugger Panel Dock", description: "The dock position of the debug panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("debugger.dock"), pick: |settings_content| settings_content.debugger.as_ref()?.dock.as_ref(), write: |settings_content, value, _| { @@ -5813,6 +6068,7 @@ fn panels_page() -> SettingsPage { title: "Collaboration Panel Button", description: "Show the collaboration panel button in the status bar.", field: Box::new(SettingField { + org_override: None, json_path: Some("collaboration_panel.button"), pick: |settings_content| { settings_content @@ -5835,6 +6091,7 @@ fn panels_page() -> SettingsPage { title: "Collaboration Panel Dock", description: "Where to dock the collaboration panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("collaboration_panel.dock"), pick: |settings_content| { settings_content.collaboration_panel.as_ref()?.dock.as_ref() @@ -5853,6 +6110,7 @@ fn panels_page() -> SettingsPage { title: "Collaboration Panel Default Width", description: "Default width of the collaboration panel in pixels.", field: Box::new(SettingField { + org_override: None, json_path: Some("collaboration_panel.dock"), pick: |settings_content| { settings_content @@ -5881,6 +6139,7 @@ fn panels_page() -> SettingsPage { title: "Agent Panel Button", description: "Whether to show the agent panel button in the status bar.", field: Box::new(SettingField { + org_override: None, json_path: Some("agent.button"), pick: |settings_content| settings_content.agent.as_ref()?.button.as_ref(), write: |settings_content, value, _| { @@ -5894,6 +6153,7 @@ fn panels_page() -> SettingsPage { title: "Agent Panel Dock", description: "Where to dock the agent panel.", field: Box::new(SettingField { + org_override: None, json_path: Some("agent.dock"), pick: |settings_content| settings_content.agent.as_ref()?.dock.as_ref(), write: |settings_content, value, _| { @@ -5907,6 +6167,7 @@ fn panels_page() -> SettingsPage { title: "Agent Panel Flexible Sizing", description: "Whether the agent panel should use flexible (proportional) sizing when docked to the left or right.", field: Box::new(SettingField { + org_override: None, json_path: Some("agent.flexible"), pick: |settings_content| settings_content.agent.as_ref()?.flexible.as_ref(), write: |settings_content, value, _| { @@ -5920,6 +6181,7 @@ fn panels_page() -> SettingsPage { title: "Agent Panel Default Width", description: "Default width when the agent panel is docked to the left or right.", field: Box::new(SettingField { + org_override: None, json_path: Some("agent.default_width"), pick: |settings_content| { settings_content.agent.as_ref()?.default_width.as_ref() @@ -5935,6 +6197,7 @@ fn panels_page() -> SettingsPage { title: "Agent Panel Default Height", description: "Default height when the agent panel is docked to the bottom.", field: Box::new(SettingField { + org_override: None, json_path: Some("agent.default_height"), pick: |settings_content| { settings_content.agent.as_ref()?.default_height.as_ref() @@ -5955,6 +6218,7 @@ fn panels_page() -> SettingsPage { title: "Limit Content Width", description: "Whether to constrain the agent panel content to a maximum width, centering it when the panel is wider, for optimal readability.", field: Box::new(SettingField:: { + org_override: None, json_path: Some("agent.limit_content_width"), pick: |settings_content| { settings_content @@ -5987,6 +6251,7 @@ fn panels_page() -> SettingsPage { title: "Max Content Width", description: "Maximum content width in pixels. Content will be centered when the panel is wider than this value.", field: Box::new(SettingField { + org_override: None, json_path: Some("agent.max_content_width"), pick: |settings_content| { settings_content.agent.as_ref()?.max_content_width.as_ref() @@ -6027,6 +6292,7 @@ fn debugger_page() -> SettingsPage { title: "Stepping Granularity", description: "Determines the stepping granularity for debug operations.", field: Box::new(SettingField { + org_override: None, json_path: Some("debugger.stepping_granularity"), pick: |settings_content| { settings_content @@ -6049,6 +6315,7 @@ fn debugger_page() -> SettingsPage { title: "Save Breakpoints", description: "Whether breakpoints should be reused across Zed sessions.", field: Box::new(SettingField { + org_override: None, json_path: Some("debugger.save_breakpoints"), pick: |settings_content| { settings_content @@ -6071,6 +6338,7 @@ fn debugger_page() -> SettingsPage { title: "Timeout", description: "Time in milliseconds until timeout error when connecting to a TCP debug adapter.", field: Box::new(SettingField { + org_override: None, json_path: Some("debugger.timeout"), pick: |settings_content| settings_content.debugger.as_ref()?.timeout.as_ref(), write: |settings_content, value, _| { @@ -6084,6 +6352,7 @@ fn debugger_page() -> SettingsPage { title: "Log DAP Communications", description: "Whether to log messages between active debug adapters and Zed.", field: Box::new(SettingField { + org_override: None, json_path: Some("debugger.log_dap_communications"), pick: |settings_content| { settings_content @@ -6106,6 +6375,7 @@ fn debugger_page() -> SettingsPage { title: "Format DAP Log Messages", description: "Whether to format DAP messages when adding them to debug adapter logger.", field: Box::new(SettingField { + org_override: None, json_path: Some("debugger.format_dap_log_messages"), pick: |settings_content| { settings_content @@ -6143,6 +6413,7 @@ fn terminal_page() -> SettingsPage { title: "Shell", description: "What shell to use when opening a terminal.", field: Box::new(SettingField { + org_override: None, json_path: Some("terminal.shell$"), pick: |settings_content| { Some(&dynamic_variants::()[ @@ -6224,6 +6495,7 @@ fn terminal_page() -> SettingsPage { title: "Program", description: "The shell program to use.", field: Box::new(SettingField { + org_override: None, json_path: Some("terminal.shell"), pick: |settings_content| match settings_content.terminal.as_ref()?.project.shell.as_ref() { @@ -6254,6 +6526,7 @@ fn terminal_page() -> SettingsPage { title: "Program", description: "The shell program to run.", field: Box::new(SettingField { + org_override: None, json_path: Some("terminal.shell.program"), pick: |settings_content| { match settings_content.terminal.as_ref()?.project.shell.as_ref() { @@ -6287,6 +6560,7 @@ fn terminal_page() -> SettingsPage { description: "The arguments to pass to the shell program.", field: Box::new( SettingField { + org_override: None, json_path: Some("terminal.shell.args"), pick: |settings_content| { match settings_content.terminal.as_ref()?.project.shell.as_ref() { @@ -6319,6 +6593,7 @@ fn terminal_page() -> SettingsPage { title: "Title Override", description: "An optional string to override the title of the terminal tab.", field: Box::new(SettingField { + org_override: None, json_path: Some("terminal.shell.title_override"), pick: |settings_content| { match settings_content.terminal.as_ref()?.project.shell.as_ref() { @@ -6355,6 +6630,7 @@ fn terminal_page() -> SettingsPage { title: "Working Directory", description: "What working directory to use when launching the terminal.", field: Box::new(SettingField { + org_override: None, json_path: Some("terminal.working_directory$"), pick: |settings_content| { Some(&dynamic_variants::()[ @@ -6428,6 +6704,7 @@ fn terminal_page() -> SettingsPage { title: "Directory", description: "The directory path to use (will be shell expanded).", field: Box::new(SettingField { + org_override: None, json_path: Some("terminal.working_directory.always"), pick: |settings_content| { match settings_content.terminal.as_ref()?.project.working_directory.as_ref() { @@ -6459,6 +6736,7 @@ fn terminal_page() -> SettingsPage { description: "Key-value pairs to add to the terminal's environment.", field: Box::new( SettingField { + org_override: None, json_path: Some("terminal.env"), pick: |settings_content| settings_content.terminal.as_ref()?.project.env.as_ref(), write: |settings_content, value, _| { @@ -6475,6 +6753,7 @@ fn terminal_page() -> SettingsPage { description: "Activates the Python virtual environment, if one is found, in the terminal's working directory.", field: Box::new( SettingField { + org_override: None, json_path: Some("terminal.detect_venv"), pick: |settings_content| settings_content.terminal.as_ref()?.project.detect_venv.as_ref(), write: |settings_content, value, _| { @@ -6500,6 +6779,7 @@ fn terminal_page() -> SettingsPage { title: "Font Size", description: "Font size for terminal text. If not set, defaults to buffer font size.", field: Box::new(SettingField { + org_override: None, json_path: Some("terminal.font_size"), pick: |settings_content| { settings_content @@ -6519,6 +6799,7 @@ fn terminal_page() -> SettingsPage { title: "Font Family", description: "Font family for terminal text. If not set, defaults to buffer font family.", field: Box::new(SettingField { + org_override: None, json_path: Some("terminal.font_family"), pick: |settings_content| { settings_content @@ -6542,6 +6823,7 @@ fn terminal_page() -> SettingsPage { description: "Font fallbacks for terminal text. If not set, defaults to buffer font fallbacks.", field: Box::new( SettingField { + org_override: None, json_path: Some("terminal.font_fallbacks"), pick: |settings_content| { settings_content @@ -6566,6 +6848,7 @@ fn terminal_page() -> SettingsPage { title: "Font Weight", description: "Font weight for terminal text in CSS weight units (100-900).", field: Box::new(SettingField { + org_override: None, json_path: Some("terminal.font_weight"), pick: |settings_content| { settings_content.terminal.as_ref()?.font_weight.as_ref() @@ -6585,6 +6868,7 @@ fn terminal_page() -> SettingsPage { description: "Font features for terminal text.", field: Box::new( SettingField { + org_override: None, json_path: Some("terminal.font_features"), pick: |settings_content| { settings_content @@ -6616,6 +6900,7 @@ fn terminal_page() -> SettingsPage { description: "Line height for terminal text.", field: Box::new( SettingField { + org_override: None, json_path: Some("terminal.line_height"), pick: |settings_content| { settings_content.terminal.as_ref()?.line_height.as_ref() @@ -6636,6 +6921,7 @@ fn terminal_page() -> SettingsPage { title: "Cursor Shape", description: "Default cursor shape for the terminal (bar, block, underline, or hollow).", field: Box::new(SettingField { + org_override: None, json_path: Some("terminal.cursor_shape"), pick: |settings_content| { settings_content.terminal.as_ref()?.cursor_shape.as_ref() @@ -6654,6 +6940,7 @@ fn terminal_page() -> SettingsPage { title: "Cursor Blinking", description: "Sets the cursor blinking behavior in the terminal.", field: Box::new(SettingField { + org_override: None, json_path: Some("terminal.blinking"), pick: |settings_content| settings_content.terminal.as_ref()?.blinking.as_ref(), write: |settings_content, value, _| { @@ -6667,6 +6954,7 @@ fn terminal_page() -> SettingsPage { title: "Alternate Scroll", description: "Whether alternate scroll mode is active by default (converts mouse scroll to arrow keys in apps like Vim).", field: Box::new(SettingField { + org_override: None, json_path: Some("terminal.alternate_scroll"), pick: |settings_content| { settings_content @@ -6689,6 +6977,7 @@ fn terminal_page() -> SettingsPage { title: "Minimum Contrast", description: "The minimum APCA perceptual contrast between foreground and background colors (0-106).", field: Box::new(SettingField { + org_override: None, json_path: Some("terminal.minimum_contrast"), pick: |settings_content| { settings_content @@ -6717,6 +7006,7 @@ fn terminal_page() -> SettingsPage { title: "Option As Meta", description: "Whether the option key behaves as the meta key.", field: Box::new(SettingField { + org_override: None, json_path: Some("terminal.option_as_meta"), pick: |settings_content| { settings_content.terminal.as_ref()?.option_as_meta.as_ref() @@ -6735,6 +7025,7 @@ fn terminal_page() -> SettingsPage { title: "Copy On Select", description: "Whether selecting text in the terminal automatically copies to the system clipboard.", field: Box::new(SettingField { + org_override: None, json_path: Some("terminal.copy_on_select"), pick: |settings_content| { settings_content.terminal.as_ref()?.copy_on_select.as_ref() @@ -6753,6 +7044,7 @@ fn terminal_page() -> SettingsPage { title: "Keep Selection On Copy", description: "Whether to keep the text selection after copying it to the clipboard.", field: Box::new(SettingField { + org_override: None, json_path: Some("terminal.keep_selection_on_copy"), pick: |settings_content| { settings_content @@ -6775,6 +7067,7 @@ fn terminal_page() -> SettingsPage { title: "Audible Bell", description: "Whether to play a sound when the BEL character (`\\a`, `0x07`) is printed", field: Box::new(SettingField { + org_override: None, json_path: Some("terminal.bell"), pick: |settings_content| settings_content.terminal.as_ref()?.bell.as_ref(), write: |settings_content, value, _| { @@ -6794,6 +7087,7 @@ fn terminal_page() -> SettingsPage { title: "Default Width", description: "Default width when the terminal is docked to the left or right (in pixels).", field: Box::new(SettingField { + org_override: None, json_path: Some("terminal.default_width"), pick: |settings_content| { settings_content.terminal.as_ref()?.default_width.as_ref() @@ -6812,6 +7106,7 @@ fn terminal_page() -> SettingsPage { title: "Default Height", description: "Default height when the terminal is docked to the bottom (in pixels).", field: Box::new(SettingField { + org_override: None, json_path: Some("terminal.default_height"), pick: |settings_content| { settings_content.terminal.as_ref()?.default_height.as_ref() @@ -6836,6 +7131,7 @@ fn terminal_page() -> SettingsPage { title: "Max Scroll History Lines", description: "Maximum number of lines to keep in scrollback history (max: 100,000; 0 disables scrolling).", field: Box::new(SettingField { + org_override: None, json_path: Some("terminal.max_scroll_history_lines"), pick: |settings_content| { settings_content @@ -6858,6 +7154,7 @@ fn terminal_page() -> SettingsPage { title: "Scroll Multiplier", description: "The multiplier for scrolling in the terminal with the mouse wheel", field: Box::new(SettingField { + org_override: None, json_path: Some("terminal.scroll_multiplier"), pick: |settings_content| { settings_content @@ -6886,6 +7183,7 @@ fn terminal_page() -> SettingsPage { title: "Breadcrumbs", description: "Display the terminal title in breadcrumbs inside the terminal pane.", field: Box::new(SettingField { + org_override: None, json_path: Some("terminal.toolbar.breadcrumbs"), pick: |settings_content| { settings_content @@ -6918,6 +7216,7 @@ fn terminal_page() -> SettingsPage { title: "Show Scrollbar", description: "When to show the scrollbar in the terminal.", field: Box::new(SettingField { + org_override: None, json_path: Some("terminal.scrollbar.show"), pick: |settings_content| { show_scrollbar_or_editor(settings_content, |settings_content| { @@ -6970,6 +7269,7 @@ fn version_control_page() -> SettingsPage { title: "Disable Git Integration", description: "Disable all Git integration features in Zed.", field: Box::new(SettingField:: { + org_override: None, json_path: Some("git.disable_git"), pick: |settings_content| { settings_content @@ -7009,6 +7309,7 @@ fn version_control_page() -> SettingsPage { title: "Enable Git Status", description: "Show Git status information in the editor.", field: Box::new(SettingField:: { + org_override: None, json_path: Some("git.enable_status"), pick: |settings_content| { settings_content @@ -7035,6 +7336,7 @@ fn version_control_page() -> SettingsPage { title: "Enable Git Diff", description: "Show Git diff information in the editor.", field: Box::new(SettingField:: { + org_override: None, json_path: Some("git.enable_diff"), pick: |settings_content| { settings_content @@ -7069,6 +7371,7 @@ fn version_control_page() -> SettingsPage { title: "Visibility", description: "Control whether Git status is shown in the editor's gutter.", field: Box::new(SettingField { + org_override: None, json_path: Some("git.git_gutter"), pick: |settings_content| settings_content.git.as_ref()?.git_gutter.as_ref(), write: |settings_content, value, _| { @@ -7083,6 +7386,7 @@ fn version_control_page() -> SettingsPage { title: "Debounce", description: "Debounce threshold in milliseconds after which changes are reflected in the Git gutter.", field: Box::new(SettingField { + org_override: None, json_path: Some("git.gutter_debounce"), pick: |settings_content| { settings_content.git.as_ref()?.gutter_debounce.as_ref() @@ -7104,6 +7408,7 @@ fn version_control_page() -> SettingsPage { title: "Enabled", description: "Whether or not to show Git blame data inline in the currently focused line.", field: Box::new(SettingField { + org_override: None, json_path: Some("git.inline_blame.enabled"), pick: |settings_content| { settings_content @@ -7130,6 +7435,7 @@ fn version_control_page() -> SettingsPage { title: "Delay", description: "The delay after which the inline blame information is shown.", field: Box::new(SettingField { + org_override: None, json_path: Some("git.inline_blame.delay_ms"), pick: |settings_content| { settings_content @@ -7156,6 +7462,7 @@ fn version_control_page() -> SettingsPage { title: "Padding", description: "Padding between the end of the source line and the start of the inline blame in columns.", field: Box::new(SettingField { + org_override: None, json_path: Some("git.inline_blame.padding"), pick: |settings_content| { settings_content @@ -7182,6 +7489,7 @@ fn version_control_page() -> SettingsPage { title: "Minimum Column", description: "The minimum column number at which to show the inline blame information.", field: Box::new(SettingField { + org_override: None, json_path: Some("git.inline_blame.min_column"), pick: |settings_content| { settings_content @@ -7208,6 +7516,7 @@ fn version_control_page() -> SettingsPage { title: "Show Commit Summary", description: "Show commit summary as part of the inline blame.", field: Box::new(SettingField { + org_override: None, json_path: Some("git.inline_blame.show_commit_summary"), pick: |settings_content| { settings_content @@ -7240,6 +7549,7 @@ fn version_control_page() -> SettingsPage { title: "Show Avatar", description: "Show the avatar of the author of the commit.", field: Box::new(SettingField { + org_override: None, json_path: Some("git.blame.show_avatar"), pick: |settings_content| { settings_content @@ -7272,6 +7582,7 @@ fn version_control_page() -> SettingsPage { title: "Show Author Name", description: "Show author name as part of the commit information in branch picker.", field: Box::new(SettingField { + org_override: None, json_path: Some("git.branch_picker.show_author_name"), pick: |settings_content| { settings_content @@ -7304,6 +7615,7 @@ fn version_control_page() -> SettingsPage { title: "Hunk Style", description: "How Git hunks are displayed visually in the editor.", field: Box::new(SettingField { + org_override: None, json_path: Some("git.hunk_style"), pick: |settings_content| settings_content.git.as_ref()?.hunk_style.as_ref(), write: |settings_content, value, _| { @@ -7317,6 +7629,7 @@ fn version_control_page() -> SettingsPage { title: "Path Style", description: "Should the name or path be displayed first in the git view.", field: Box::new(SettingField { + org_override: None, json_path: Some("git.path_style"), pick: |settings_content| settings_content.git.as_ref()?.path_style.as_ref(), write: |settings_content, value, _| { @@ -7330,6 +7643,7 @@ fn version_control_page() -> SettingsPage { title: "Show Stage/Restore Buttons", description: "Whether to show the stage and restore buttons on diff hunks.", field: Box::new(SettingField { + org_override: None, json_path: Some("git.show_stage_restore_buttons"), pick: |settings_content| { settings_content @@ -7372,6 +7686,7 @@ fn collaboration_page() -> SettingsPage { title: "Mute On Join", description: "Whether the microphone should be muted when joining a channel or a call.", field: Box::new(SettingField { + org_override: None, json_path: Some("calls.mute_on_join"), pick: |settings_content| settings_content.calls.as_ref()?.mute_on_join.as_ref(), write: |settings_content, value, _| { @@ -7385,6 +7700,7 @@ fn collaboration_page() -> SettingsPage { title: "Share On Join", description: "Whether your current project should be shared when joining an empty channel.", field: Box::new(SettingField { + org_override: None, json_path: Some("calls.share_on_join"), pick: |settings_content| { settings_content.calls.as_ref()?.share_on_join.as_ref() @@ -7414,6 +7730,7 @@ fn collaboration_page() -> SettingsPage { title: "Output Audio Device", description: "Select output audio device", field: Box::new(SettingField { + org_override: None, json_path: Some("audio.experimental.output_audio_device"), pick: |settings_content| { settings_content @@ -7437,6 +7754,7 @@ fn collaboration_page() -> SettingsPage { title: "Input Audio Device", description: "Select input audio device", field: Box::new(SettingField { + org_override: None, json_path: Some("audio.experimental.input_audio_device"), pick: |settings_content| { settings_content @@ -7473,6 +7791,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Disable AI", description: "Whether to disable all AI features in Zed.", field: Box::new(SettingField { + org_override: None, json_path: Some("disable_ai"), pick: |settings_content| settings_content.project.disable_ai.as_ref(), write: |settings_content, value, _| { @@ -7486,6 +7805,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Threads Sidebar Side", description: "Which side of the window the threads sidebar appears on.", field: Box::new(SettingField { + org_override: None, json_path: Some("agent.sidebar_side"), pick: |settings_content| settings_content.agent.as_ref()?.sidebar_side.as_ref(), write: |settings_content, value, _| { @@ -7526,6 +7846,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Single File Review", description: "When enabled, agent edits will also be displayed in single-file buffers for review.", field: Box::new(SettingField { + org_override: None, json_path: Some("agent.single_file_review"), pick: |settings_content| { settings_content.agent.as_ref()?.single_file_review.as_ref() @@ -7544,6 +7865,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Enable Feedback", description: "Show voting thumbs up/down icon buttons for feedback on agent edits.", field: Box::new(SettingField { + org_override: None, json_path: Some("agent.enable_feedback"), pick: |settings_content| { settings_content.agent.as_ref()?.enable_feedback.as_ref() @@ -7562,6 +7884,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Notify When Agent Waiting", description: "Where to show notifications when the agent has completed its response or needs confirmation before running a tool action.", field: Box::new(SettingField { + org_override: None, json_path: Some("agent.notify_when_agent_waiting"), pick: |settings_content| { settings_content @@ -7584,6 +7907,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Play Sound When Agent Done", description: "When to play a sound when the agent has either completed its response, or needs user input.", field: Box::new(SettingField { + org_override: None, json_path: Some("agent.play_sound_when_agent_done"), pick: |settings_content| { settings_content @@ -7606,6 +7930,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Expand Edit Card", description: "Whether to have edit cards in the agent panel expanded, showing a Preview of the diff.", field: Box::new(SettingField { + org_override: None, json_path: Some("agent.expand_edit_card"), pick: |settings_content| { settings_content.agent.as_ref()?.expand_edit_card.as_ref() @@ -7624,6 +7949,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Expand Terminal Card", description: "Whether to have terminal cards in the agent panel expanded, showing the whole command output.", field: Box::new(SettingField { + org_override: None, json_path: Some("agent.expand_terminal_card"), pick: |settings_content| { settings_content @@ -7646,6 +7972,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Thinking Display", description: "How thinking blocks should be displayed by default. 'Auto' fully expands during streaming, then auto-collapses when done. 'Preview' auto-expands with a height constraint during streaming. 'Always Expanded' shows full content. 'Always Collapsed' keeps them collapsed.", field: Box::new(SettingField { + org_override: None, json_path: Some("agent.thinking_display"), pick: |settings_content| { settings_content @@ -7668,6 +7995,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Cancel Generation On Terminal Stop", description: "Whether clicking the stop button on a running terminal tool should also cancel the agent's generation. Note that this only applies to the stop button, not to ctrl+c inside the terminal.", field: Box::new(SettingField { + org_override: None, json_path: Some("agent.cancel_generation_on_terminal_stop"), pick: |settings_content| { settings_content @@ -7690,6 +8018,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Use Modifier To Send", description: "Whether to always use cmd-enter (or ctrl-enter on Linux or Windows) to send messages.", field: Box::new(SettingField { + org_override: None, json_path: Some("agent.use_modifier_to_send"), pick: |settings_content| { settings_content @@ -7712,6 +8041,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Message Editor Min Lines", description: "Minimum number of lines to display in the agent message editor.", field: Box::new(SettingField { + org_override: None, json_path: Some("agent.message_editor_min_lines"), pick: |settings_content| { settings_content @@ -7734,6 +8064,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Show Turn Stats", description: "Whether to show turn statistics like elapsed time during generation and final turn duration.", field: Box::new(SettingField { + org_override: None, json_path: Some("agent.show_turn_stats"), pick: |settings_content| { settings_content.agent.as_ref()?.show_turn_stats.as_ref() @@ -7752,6 +8083,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Show Merge Conflict Indicator", description: "Whether to show the merge conflict indicator in the status bar that offers to resolve conflicts using the agent.", field: Box::new(SettingField { + org_override: None, json_path: Some("agent.show_merge_conflict_indicator"), pick: |settings_content| { settings_content.agent.as_ref()?.show_merge_conflict_indicator.as_ref() @@ -7778,6 +8110,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Context Server Timeout", description: "Default timeout in seconds for context server tool calls. Can be overridden per-server in context_servers configuration.", field: Box::new(SettingField { + org_override: None, json_path: Some("context_server_timeout"), pick: |settings_content| { settings_content.project.context_server_timeout.as_ref() @@ -7797,6 +8130,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Display Mode", description: "When to show edit predictions previews in buffer. The eager mode displays them inline, while the subtle mode displays them only when holding a modifier key.", field: Box::new(SettingField { + org_override: None, json_path: Some("edit_prediction.display_mode"), pick: |settings_content| { settings_content @@ -7841,6 +8175,7 @@ fn network_page() -> SettingsPage { title: "Proxy", description: "The proxy to use for network requests.", field: Box::new(SettingField { + org_override: None, json_path: Some("proxy"), pick: |settings_content| settings_content.proxy.as_ref(), write: |settings_content, value, _| { @@ -7857,6 +8192,7 @@ fn network_page() -> SettingsPage { title: "Server URL", description: "The URL of the Zed server to connect to.", field: Box::new(SettingField { + org_override: None, json_path: Some("server_url"), pick: |settings_content| settings_content.server_url.as_ref(), write: |settings_content, value, _| { @@ -7921,6 +8257,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Tab Size", description: "How many columns a tab should occupy.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).tab_size"), // TODO(cameron): not JQ syntax because not URL-safe pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -7940,6 +8277,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Hard Tabs", description: "Whether to indent lines using tab characters, as opposed to multiple spaces.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).hard_tabs"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -7959,6 +8297,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Auto Indent", description: "Controls automatic indentation behavior when typing.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).auto_indent"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -7978,6 +8317,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Auto Indent On Paste", description: "Whether indentation of pasted content should be adjusted based on the context.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).auto_indent_on_paste"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8003,6 +8343,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Soft Wrap", description: "How to soft-wrap long lines of text.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).soft_wrap"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8022,6 +8363,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Show Wrap Guides", description: "Show wrap guides in the editor.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).show_wrap_guides"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8041,6 +8383,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Preferred Line Length", description: "The column at which to soft-wrap lines, for buffers where soft-wrap is enabled.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).preferred_line_length"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8061,6 +8404,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { description: "Character counts at which to show wrap guides in the editor.", field: Box::new( SettingField { + org_override: None, json_path: Some("languages.$(language).wrap_guides"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8086,6 +8430,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Allow Rewrap", description: "Controls where the `editor::rewrap` action is allowed for this language.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).allow_rewrap"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8111,6 +8456,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Enabled", description: "Display indent guides in the editor.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).indent_guides.enabled"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8133,6 +8479,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Line Width", description: "The width of the indent guides in pixels, between 1 and 10.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).indent_guides.line_width"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8155,6 +8502,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Active Line Width", description: "The width of the active indent guide in pixels, between 1 and 10.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).indent_guides.active_line_width"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8180,6 +8528,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Coloring", description: "Determines how indent guides are colored.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).indent_guides.coloring"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8202,6 +8551,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Background Coloring", description: "Determines how indent guide backgrounds are colored.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).indent_guides.background_coloring"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8234,6 +8584,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { field: Box::new( // TODO(settings_ui): this setting should just be a bool SettingField { + org_override: None, json_path: Some("languages.$(language).format_on_save"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8258,6 +8609,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Remove Trailing Whitespace On Save", description: "Whether or not to remove any trailing whitespace from lines of a buffer before saving it.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).remove_trailing_whitespace_on_save"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8277,6 +8629,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Ensure Final Newline On Save", description: "Whether or not to ensure there's a single newline at the end of a buffer when saving it.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).ensure_final_newline_on_save"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8296,6 +8649,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Line Ending", description: "How line endings should be handled for new files and during format and save operations.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).line_ending"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8319,6 +8673,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { description: "How to perform a buffer format.", field: Box::new( SettingField { + org_override: None, json_path: Some("languages.$(language).formatter"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8344,6 +8699,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Use On Type Format", description: "Whether to use additional LSP queries to format (and amend) the code after every \"trigger\" symbol input, defined by LSP server capabilities", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).use_on_type_format"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8364,6 +8720,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { description: "Additional code actions to run when formatting.", field: Box::new( SettingField { + org_override: None, json_path: Some("languages.$(language).code_actions_on_format"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8395,6 +8752,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Use Autoclose", description: "Whether to automatically type closing characters for you. For example, when you type '(', Zed will automatically add a closing ')' at the correct position.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).use_autoclose"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8414,6 +8772,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Use Auto Surround", description: "Whether to automatically surround text with characters for you. For example, when you select text and type '(', Zed will automatically surround text with ().", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).use_auto_surround"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8433,6 +8792,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Always Treat Brackets As Autoclosed", description: "Controls whether the closing characters are always skipped over and auto-removed no matter how they were inserted.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).always_treat_brackets_as_autoclosed"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8452,6 +8812,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "JSX Tag Auto Close", description: "Whether to automatically close JSX tags.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).jsx_tag_auto_close"), // TODO(settings_ui): this setting should just be a bool pick: |settings_content| { @@ -8478,6 +8839,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Show Whitespaces", description: "Whether to show tabs and spaces in the editor.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).show_whitespaces"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8498,6 +8860,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { description: "Visible character used to render space characters when show_whitespaces is enabled (default: \"•\")", field: Box::new( SettingField { + org_override: None, json_path: Some("languages.$(language).whitespace_map.space"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8524,6 +8887,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { description: "Visible character used to render tab characters when show_whitespaces is enabled (default: \"→\")", field: Box::new( SettingField { + org_override: None, json_path: Some("languages.$(language).whitespace_map.tab"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8555,6 +8919,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Show Completions On Input", description: "Whether to pop the completions menu while typing in an editor without explicitly requesting it.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).show_completions_on_input"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8574,6 +8939,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Show Completion Documentation", description: "Whether to display inline and alongside documentation for items in the completions menu.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).show_completion_documentation"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8593,6 +8959,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Words", description: "Controls how words are completed.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).completions.words"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8612,6 +8979,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Words Min Length", description: "How many characters has to be in the completions query to automatically show the words-based completions.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).completions.words_min_length"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8634,6 +9002,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Completion Menu Scrollbar", description: "When to show the scrollbar in the completion menu.", field: Box::new(SettingField { + org_override: None, json_path: Some("editor.completion_menu_scrollbar"), pick: |settings_content| { settings_content.editor.completion_menu_scrollbar.as_ref() @@ -8649,6 +9018,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Completion Detail Alignment", description: "Whether to align detail text in code completions context menus left or right.", field: Box::new(SettingField { + org_override: None, json_path: Some("editor.completion_detail_alignment"), pick: |settings_content| { settings_content.editor.completion_detail_alignment.as_ref() @@ -8664,6 +9034,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Completion Menu Item Kind", description: "How to display the LSP item kind (function, method, variable, etc.) of each entry in the completions menu.", field: Box::new(SettingField { + org_override: None, json_path: Some("editor.completion_menu_item_kind"), pick: |settings_content| { settings_content.editor.completion_menu_item_kind.as_ref() @@ -8685,6 +9056,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Enabled", description: "Global switch to toggle hints on and off.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).inlay_hints.enabled"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8704,6 +9076,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Show Value Hints", description: "Global switch to toggle inline values on and off when debugging.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).inlay_hints.show_value_hints"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8726,6 +9099,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Show Type Hints", description: "Whether type hints should be shown.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).inlay_hints.show_type_hints"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8745,6 +9119,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Show Parameter Hints", description: "Whether parameter hints should be shown.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).inlay_hints.show_parameter_hints"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8767,6 +9142,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Show Other Hints", description: "Whether other hints should be shown.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).inlay_hints.show_other_hints"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8789,6 +9165,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Show Background", description: "Show a background for inlay hints.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).inlay_hints.show_background"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8808,6 +9185,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Edit Debounce Ms", description: "Whether or not to debounce inlay hints updates after buffer edits (set to 0 to disable debouncing).", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).inlay_hints.edit_debounce_ms"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8830,6 +9208,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Scroll Debounce Ms", description: "Whether or not to debounce inlay hints updates after buffer scrolls (set to 0 to disable debouncing).", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).inlay_hints.scroll_debounce_ms"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8853,6 +9232,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { description: "Toggles inlay hints (hides or shows) when the user presses the modifiers specified.", field: Box::new( SettingField { + org_override: None, json_path: Some( "languages.$(language).inlay_hints.toggle_on_modifiers_press", ), @@ -8893,6 +9273,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Enabled", description: "Whether tasks are enabled for this language.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).tasks.enabled"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8913,6 +9294,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { description: "Extra task variables to set for a particular language.", field: Box::new( SettingField { + org_override: None, json_path: Some("languages.$(language).tasks.variables"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8938,6 +9320,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Prefer LSP", description: "Use LSP tasks over Zed language extension tasks.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).tasks.prefer_lsp"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8963,6 +9346,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Word Diff Enabled", description: "Whether to enable word diff highlighting in the editor. When enabled, changed words within modified lines are highlighted to show exactly what changed.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).word_diff_enabled"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8983,6 +9367,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { description: "Preferred debuggers for this language.", field: Box::new( SettingField { + org_override: None, json_path: Some("languages.$(language).debuggers"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9008,6 +9393,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Middle Click Paste", description: "Enable middle-click paste on Linux.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).editor.middle_click_paste"), pick: |settings_content| settings_content.editor.middle_click_paste.as_ref(), write: |settings_content, value, _| { @@ -9021,6 +9407,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Extend Comment On Newline", description: "Whether to start a new line with a comment when a previous line is a comment as well.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).extend_comment_on_newline"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9040,6 +9427,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Colorize Brackets", description: "Whether to colorize brackets in the editor.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).colorize_brackets"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9059,6 +9447,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Vim/Emacs Modeline Support", description: "Number of lines to search for modelines (set to 0 to disable).", field: Box::new(SettingField { + org_override: None, json_path: Some("modeline_lines"), pick: |settings_content| settings_content.modeline_lines.as_ref(), write: |settings_content, value, _| { @@ -9077,6 +9466,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Image Viewer", description: "The unit for image file sizes.", field: Box::new(SettingField { + org_override: None, json_path: Some("image_viewer.unit"), pick: |settings_content| { settings_content @@ -9095,6 +9485,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Auto Replace Emoji Shortcode", description: "Whether to automatically replace emoji shortcodes with emoji characters.", field: Box::new(SettingField { + org_override: None, json_path: Some("message_editor.auto_replace_emoji_shortcode"), pick: |settings_content| { settings_content @@ -9118,6 +9509,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Drop Size Target", description: "Relative size of the drop target in the editor that will open dropped file as a split pane.", field: Box::new(SettingField { + org_override: None, json_path: Some("drop_target_size"), pick: |settings_content| settings_content.workspace.drop_target_size.as_ref(), write: |settings_content, value, _| { @@ -9136,6 +9528,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Code Lens", description: "Whether and how to display code lenses from language servers.", field: Box::new(SettingField { + org_override: None, json_path: Some("code_lens"), pick: |settings_content| settings_content.editor.code_lens.as_ref(), write: |settings_content, value, _| { @@ -9150,6 +9543,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "LSP Document Colors", description: "How to render LSP color previews in the editor.", field: Box::new(SettingField { + org_override: None, json_path: Some("lsp_document_colors"), pick: |settings_content| settings_content.editor.lsp_document_colors.as_ref(), write: |settings_content, value, _| { @@ -9203,6 +9597,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { title: "Enable Language Server", description: "Whether to use language servers to provide code intelligence.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).enable_language_server"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9223,6 +9618,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { description: "The list of language servers to use (or disable) for this language.", field: Box::new( SettingField { + org_override: None, json_path: Some("languages.$(language).language_servers"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9248,6 +9644,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { title: "Linked Edits", description: "Whether to perform linked edits of associated ranges, if the LS supports it. For example, when editing opening tag, the contents of the closing tag will be edited as well.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).linked_edits"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9267,6 +9664,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { title: "Go To Definition Fallback", description: "Whether to follow-up empty Go to definition responses from the language server.", field: Box::new(SettingField { + org_override: None, json_path: Some("go_to_definition_fallback"), pick: |settings_content| { settings_content.editor.go_to_definition_fallback.as_ref() @@ -9282,6 +9680,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { title: "Go To Definition Scroll Strategy", description: "How to scroll the target into view when navigating to a definition or reference.", field: Box::new(SettingField { + org_override: None, json_path: Some("go_to_definition_scroll_strategy"), pick: |settings_content| { settings_content @@ -9311,6 +9710,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { }) }, field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).semantic_tokens"), pick: |settings_content| { settings_content @@ -9335,6 +9735,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { title: "LSP Folding Ranges", description: "When enabled, use folding ranges from the language server instead of indent-based folding.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).document_folding_ranges"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9354,6 +9755,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { title: "LSP Document Symbols", description: "When enabled, use the language server's document symbols for outlines and breadcrumbs instead of tree-sitter.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).document_symbols"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9379,6 +9781,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { title: "Enabled", description: "Whether to fetch LSP completions or not.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).completions.lsp"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9398,6 +9801,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { title: "Fetch Timeout (milliseconds)", description: "When fetching LSP completions, determines how long to wait for a response of a particular server (set to 0 to wait indefinitely).", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).completions.lsp_fetch_timeout_ms"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9420,6 +9824,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { title: "Insert Mode", description: "Controls how LSP completions are inserted.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).completions.lsp_insert_mode"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9446,6 +9851,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { description: "Preferred debuggers for this language.", field: Box::new( SettingField { + org_override: None, json_path: Some("languages.$(language).debuggers"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9477,6 +9883,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { title: "Allowed", description: "Enables or disables formatting with Prettier for a given language.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).prettier.allowed"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9496,6 +9903,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { title: "Parser", description: "Forces Prettier integration to use a specific parser name when formatting files with the language.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).prettier.parser"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9516,6 +9924,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { description: "Forces Prettier integration to use specific plugins when formatting files with the language.", field: Box::new( SettingField { + org_override: None, json_path: Some("languages.$(language).prettier.plugins"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9542,6 +9951,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { description: "Default Prettier options, in the format as in package.json section for Prettier.", field: Box::new( SettingField { + org_override: None, json_path: Some("languages.$(language).prettier.options"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9590,6 +10000,15 @@ fn edit_prediction_language_settings_section() -> [SettingsPageItem; 5] { title: "Data Collection", description: "Controls whether Zed may collect training data when using Zed's Edit Predictions. Data is only collected for files in projects detected as open source. The default value uses the preference previously set via the status-bar toggle, or false if no preference has been stored.", field: Box::new(SettingField { + org_override: Some(|org_settings, _current_value| { + const DATA_COLLECTION_DISABLED: EditPredictionDataCollectionChoice = EditPredictionDataCollectionChoice::No; + + if !org_settings.edit_prediction.is_feedback_enabled { + Some(&DATA_COLLECTION_DISABLED) + } else { + None + } + }), json_path: Some("edit_predictions.allow_data_collection"), pick: |settings_content| { settings_content @@ -9616,6 +10035,7 @@ fn edit_prediction_language_settings_section() -> [SettingsPageItem; 5] { title: "Show Edit Predictions", description: "Controls whether edit predictions are shown immediately or manually.", field: Box::new(SettingField { + org_override: None, json_path: Some("languages.$(language).show_edit_predictions"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9636,6 +10056,7 @@ fn edit_prediction_language_settings_section() -> [SettingsPageItem; 5] { description: "Controls whether edit predictions are shown in the given language scopes.", field: Box::new( SettingField { + org_override: None, json_path: Some("languages.$(language).edit_predictions_disabled_in"), pick: |settings_content| { language_settings_field(settings_content, |language| { diff --git a/crates/settings_ui/src/pages/edit_prediction_provider_setup.rs b/crates/settings_ui/src/pages/edit_prediction_provider_setup.rs index d101effe5bfca7..31c29100ce2466 100644 --- a/crates/settings_ui/src/pages/edit_prediction_provider_setup.rs +++ b/crates/settings_ui/src/pages/edit_prediction_provider_setup.rs @@ -362,6 +362,7 @@ fn ollama_settings() -> Box<[SettingsPageItem]> { title: "API URL", description: "The base URL of your Ollama server.", field: Box::new(SettingField { + org_override: None, pick: |settings| { settings .project @@ -395,6 +396,7 @@ fn ollama_settings() -> Box<[SettingsPageItem]> { title: "Model", description: "The Ollama model to use for edit predictions.", field: Box::new(SettingField { + org_override: None, pick: |settings| { settings .project @@ -428,6 +430,7 @@ fn ollama_settings() -> Box<[SettingsPageItem]> { title: "Prompt Format", description: "The prompt format to use when requesting predictions. Set to Infer to have the format inferred based on the model name.", field: Box::new(SettingField { + org_override: None, pick: |settings| { settings .project @@ -458,6 +461,7 @@ fn ollama_settings() -> Box<[SettingsPageItem]> { title: "Max Output Tokens", description: "The maximum number of tokens to generate.", field: Box::new(SettingField { + org_override: None, pick: |settings| { settings .project @@ -493,6 +497,7 @@ fn open_ai_compatible_settings() -> Box<[SettingsPageItem]> { title: "API URL", description: "The URL of your OpenAI-compatible server's completions API.", field: Box::new(SettingField { + org_override: None, pick: |settings| { settings .project @@ -526,6 +531,7 @@ fn open_ai_compatible_settings() -> Box<[SettingsPageItem]> { title: "Model", description: "The model string to pass to the OpenAI-compatible server.", field: Box::new(SettingField { + org_override: None, pick: |settings| { settings .project @@ -559,6 +565,7 @@ fn open_ai_compatible_settings() -> Box<[SettingsPageItem]> { title: "Prompt Format", description: "The prompt format to use when requesting predictions. Set to Infer to have the format inferred based on the model name.", field: Box::new(SettingField { + org_override: None, pick: |settings| { settings .project @@ -589,6 +596,7 @@ fn open_ai_compatible_settings() -> Box<[SettingsPageItem]> { title: "Max Output Tokens", description: "The maximum number of tokens to generate.", field: Box::new(SettingField { + org_override: None, pick: |settings| { settings .project @@ -624,6 +632,7 @@ fn codestral_settings() -> Box<[SettingsPageItem]> { title: "API URL", description: "The API URL to use for Codestral.", field: Box::new(SettingField { + org_override: None, pick: |settings| { settings .project @@ -657,6 +666,7 @@ fn codestral_settings() -> Box<[SettingsPageItem]> { title: "Max Tokens", description: "The maximum number of tokens to generate.", field: Box::new(SettingField { + org_override: None, pick: |settings| { settings .project @@ -687,6 +697,7 @@ fn codestral_settings() -> Box<[SettingsPageItem]> { title: "Model", description: "The Codestral model id to use.", field: Box::new(SettingField { + org_override: None, pick: |settings| { settings .project diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs index d3c831b425331b..aa3b6004b43c45 100644 --- a/crates/settings_ui/src/settings_ui.rs +++ b/crates/settings_ui/src/settings_ui.rs @@ -4,6 +4,7 @@ pub mod pages; use agent_skills::SkillIndex; use anyhow::{Context as _, Result}; +use cloud_api_types::OrganizationConfiguration; use editor::{Editor, EditorEvent}; use futures::{StreamExt, channel::mpsc}; use fuzzy::StringMatchCandidate; @@ -104,6 +105,11 @@ struct FocusFile(pub u32); struct SettingField { pick: fn(&SettingsContent) -> Option<&T>, write: fn(&mut SettingsContent, Option, &App), + /// Tells us whether the setting is overridden by the currently selected + /// organization's settings. Takes the organization configuration and the + /// resolved settings value, and returns `Some(...)` if the organization + /// overrides the setting, otherwise `None`. + org_override: Option fn(&OrganizationConfiguration, &'a T) -> Option<&'a T>>, /// A json-path-like string that gives a unique-ish string that identifies /// where in the JSON the setting is defined. @@ -153,7 +159,8 @@ impl SettingField { SettingField { pick: |_| Some(&UnimplementedSettingField), write: |_, _, _| unreachable!(), - json_path: self.json_path, + org_override: None, + json_path: None, } } } @@ -4213,6 +4220,35 @@ fn update_project_setting_file( Ok(()) } +struct CurrentSettingsValue<'a, T> { + value: &'a T, + file: settings::SettingsFile, + disabled: bool, +} + +fn get_current_value<'a, T>( + settings_store: &'a SettingsStore, + file: &SettingsUiFile, + field: &'a SettingField, + cx: &'a App, +) -> Option> { + let user_store = AppState::global(cx).user_store.read(cx); + let org_config = user_store.current_organization_configuration(); + + let (file, value) = settings_store.get_value_from_file(file.to_settings(), field.pick); + let value = value?; + + let org_value = org_config + .zip(field.org_override) + .and_then(|(org_config, org_override)| (org_override)(org_config, value)); + + Some(CurrentSettingsValue { + disabled: org_value.is_some(), + value: org_value.unwrap_or(&value), + file, + }) +} + fn render_text_field + Into + AsRef + Clone>( field: SettingField, file: SettingsUiFile, @@ -4333,9 +4369,10 @@ where .and_then(|metadata| metadata.should_do_titlecase) .unwrap_or(true); - let (_, current_value) = - SettingsStore::global(cx).get_value_from_file(file.to_settings(), field.pick); - let current_value = current_value.copied().unwrap_or(variants()[0]); + let current_value = get_current_value(&SettingsStore::global(cx), &file, &field, cx); + let (current_value, disabled) = current_value + .map(|current_value| (*current_value.value, current_value.disabled)) + .unwrap_or((variants()[0], false)); EnumVariantDropdown::new("dropdown", current_value, variants(), labels(), { move |value, window, cx| { @@ -4354,6 +4391,7 @@ where .log_err(); // todo(settings_ui) don't log err } }) + .disabled(disabled) .tab_index(0) .title_case(should_do_titlecase) .into_any_element() From 90a441e27e7c62c8296bd2b160bf90dcf9a77545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Houl=C3=A9?= Date: Tue, 2 Jun 2026 13:45:14 +0200 Subject: [PATCH 2/6] show warning next to the disabled value --- crates/settings_ui/src/page_data.rs | 1 + crates/settings_ui/src/settings_ui.rs | 26 +++++++++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs index adfce0a8564864..34eb744f367f95 100644 --- a/crates/settings_ui/src/page_data.rs +++ b/crates/settings_ui/src/page_data.rs @@ -3623,6 +3623,7 @@ fn search_and_files_page() -> SettingsPage { description: "When to scan content of linked directories", field: Box::new(SettingField { json_path: Some("scan_symlinks"), + org_override: None, pick: |settings_content| { settings_content.project.worktree.scan_symlinks.as_ref() }, diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs index aa3b6004b43c45..bfc0accf8416f7 100644 --- a/crates/settings_ui/src/settings_ui.rs +++ b/crates/settings_ui/src/settings_ui.rs @@ -4374,7 +4374,7 @@ where .map(|current_value| (*current_value.value, current_value.disabled)) .unwrap_or((variants()[0], false)); - EnumVariantDropdown::new("dropdown", current_value, variants(), labels(), { + let dropdown = EnumVariantDropdown::new("dropdown", current_value, variants(), labels(), { move |value, window, cx| { if value == current_value { return; @@ -4393,8 +4393,28 @@ where }) .disabled(disabled) .tab_index(0) - .title_case(should_do_titlecase) - .into_any_element() + .title_case(should_do_titlecase); + + if disabled { + h_flex() + .gap_2() + .child( + div() + .id("organization-configuration-warning") + .child( + Icon::new(IconName::Warning) + .size(IconSize::Small) + .color(Color::Warning), + ) + .tooltip(Tooltip::text( + "This setting is managed by the selected organization and can’t be changed here.", + )), + ) + .child(dropdown) + .into_any_element() + } else { + dropdown.into_any_element() + } } fn render_picker_trigger_button(id: SharedString, label: SharedString) -> Button { From 19b98254b5223ec86bdcde65486b5fadfb45e227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Houl=C3=A9?= Date: Tue, 2 Jun 2026 14:09:27 +0200 Subject: [PATCH 3/6] simplify Co-authored-by: Gaauwe Rombouts --- crates/settings_ui/src/page_data.rs | 2 +- crates/settings_ui/src/settings_ui.rs | 90 +++++++++++++++++++-------- 2 files changed, 64 insertions(+), 28 deletions(-) diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs index 34eb744f367f95..36532e288313ac 100644 --- a/crates/settings_ui/src/page_data.rs +++ b/crates/settings_ui/src/page_data.rs @@ -10001,7 +10001,7 @@ fn edit_prediction_language_settings_section() -> [SettingsPageItem; 5] { title: "Data Collection", description: "Controls whether Zed may collect training data when using Zed's Edit Predictions. Data is only collected for files in projects detected as open source. The default value uses the preference previously set via the status-bar toggle, or false if no preference has been stored.", field: Box::new(SettingField { - org_override: Some(|org_settings, _current_value| { + org_override: Some(|org_settings| { const DATA_COLLECTION_DISABLED: EditPredictionDataCollectionChoice = EditPredictionDataCollectionChoice::No; if !org_settings.edit_prediction.is_feedback_enabled { diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs index bfc0accf8416f7..c24b1be7f5fffb 100644 --- a/crates/settings_ui/src/settings_ui.rs +++ b/crates/settings_ui/src/settings_ui.rs @@ -109,7 +109,7 @@ struct SettingField { /// organization's settings. Takes the organization configuration and the /// resolved settings value, and returns `Some(...)` if the organization /// overrides the setting, otherwise `None`. - org_override: Option fn(&OrganizationConfiguration, &'a T) -> Option<&'a T>>, + org_override: Option Option<&T>>, /// A json-path-like string that gives a unique-ish string that identifies /// where in the JSON the setting is defined. @@ -179,6 +179,8 @@ trait AnySettingField { ) -> Option>; fn json_path(&self) -> Option<&'static str>; + + fn is_overriden_by_organization(&self, cx: &App) -> bool; } impl AnySettingField for SettingField { @@ -254,6 +256,19 @@ impl AnySettingField for SettingFi fn json_path(&self) -> Option<&'static str> { self.json_path } + + fn is_overriden_by_organization(&self, cx: &App) -> bool { + let Some(org_override) = self.org_override else { + return false; + }; + + let user_store = AppState::global(cx).user_store.read(cx); + let Some(org_config) = user_store.current_organization_configuration() else { + return false; + }; + + (org_override)(&org_config).is_some() + } } #[derive(Default, Clone)] @@ -1241,9 +1256,50 @@ fn render_settings_item( .size(LabelSize::Small) .color(Color::Muted) .render_code_spans(), - ), + ), // .when( + // setting_item.field.is_overriden_by_organization(cx), + // |this| { + // this.child(h_flex() + // .gap_2() + // .child( + // Icon::new(IconName::Warning) + // .size(IconSize::Small) + // .color(Color::Warning), + // ) + // .child( + // Label::new(SharedString::new_static("This setting is managed by the selected organization and can’t be changed here.")) + // .size(LabelSize::Small) + // .color(Color::Muted) + // .render_code_spans(), + // )) + // }, + // ), ) - .child(control) + .child( + +if setting_item.field.is_overriden_by_organization(cx) { + + h_flex() + .gap_2() + .child( + div() + .id("organization-configuration-warning") + .child( + Icon::new(IconName::Warning) + .size(IconSize::Small) + .color(Color::Warning), + ) + .tooltip(Tooltip::text( + "This setting is managed by the selected organization and can’t be changed here.", + )), + ) + .child(control) + .into_any_element() +} else { + +control.into_any_element() +} + ) .when(settings_window.sub_page_stack.is_empty(), |this| { this.child(render_settings_item_link( setting_item.description, @@ -4240,7 +4296,7 @@ fn get_current_value<'a, T>( let org_value = org_config .zip(field.org_override) - .and_then(|(org_config, org_override)| (org_override)(org_config, value)); + .and_then(|(org_config, org_override)| (org_override)(org_config)); Some(CurrentSettingsValue { disabled: org_value.is_some(), @@ -4374,7 +4430,7 @@ where .map(|current_value| (*current_value.value, current_value.disabled)) .unwrap_or((variants()[0], false)); - let dropdown = EnumVariantDropdown::new("dropdown", current_value, variants(), labels(), { + EnumVariantDropdown::new("dropdown", current_value, variants(), labels(), { move |value, window, cx| { if value == current_value { return; @@ -4393,28 +4449,8 @@ where }) .disabled(disabled) .tab_index(0) - .title_case(should_do_titlecase); - - if disabled { - h_flex() - .gap_2() - .child( - div() - .id("organization-configuration-warning") - .child( - Icon::new(IconName::Warning) - .size(IconSize::Small) - .color(Color::Warning), - ) - .tooltip(Tooltip::text( - "This setting is managed by the selected organization and can’t be changed here.", - )), - ) - .child(dropdown) - .into_any_element() - } else { - dropdown.into_any_element() - } + .title_case(should_do_titlecase) + .into_any_element() } fn render_picker_trigger_button(id: SharedString, label: SharedString) -> Button { From e8e5a74b50d584679319cff2a01d32c6bf117926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Houl=C3=A9?= Date: Tue, 2 Jun 2026 14:12:43 +0200 Subject: [PATCH 4/6] Align more with Danilo's design --- crates/settings_ui/src/settings_ui.rs | 69 ++++++++++----------------- 1 file changed, 26 insertions(+), 43 deletions(-) diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs index c24b1be7f5fffb..233db2aa7eb3e9 100644 --- a/crates/settings_ui/src/settings_ui.rs +++ b/crates/settings_ui/src/settings_ui.rs @@ -1256,50 +1256,33 @@ fn render_settings_item( .size(LabelSize::Small) .color(Color::Muted) .render_code_spans(), - ), // .when( - // setting_item.field.is_overriden_by_organization(cx), - // |this| { - // this.child(h_flex() - // .gap_2() - // .child( - // Icon::new(IconName::Warning) - // .size(IconSize::Small) - // .color(Color::Warning), - // ) - // .child( - // Label::new(SharedString::new_static("This setting is managed by the selected organization and can’t be changed here.")) - // .size(LabelSize::Small) - // .color(Color::Muted) - // .render_code_spans(), - // )) - // }, - // ), + ), ) - .child( - -if setting_item.field.is_overriden_by_organization(cx) { - - h_flex() - .gap_2() - .child( - div() - .id("organization-configuration-warning") - .child( - Icon::new(IconName::Warning) - .size(IconSize::Small) - .color(Color::Warning), - ) - .tooltip(Tooltip::text( - "This setting is managed by the selected organization and can’t be changed here.", - )), - ) - .child(control) - .into_any_element() -} else { - -control.into_any_element() -} - ) + .child(if setting_item.field.is_overriden_by_organization(cx) { + h_flex() + .gap_2() + .child( + div() + .id("organization-configuration-warning") + .child( + Icon::new(IconName::Warning) + .size(IconSize::Small) + .color(Color::Warning), + ) + .tooltip(|_, cx| { + Tooltip::with_meta( + "Overriden by Organization", + None, + "Contact your organization admins to adjust this setting.", + cx, + ) + }), + ) + .child(control) + .into_any_element() + } else { + control.into_any_element() + }) .when(settings_window.sub_page_stack.is_empty(), |this| { this.child(render_settings_item_link( setting_item.description, From 14f1cf0396423c276d9014cd6f04c674b94a1150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Houl=C3=A9?= Date: Tue, 2 Jun 2026 14:16:57 +0200 Subject: [PATCH 5/6] Finish last setting --- crates/settings_ui/src/page_data.rs | 6 +++++- crates/settings_ui/src/settings_ui.rs | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs index 36532e288313ac..93b559e1b8c990 100644 --- a/crates/settings_ui/src/page_data.rs +++ b/crates/settings_ui/src/page_data.rs @@ -7866,7 +7866,11 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Enable Feedback", description: "Show voting thumbs up/down icon buttons for feedback on agent edits.", field: Box::new(SettingField { - org_override: None, + org_override: Some(|org_config| if org_config.is_agent_thread_feedback_enabled { + None + } else { + Some(&false) + }), json_path: Some("agent.enable_feedback"), pick: |settings_content| { settings_content.agent.as_ref()?.enable_feedback.as_ref() diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs index 233db2aa7eb3e9..e17b3b21a27b68 100644 --- a/crates/settings_ui/src/settings_ui.rs +++ b/crates/settings_ui/src/settings_ui.rs @@ -4261,7 +4261,6 @@ fn update_project_setting_file( struct CurrentSettingsValue<'a, T> { value: &'a T, - file: settings::SettingsFile, disabled: bool, } @@ -4284,7 +4283,6 @@ fn get_current_value<'a, T>( Some(CurrentSettingsValue { disabled: org_value.is_some(), value: org_value.unwrap_or(&value), - file, }) } From 1b848725556df2512eab2acb13174c47cf30d82a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Houl=C3=A9?= Date: Tue, 2 Jun 2026 14:24:19 +0200 Subject: [PATCH 6/6] Implement disabled state based on org config for toggles --- crates/settings_ui/src/page_data.rs | 828 +++++++++--------- .../pages/edit_prediction_provider_setup.rs | 22 +- crates/settings_ui/src/settings_ui.rs | 33 +- 3 files changed, 445 insertions(+), 438 deletions(-) diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs index 93b559e1b8c990..fc1369e5fca6cf 100644 --- a/crates/settings_ui/src/page_data.rs +++ b/crates/settings_ui/src/page_data.rs @@ -105,7 +105,7 @@ fn developer_page(cx: &App) -> SettingsPage { title: "Performance Profiler", description: "Collect timing data for foreground and background executor tasks so they can be inspected via `zed: open performance profiler`. May lead to increased memory usage.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("instrumentation.performance_profiler.enabled"), pick: |settings_content| { settings_content @@ -141,7 +141,7 @@ fn general_page(cx: &App) -> SettingsPage { title: "When Closing With No Tabs", description: "What to do when using the 'close active item' action with no tabs.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("when_closing_with_no_tabs"), pick: |settings_content| { settings_content @@ -160,7 +160,7 @@ fn general_page(cx: &App) -> SettingsPage { title: "On Last Window Closed", description: "What to do when the last window is closed.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("on_last_window_closed"), pick: |settings_content| { settings_content.workspace.on_last_window_closed.as_ref() @@ -176,7 +176,7 @@ fn general_page(cx: &App) -> SettingsPage { title: "Use System Path Prompts", description: "Use native OS dialogs for 'Open' and 'Save As'.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("use_system_path_prompts"), pick: |settings_content| { settings_content.workspace.use_system_path_prompts.as_ref() @@ -192,7 +192,7 @@ fn general_page(cx: &App) -> SettingsPage { title: "Use System Prompts", description: "Use native OS dialogs for confirmations.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("use_system_prompts"), pick: |settings_content| settings_content.workspace.use_system_prompts.as_ref(), write: |settings_content, value, _| { @@ -206,7 +206,7 @@ fn general_page(cx: &App) -> SettingsPage { title: "Redact Private Values", description: "Hide the values of variables in private files.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("redact_private_values"), pick: |settings_content| settings_content.editor.redact_private_values.as_ref(), write: |settings_content, value, _| { @@ -221,7 +221,7 @@ fn general_page(cx: &App) -> SettingsPage { description: "Globs to match against file paths to determine if a file is private.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("worktree.private_files"), pick: |settings_content| { settings_content.project.worktree.private_files.as_ref() @@ -239,7 +239,7 @@ fn general_page(cx: &App) -> SettingsPage { title: "CLI Default Open Behavior", description: "How `zed ` opens directories when no flag is specified.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("cli_default_open_behavior"), pick: |settings_content| { settings_content @@ -266,7 +266,7 @@ fn general_page(cx: &App) -> SettingsPage { title: "Trust All Projects By Default", description: "When opening Zed, avoid Restricted Mode by auto-trusting all projects, enabling use of all features without having to give permission to each new project.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("session.trust_all_projects"), pick: |settings_content| { settings_content @@ -294,7 +294,7 @@ fn general_page(cx: &App) -> SettingsPage { title: "Restore Unsaved Buffers", description: "Whether or not to restore unsaved buffers on restart.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("session.restore_unsaved_buffers"), pick: |settings_content| { settings_content @@ -316,7 +316,7 @@ fn general_page(cx: &App) -> SettingsPage { title: "Restore On Startup", description: "What to restore from the previous session when opening Zed.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("restore_on_startup"), pick: |settings_content| settings_content.workspace.restore_on_startup.as_ref(), write: |settings_content, value, _| { @@ -338,7 +338,7 @@ fn general_page(cx: &App) -> SettingsPage { description: "Which settings should be activated only in Preview build of Zed.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("preview_channel_settings"), pick: |settings_content| Some(settings_content), write: |_settings_content, _value, _| {}, @@ -353,7 +353,7 @@ fn general_page(cx: &App) -> SettingsPage { description: "Any number of settings profiles that are temporarily applied on top of your existing user settings.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("settings_profiles"), pick: |settings_content| Some(settings_content), write: |_settings_content, _value, _| {}, @@ -372,7 +372,7 @@ fn general_page(cx: &App) -> SettingsPage { title: "Telemetry Diagnostics", description: "Send debug information like crash reports.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("telemetry.diagnostics"), pick: |settings_content| { settings_content @@ -394,7 +394,7 @@ fn general_page(cx: &App) -> SettingsPage { title: "Telemetry Metrics", description: "Send anonymized usage data like what languages you're using Zed with.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("telemetry.metrics"), pick: |settings_content| { settings_content @@ -419,7 +419,7 @@ fn general_page(cx: &App) -> SettingsPage { title: "Auto Update", description: "Whether or not to automatically check for updates.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("auto_update"), pick: |settings_content| settings_content.auto_update.as_ref(), write: |settings_content, value, _| { @@ -457,7 +457,7 @@ fn appearance_page() -> SettingsPage { title: "Theme Mode", description: "Choose a static, fixed theme or dynamically select themes based on appearance and light/dark modes.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("theme$"), pick: |settings_content| { Some(&dynamic_variants::()[ @@ -521,7 +521,7 @@ fn appearance_page() -> SettingsPage { title: "Theme Name", description: "The name of your selected theme.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("theme"), pick: |settings_content| { match settings_content.theme.theme.as_ref() { @@ -550,7 +550,7 @@ fn appearance_page() -> SettingsPage { title: "Mode", description: "Choose whether to use the selected light or dark theme or to follow your OS appearance configuration.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("theme.mode"), pick: |settings_content| { match settings_content.theme.theme.as_ref() { @@ -577,7 +577,7 @@ fn appearance_page() -> SettingsPage { title: "Light Theme", description: "The theme to use when mode is set to light, or when mode is set to system and it is in light mode.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("theme.light"), pick: |settings_content| { match settings_content.theme.theme.as_ref() { @@ -604,7 +604,7 @@ fn appearance_page() -> SettingsPage { title: "Dark Theme", description: "The theme to use when mode is set to dark, or when mode is set to system and it is in dark mode.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("theme.dark"), pick: |settings_content| { match settings_content.theme.theme.as_ref() { @@ -636,7 +636,7 @@ fn appearance_page() -> SettingsPage { title: "Icon Theme", description: "The custom set of icons Zed will associate with files and directories.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("icon_theme$"), pick: |settings_content| { Some(&dynamic_variants::()[ @@ -702,7 +702,7 @@ fn appearance_page() -> SettingsPage { title: "Icon Theme Name", description: "The name of your selected icon theme.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("icon_theme$string"), pick: |settings_content| { match settings_content.theme.icon_theme.as_ref() { @@ -731,7 +731,7 @@ fn appearance_page() -> SettingsPage { title: "Mode", description: "Choose whether to use the selected light or dark icon theme or to follow your OS appearance configuration.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("icon_theme"), pick: |settings_content| { match settings_content.theme.icon_theme.as_ref() { @@ -758,7 +758,7 @@ fn appearance_page() -> SettingsPage { title: "Light Icon Theme", description: "The icon theme to use when mode is set to light, or when mode is set to system and it is in light mode.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("icon_theme.light"), pick: |settings_content| { match settings_content.theme.icon_theme.as_ref() { @@ -785,7 +785,7 @@ fn appearance_page() -> SettingsPage { title: "Dark Icon Theme", description: "The icon theme to use when mode is set to dark, or when mode is set to system and it is in dark mode.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("icon_theme.dark"), pick: |settings_content| { match settings_content.theme.icon_theme.as_ref() { @@ -821,7 +821,7 @@ fn appearance_page() -> SettingsPage { title: "Font Family", description: "Font family for editor text.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("buffer_font_family"), pick: |settings_content| settings_content.theme.buffer_font_family.as_ref(), write: |settings_content, value, _| { @@ -835,7 +835,7 @@ fn appearance_page() -> SettingsPage { title: "Font Size", description: "Font size for editor text.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("buffer_font_size"), pick: |settings_content| settings_content.theme.buffer_font_size.as_ref(), write: |settings_content, value, _| { @@ -849,7 +849,7 @@ fn appearance_page() -> SettingsPage { title: "Font Weight", description: "Font weight for editor text (100-900).", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("buffer_font_weight"), pick: |settings_content| settings_content.theme.buffer_font_weight.as_ref(), write: |settings_content, value, _| { @@ -865,7 +865,7 @@ fn appearance_page() -> SettingsPage { title: "Line Height", description: "Line height for editor text.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("buffer_line_height$"), pick: |settings_content| { Some( @@ -923,7 +923,7 @@ fn appearance_page() -> SettingsPage { title: "Custom Line Height", description: "Custom line height value (must be at least 1.0).", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("buffer_line_height"), pick: |settings_content| match settings_content .theme @@ -956,7 +956,7 @@ fn appearance_page() -> SettingsPage { description: "The OpenType features to enable for rendering in text buffers.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("buffer_font_features"), pick: |settings_content| { settings_content.theme.buffer_font_features.as_ref() @@ -975,7 +975,7 @@ fn appearance_page() -> SettingsPage { description: "The font fallbacks to use for rendering in text buffers.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("buffer_font_fallbacks"), pick: |settings_content| { settings_content.theme.buffer_font_fallbacks.as_ref() @@ -998,7 +998,7 @@ fn appearance_page() -> SettingsPage { title: "Font Family", description: "Font family for UI elements.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("ui_font_family"), pick: |settings_content| settings_content.theme.ui_font_family.as_ref(), write: |settings_content, value, _| { @@ -1012,7 +1012,7 @@ fn appearance_page() -> SettingsPage { title: "Font Size", description: "Font size for UI elements.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("ui_font_size"), pick: |settings_content| settings_content.theme.ui_font_size.as_ref(), write: |settings_content, value, _| { @@ -1026,7 +1026,7 @@ fn appearance_page() -> SettingsPage { title: "Font Weight", description: "Font weight for UI elements (100-900).", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("ui_font_weight"), pick: |settings_content| settings_content.theme.ui_font_weight.as_ref(), write: |settings_content, value, _| { @@ -1042,7 +1042,7 @@ fn appearance_page() -> SettingsPage { description: "The OpenType features to enable for rendering in UI elements.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("ui_font_features"), pick: |settings_content| settings_content.theme.ui_font_features.as_ref(), write: |settings_content, value, _| { @@ -1059,7 +1059,7 @@ fn appearance_page() -> SettingsPage { description: "The font fallbacks to use for rendering in the UI.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("ui_font_fallbacks"), pick: |settings_content| settings_content.theme.ui_font_fallbacks.as_ref(), write: |settings_content, value, _| { @@ -1080,7 +1080,7 @@ fn appearance_page() -> SettingsPage { title: "UI Font Size", description: "Font size for agent response text in the agent panel. Falls back to the regular UI font size.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("agent_ui_font_size"), pick: |settings_content| { settings_content @@ -1100,7 +1100,7 @@ fn appearance_page() -> SettingsPage { title: "Buffer Font Size", description: "Font size for user messages text in the agent panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("agent_buffer_font_size"), pick: |settings_content| { settings_content @@ -1126,7 +1126,7 @@ fn appearance_page() -> SettingsPage { title: "Text Rendering Mode", description: "The text rendering mode to use.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("text_rendering_mode"), pick: |settings_content| { settings_content.workspace.text_rendering_mode.as_ref() @@ -1148,7 +1148,7 @@ fn appearance_page() -> SettingsPage { title: "Multi Cursor Modifier", description: "Modifier key for adding multiple cursors.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("multi_cursor_modifier"), pick: |settings_content| settings_content.editor.multi_cursor_modifier.as_ref(), write: |settings_content, value, _| { @@ -1162,7 +1162,7 @@ fn appearance_page() -> SettingsPage { title: "Cursor Blink", description: "Whether the cursor blinks in the editor.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("cursor_blink"), pick: |settings_content| settings_content.editor.cursor_blink.as_ref(), write: |settings_content, value, _| { @@ -1176,7 +1176,7 @@ fn appearance_page() -> SettingsPage { title: "Cursor Shape", description: "Cursor shape for the editor.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("cursor_shape"), pick: |settings_content| settings_content.editor.cursor_shape.as_ref(), write: |settings_content, value, _| { @@ -1190,7 +1190,7 @@ fn appearance_page() -> SettingsPage { title: "Hide Mouse", description: "When to hide the mouse cursor.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("hide_mouse"), pick: |settings_content| settings_content.hide_mouse.as_ref(), write: |settings_content, value, _| { @@ -1210,7 +1210,7 @@ fn appearance_page() -> SettingsPage { title: "Unnecessary Code Fade", description: "How much to fade out unused code (0.0 - 0.9).", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("unnecessary_code_fade"), pick: |settings_content| settings_content.theme.unnecessary_code_fade.as_ref(), write: |settings_content, value, _| { @@ -1224,7 +1224,7 @@ fn appearance_page() -> SettingsPage { title: "Current Line Highlight", description: "How to highlight the current line.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("current_line_highlight"), pick: |settings_content| { settings_content.editor.current_line_highlight.as_ref() @@ -1240,7 +1240,7 @@ fn appearance_page() -> SettingsPage { title: "Selection Highlight", description: "Highlight all occurrences of selected text.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("selection_highlight"), pick: |settings_content| settings_content.editor.selection_highlight.as_ref(), write: |settings_content, value, _| { @@ -1254,7 +1254,7 @@ fn appearance_page() -> SettingsPage { title: "Rounded Selection", description: "Whether the text selection should have rounded corners.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("rounded_selection"), pick: |settings_content| settings_content.editor.rounded_selection.as_ref(), write: |settings_content, value, _| { @@ -1268,7 +1268,7 @@ fn appearance_page() -> SettingsPage { title: "Minimum Contrast For Highlights", description: "The minimum APCA perceptual contrast to maintain when rendering text over highlight backgrounds.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("minimum_contrast_for_highlights"), pick: |settings_content| { settings_content @@ -1293,7 +1293,7 @@ fn appearance_page() -> SettingsPage { title: "Show Wrap Guides", description: "Show wrap guides (vertical rulers).", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("show_wrap_guides"), pick: |settings_content| { settings_content @@ -1320,7 +1320,7 @@ fn appearance_page() -> SettingsPage { description: "Character counts at which to show wrap guides.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("wrap_guides"), pick: |settings_content| { settings_content @@ -1392,7 +1392,7 @@ fn keymap_page() -> SettingsPage { title: "Base Keymap", description: "The name of a base set of key bindings to use.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("base_keymap"), pick: |settings_content| settings_content.base_keymap.as_ref(), write: |settings_content, value, _| { @@ -1415,7 +1415,7 @@ fn keymap_page() -> SettingsPage { title: "Vim Mode", description: "Enable Vim mode and key bindings.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("vim_mode"), pick: |settings_content| settings_content.vim_mode.as_ref(), write: write_vim_mode, @@ -1427,7 +1427,7 @@ fn keymap_page() -> SettingsPage { title: "Helix Mode", description: "Enable Helix mode and key bindings.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("helix_mode"), pick: |settings_content| settings_content.helix_mode.as_ref(), write: write_helix_mode, @@ -1460,7 +1460,7 @@ fn editor_page() -> SettingsPage { title: "Auto Save Mode", description: "When to auto save buffer changes.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("autosave$"), pick: |settings_content| { Some( @@ -1517,7 +1517,7 @@ fn editor_page() -> SettingsPage { title: "Delay (milliseconds)", description: "Save after inactivity period (in milliseconds).", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("autosave.after_delay.milliseconds"), pick: |settings_content| match settings_content .workspace @@ -1559,7 +1559,7 @@ fn editor_page() -> SettingsPage { title: "Show Which-key Menu", description: "Display the which-key menu with matching bindings while a multi-stroke binding is pending.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("which_key.enabled"), pick: |settings_content| { settings_content @@ -1578,7 +1578,7 @@ fn editor_page() -> SettingsPage { title: "Menu Delay", description: "Delay in milliseconds before the which-key menu appears.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("which_key.delay_ms"), pick: |settings_content| { settings_content @@ -1603,7 +1603,7 @@ fn editor_page() -> SettingsPage { title: "Double Click In Multibuffer", description: "What to do when multibuffer is double-clicked in some of its excerpts.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("double_click_in_multibuffer"), pick: |settings_content| { settings_content.editor.double_click_in_multibuffer.as_ref() @@ -1619,7 +1619,7 @@ fn editor_page() -> SettingsPage { title: "Expand Excerpt Lines", description: "How many lines to expand the multibuffer excerpts by default.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("expand_excerpt_lines"), pick: |settings_content| settings_content.editor.expand_excerpt_lines.as_ref(), write: |settings_content, value, _| { @@ -1633,7 +1633,7 @@ fn editor_page() -> SettingsPage { title: "Excerpt Context Lines", description: "How many lines of context to provide in multibuffer excerpts by default.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("excerpt_context_lines"), pick: |settings_content| settings_content.editor.excerpt_context_lines.as_ref(), write: |settings_content, value, _| { @@ -1647,7 +1647,7 @@ fn editor_page() -> SettingsPage { title: "Expand Outlines With Depth", description: "Default depth to expand outline items in the current file.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("outline_panel.expand_outlines_with_depth"), pick: |settings_content| { settings_content @@ -1671,7 +1671,7 @@ fn editor_page() -> SettingsPage { title: "Diff View Style", description: "How to display diffs in the editor.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("diff_view_style"), pick: |settings_content| settings_content.editor.diff_view_style.as_ref(), write: |settings_content, value, _| { @@ -1685,7 +1685,7 @@ fn editor_page() -> SettingsPage { title: "Minimum Split Diff Width", description: "The minimum width (in columns) at which the split diff view is used. When the editor is narrower, the diff view automatically switches to unified mode. Set to 0 to disable.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("minimum_split_diff_width"), pick: |settings_content| { settings_content.editor.minimum_split_diff_width.as_ref() @@ -1707,7 +1707,7 @@ fn editor_page() -> SettingsPage { title: "Scroll Beyond Last Line", description: "Whether the editor will scroll beyond the last line.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("scroll_beyond_last_line"), pick: |settings_content| { settings_content.editor.scroll_beyond_last_line.as_ref() @@ -1723,7 +1723,7 @@ fn editor_page() -> SettingsPage { title: "Vertical Scroll Margin", description: "The number of lines to keep above/below the cursor when auto-scrolling.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("vertical_scroll_margin"), pick: |settings_content| { settings_content.editor.vertical_scroll_margin.as_ref() @@ -1739,7 +1739,7 @@ fn editor_page() -> SettingsPage { title: "Horizontal Scroll Margin", description: "The number of characters to keep on either side when scrolling with the mouse.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("horizontal_scroll_margin"), pick: |settings_content| { settings_content.editor.horizontal_scroll_margin.as_ref() @@ -1755,7 +1755,7 @@ fn editor_page() -> SettingsPage { title: "Scroll Sensitivity", description: "Scroll sensitivity multiplier for both horizontal and vertical scrolling.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("scroll_sensitivity"), pick: |settings_content| settings_content.editor.scroll_sensitivity.as_ref(), write: |settings_content, value, _| { @@ -1769,7 +1769,7 @@ fn editor_page() -> SettingsPage { title: "Mouse Wheel Zoom", description: "Whether to zoom the editor font size with the mouse wheel while holding the primary modifier key.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("mouse_wheel_zoom"), pick: |settings_content| settings_content.editor.mouse_wheel_zoom.as_ref(), write: |settings_content, value, _| { @@ -1783,7 +1783,7 @@ fn editor_page() -> SettingsPage { title: "Fast Scroll Sensitivity", description: "Fast scroll sensitivity multiplier for both horizontal and vertical scrolling.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("fast_scroll_sensitivity"), pick: |settings_content| { settings_content.editor.fast_scroll_sensitivity.as_ref() @@ -1799,7 +1799,7 @@ fn editor_page() -> SettingsPage { title: "Autoscroll On Clicks", description: "Whether to scroll when clicking near the edge of the visible text area.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("autoscroll_on_clicks"), pick: |settings_content| settings_content.editor.autoscroll_on_clicks.as_ref(), write: |settings_content, value, _| { @@ -1813,7 +1813,7 @@ fn editor_page() -> SettingsPage { title: "Sticky Scroll", description: "Whether to stick scopes to the top of the editor", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("sticky_scroll.enabled"), pick: |settings_content| { settings_content @@ -1843,7 +1843,7 @@ fn editor_page() -> SettingsPage { title: "Auto Signature Help", description: "Automatically show a signature help pop-up.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("auto_signature_help"), pick: |settings_content| settings_content.editor.auto_signature_help.as_ref(), write: |settings_content, value, _| { @@ -1857,7 +1857,7 @@ fn editor_page() -> SettingsPage { title: "Show Signature Help After Edits", description: "Show the signature help pop-up after completions or bracket pairs are inserted.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("show_signature_help_after_edits"), pick: |settings_content| { settings_content @@ -1876,7 +1876,7 @@ fn editor_page() -> SettingsPage { title: "Snippet Sort Order", description: "Determines how snippets are sorted relative to other completion items.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("snippet_sort_order"), pick: |settings_content| settings_content.editor.snippet_sort_order.as_ref(), write: |settings_content, value, _| { @@ -1896,7 +1896,7 @@ fn editor_page() -> SettingsPage { title: "Enabled", description: "Show the informational hover box when moving the mouse over symbols in the editor.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("hover_popover_enabled"), pick: |settings_content| settings_content.editor.hover_popover_enabled.as_ref(), write: |settings_content, value, _| { @@ -1911,7 +1911,7 @@ fn editor_page() -> SettingsPage { title: "Delay", description: "Time to wait in milliseconds before showing the informational hover box.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("hover_popover_delay"), pick: |settings_content| settings_content.editor.hover_popover_delay.as_ref(), write: |settings_content, value, _| { @@ -1925,7 +1925,7 @@ fn editor_page() -> SettingsPage { title: "Sticky", description: "Whether the hover popover sticks when the mouse moves toward it, allowing interaction with its contents.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("hover_popover_sticky"), pick: |settings_content| settings_content.editor.hover_popover_sticky.as_ref(), write: |settings_content, value, _| { @@ -1940,7 +1940,7 @@ fn editor_page() -> SettingsPage { title: "Hiding Delay", description: "Time to wait in milliseconds before hiding the hover popover after the mouse moves away.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("hover_popover_hiding_delay"), pick: |settings_content| { settings_content.editor.hover_popover_hiding_delay.as_ref() @@ -1962,7 +1962,7 @@ fn editor_page() -> SettingsPage { title: "Enabled", description: "Enable drag and drop selection.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("drag_and_drop_selection.enabled"), pick: |settings_content| { settings_content @@ -1986,7 +1986,7 @@ fn editor_page() -> SettingsPage { title: "Delay", description: "Delay in milliseconds before drag and drop selection starts.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("drag_and_drop_selection.delay"), pick: |settings_content| { settings_content @@ -2016,7 +2016,7 @@ fn editor_page() -> SettingsPage { title: "Show Line Numbers", description: "Show line numbers in the gutter.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("gutter.line_numbers"), pick: |settings_content| { settings_content @@ -2040,7 +2040,7 @@ fn editor_page() -> SettingsPage { title: "Relative Line Numbers", description: "Controls line number display in the editor's gutter. \"disabled\" shows absolute line numbers, \"enabled\" shows relative line numbers for each absolute line, and \"wrapped\" shows relative line numbers for every line, absolute or wrapped.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("relative_line_numbers"), pick: |settings_content| settings_content.editor.relative_line_numbers.as_ref(), write: |settings_content, value, _| { @@ -2054,7 +2054,7 @@ fn editor_page() -> SettingsPage { title: "Show Runnables", description: "Show runnable buttons in the gutter.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("gutter.runnables"), pick: |settings_content| { settings_content @@ -2078,7 +2078,7 @@ fn editor_page() -> SettingsPage { title: "Show Breakpoints", description: "Show breakpoints in the gutter.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("gutter.breakpoints"), pick: |settings_content| { settings_content @@ -2102,7 +2102,7 @@ fn editor_page() -> SettingsPage { title: "Show Bookmarks", description: "Show bookmarks in the gutter.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("gutter.bookmarks"), pick: |settings_content| { settings_content @@ -2126,7 +2126,7 @@ fn editor_page() -> SettingsPage { title: "Show Folds", description: "Show code folding controls in the gutter.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("gutter.folds"), pick: |settings_content| { settings_content @@ -2146,7 +2146,7 @@ fn editor_page() -> SettingsPage { title: "Min Line Number Digits", description: "Minimum number of characters to reserve space for in the gutter.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("gutter.min_line_number_digits"), pick: |settings_content| { settings_content @@ -2170,7 +2170,7 @@ fn editor_page() -> SettingsPage { title: "Inline Code Actions", description: "Show code action button at start of buffer line.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("inline_code_actions"), pick: |settings_content| settings_content.editor.inline_code_actions.as_ref(), write: |settings_content, value, _| { @@ -2190,7 +2190,7 @@ fn editor_page() -> SettingsPage { title: "Show", description: "When to show the scrollbar in the editor.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("scrollbar"), pick: |settings_content| { settings_content.editor.scrollbar.as_ref()?.show.as_ref() @@ -2210,7 +2210,7 @@ fn editor_page() -> SettingsPage { title: "Cursors", description: "Show cursor positions in the scrollbar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("scrollbar.cursors"), pick: |settings_content| { settings_content.editor.scrollbar.as_ref()?.cursors.as_ref() @@ -2230,7 +2230,7 @@ fn editor_page() -> SettingsPage { title: "Git Diff", description: "Show Git diff indicators in the scrollbar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("scrollbar.git_diff"), pick: |settings_content| { settings_content @@ -2255,7 +2255,7 @@ fn editor_page() -> SettingsPage { title: "Search Results", description: "Show buffer search result indicators in the scrollbar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("scrollbar.search_results"), pick: |settings_content| { settings_content @@ -2280,7 +2280,7 @@ fn editor_page() -> SettingsPage { title: "Selected Text", description: "Show selected text occurrences in the scrollbar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("scrollbar.selected_text"), pick: |settings_content| { settings_content @@ -2305,7 +2305,7 @@ fn editor_page() -> SettingsPage { title: "Selected Symbol", description: "Show selected symbol occurrences in the scrollbar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("scrollbar.selected_symbol"), pick: |settings_content| { settings_content @@ -2330,7 +2330,7 @@ fn editor_page() -> SettingsPage { title: "Diagnostics", description: "Which diagnostic indicators to show in the scrollbar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("scrollbar.diagnostics"), pick: |settings_content| { settings_content @@ -2355,7 +2355,7 @@ fn editor_page() -> SettingsPage { title: "Horizontal Scrollbar", description: "When false, forcefully disables the horizontal scrollbar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("scrollbar.axes.horizontal"), pick: |settings_content| { settings_content @@ -2384,7 +2384,7 @@ fn editor_page() -> SettingsPage { title: "Vertical Scrollbar", description: "When false, forcefully disables the vertical scrollbar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("scrollbar.axes.vertical"), pick: |settings_content| { settings_content @@ -2419,7 +2419,7 @@ fn editor_page() -> SettingsPage { title: "Show", description: "When to show the minimap in the editor.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("minimap.show"), pick: |settings_content| { settings_content.editor.minimap.as_ref()?.show.as_ref() @@ -2435,7 +2435,7 @@ fn editor_page() -> SettingsPage { title: "Display In", description: "Where to show the minimap in the editor.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("minimap.display_in"), pick: |settings_content| { settings_content @@ -2460,7 +2460,7 @@ fn editor_page() -> SettingsPage { title: "Thumb", description: "When to show the minimap thumb.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("minimap.thumb"), pick: |settings_content| { settings_content.editor.minimap.as_ref()?.thumb.as_ref() @@ -2480,7 +2480,7 @@ fn editor_page() -> SettingsPage { title: "Thumb Border", description: "Border style for the minimap's scrollbar thumb.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("minimap.thumb_border"), pick: |settings_content| { settings_content @@ -2505,7 +2505,7 @@ fn editor_page() -> SettingsPage { title: "Current Line Highlight", description: "How to highlight the current line in the minimap.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("minimap.current_line_highlight"), pick: |settings_content| { settings_content @@ -2530,7 +2530,7 @@ fn editor_page() -> SettingsPage { title: "Max Width Columns", description: "Maximum number of columns to display in the minimap.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("minimap.max_width_columns"), pick: |settings_content| { settings_content @@ -2561,7 +2561,7 @@ fn editor_page() -> SettingsPage { title: "Breadcrumbs", description: "Show breadcrumbs.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("toolbar.breadcrumbs"), pick: |settings_content| { settings_content @@ -2586,7 +2586,7 @@ fn editor_page() -> SettingsPage { title: "Quick Actions", description: "Show quick action buttons (e.g., search, selection, editor controls, etc.).", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("toolbar.quick_actions"), pick: |settings_content| { settings_content @@ -2611,7 +2611,7 @@ fn editor_page() -> SettingsPage { title: "Selections Menu", description: "Show the selections menu in the editor toolbar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("toolbar.selections_menu"), pick: |settings_content| { settings_content @@ -2636,7 +2636,7 @@ fn editor_page() -> SettingsPage { title: "Agent Review", description: "Show agent review buttons in the editor toolbar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("toolbar.agent_review"), pick: |settings_content| { settings_content @@ -2661,7 +2661,7 @@ fn editor_page() -> SettingsPage { title: "Code Actions", description: "Show code action buttons in the editor toolbar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("toolbar.code_actions"), pick: |settings_content| { settings_content @@ -2692,7 +2692,7 @@ fn editor_page() -> SettingsPage { title: "Default Mode", description: "The default mode when Vim starts.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("vim.default_mode"), pick: |settings_content| settings_content.vim.as_ref()?.default_mode.as_ref(), write: |settings_content, value, _| { @@ -2706,7 +2706,7 @@ fn editor_page() -> SettingsPage { title: "Toggle Relative Line Numbers", description: "Toggle relative line numbers in Vim mode.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("vim.toggle_relative_line_numbers"), pick: |settings_content| { settings_content @@ -2729,7 +2729,7 @@ fn editor_page() -> SettingsPage { title: "Use System Clipboard", description: "Controls when to use system clipboard in Vim mode.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("vim.use_system_clipboard"), pick: |settings_content| { settings_content.vim.as_ref()?.use_system_clipboard.as_ref() @@ -2748,7 +2748,7 @@ fn editor_page() -> SettingsPage { title: "Use Smartcase Find", description: "Enable smartcase searching in Vim mode.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("vim.use_smartcase_find"), pick: |settings_content| { settings_content.vim.as_ref()?.use_smartcase_find.as_ref() @@ -2767,7 +2767,7 @@ fn editor_page() -> SettingsPage { title: "Global Substitution Default", description: "When enabled, the :substitute command replaces all matches in a line by default. The 'g' flag then toggles this behavior.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("vim.gdefault"), pick: |settings_content| settings_content.vim.as_ref()?.gdefault.as_ref(), write: |settings_content, value, _| { @@ -2781,7 +2781,7 @@ fn editor_page() -> SettingsPage { title: "Highlight on Yank Duration", description: "Duration in milliseconds to highlight yanked text in Vim mode.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("vim.highlight_on_yank_duration"), pick: |settings_content| { settings_content @@ -2804,7 +2804,7 @@ fn editor_page() -> SettingsPage { title: "Regex Search", description: "Use regex search by default in Vim search.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("vim.use_regex_search"), pick: |settings_content| { settings_content.vim.as_ref()?.use_regex_search.as_ref() @@ -2823,7 +2823,7 @@ fn editor_page() -> SettingsPage { title: "Show Edit Predictions in Normal Mode", description: "Whether edit predictions are shown in normal mode. By default, edit predictions are only shown in insert and replace modes.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("vim.show_edit_predictions_in_normal_mode"), pick: |settings_content| { settings_content @@ -2846,7 +2846,7 @@ fn editor_page() -> SettingsPage { title: "Cursor Shape - Normal Mode", description: "Cursor shape for normal mode.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("vim.cursor_shape.normal"), pick: |settings_content| { settings_content @@ -2873,7 +2873,7 @@ fn editor_page() -> SettingsPage { title: "Cursor Shape - Insert Mode", description: "Cursor shape for insert mode. Inherit uses the editor's cursor shape.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("vim.cursor_shape.insert"), pick: |settings_content| { settings_content @@ -2900,7 +2900,7 @@ fn editor_page() -> SettingsPage { title: "Cursor Shape - Replace Mode", description: "Cursor shape for replace mode.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("vim.cursor_shape.replace"), pick: |settings_content| { settings_content @@ -2927,7 +2927,7 @@ fn editor_page() -> SettingsPage { title: "Cursor Shape - Visual Mode", description: "Cursor shape for visual mode.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("vim.cursor_shape.visual"), pick: |settings_content| { settings_content @@ -2955,7 +2955,7 @@ fn editor_page() -> SettingsPage { description: "Custom digraph mappings for Vim mode.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("vim.custom_digraphs"), pick: |settings_content| { settings_content.vim.as_ref()?.custom_digraphs.as_ref() @@ -3003,7 +3003,7 @@ fn languages_and_tools_page(cx: &App) -> SettingsPage { description: "A mapping from languages to files and file extensions that should be treated as that language.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("file_type_associations"), pick: |settings_content| { settings_content.project.all_languages.file_types.as_ref() @@ -3027,7 +3027,7 @@ fn languages_and_tools_page(cx: &App) -> SettingsPage { title: "Max Severity", description: "Which level to use to filter out diagnostics displayed in the editor.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("diagnostics_max_severity"), pick: |settings_content| { settings_content.editor.diagnostics_max_severity.as_ref() @@ -3043,7 +3043,7 @@ fn languages_and_tools_page(cx: &App) -> SettingsPage { title: "Include Warnings", description: "Whether to show warnings or not by default.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("diagnostics.include_warnings"), pick: |settings_content| { settings_content @@ -3072,7 +3072,7 @@ fn languages_and_tools_page(cx: &App) -> SettingsPage { title: "Enabled", description: "Whether to show diagnostics inline or not.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("diagnostics.inline.enabled"), pick: |settings_content| { settings_content @@ -3099,7 +3099,7 @@ fn languages_and_tools_page(cx: &App) -> SettingsPage { title: "Update Debounce", description: "The delay in milliseconds to show inline diagnostics after the last diagnostic update.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("diagnostics.inline.update_debounce_ms"), pick: |settings_content| { settings_content @@ -3126,7 +3126,7 @@ fn languages_and_tools_page(cx: &App) -> SettingsPage { title: "Padding", description: "The amount of padding between the end of the source line and the start of the inline diagnostic.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("diagnostics.inline.padding"), pick: |settings_content| { settings_content @@ -3153,7 +3153,7 @@ fn languages_and_tools_page(cx: &App) -> SettingsPage { title: "Minimum Column", description: "The minimum column at which to display inline diagnostics.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("diagnostics.inline.min_column"), pick: |settings_content| { settings_content @@ -3186,7 +3186,7 @@ fn languages_and_tools_page(cx: &App) -> SettingsPage { title: "Enabled", description: "Whether to pull for language server-powered diagnostics or not.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("diagnostics.lsp_pull_diagnostics.enabled"), pick: |settings_content| { settings_content @@ -3214,7 +3214,7 @@ fn languages_and_tools_page(cx: &App) -> SettingsPage { title: "Debounce", description: "Minimum time to wait before pulling diagnostics from the language server(s).", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("diagnostics.lsp_pull_diagnostics.debounce_ms"), pick: |settings_content| { settings_content @@ -3247,7 +3247,7 @@ fn languages_and_tools_page(cx: &App) -> SettingsPage { title: "Debounce", description: "The debounce delay before querying highlights from the language.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("lsp_highlight_debounce"), pick: |settings_content| { settings_content.editor.lsp_highlight_debounce.as_ref() @@ -3318,7 +3318,7 @@ fn search_and_files_page() -> SettingsPage { title: "Whole Word", description: "Search for whole words by default.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("search.whole_word"), pick: |settings_content| { settings_content.editor.search.as_ref()?.whole_word.as_ref() @@ -3338,7 +3338,7 @@ fn search_and_files_page() -> SettingsPage { title: "Case Sensitive", description: "Search case-sensitively by default.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("search.case_sensitive"), pick: |settings_content| { settings_content @@ -3363,7 +3363,7 @@ fn search_and_files_page() -> SettingsPage { title: "Use Smartcase Search", description: "Whether to automatically enable case-sensitive search based on the search query.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("use_smartcase_search"), pick: |settings_content| settings_content.editor.use_smartcase_search.as_ref(), write: |settings_content, value, _| { @@ -3377,7 +3377,7 @@ fn search_and_files_page() -> SettingsPage { title: "Include Ignored", description: "Include ignored files in search results by default.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("search.include_ignored"), pick: |settings_content| { settings_content @@ -3402,7 +3402,7 @@ fn search_and_files_page() -> SettingsPage { title: "Regex", description: "Use regex search by default.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("search.regex"), pick: |settings_content| { settings_content.editor.search.as_ref()?.regex.as_ref() @@ -3418,7 +3418,7 @@ fn search_and_files_page() -> SettingsPage { title: "Search Wrap", description: "Whether the editor search results will loop.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("search_wrap"), pick: |settings_content| settings_content.editor.search_wrap.as_ref(), write: |settings_content, value, _| { @@ -3432,7 +3432,7 @@ fn search_and_files_page() -> SettingsPage { title: "Center on Match", description: "Whether to center the current match in the editor", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("editor.search.center_on_match"), pick: |settings_content| { settings_content @@ -3456,7 +3456,7 @@ fn search_and_files_page() -> SettingsPage { title: "Seed Search Query From Cursor", description: "When to populate a new search's query based on the text under the cursor.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("seed_search_query_from_cursor"), pick: |settings_content| { settings_content @@ -3482,7 +3482,7 @@ fn search_and_files_page() -> SettingsPage { title: "Include Ignored in Search", description: "Use gitignored files when searching.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("file_finder.include_ignored"), pick: |settings_content| { settings_content @@ -3505,7 +3505,7 @@ fn search_and_files_page() -> SettingsPage { title: "File Icons", description: "Show file icons in the file finder.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("file_finder.file_icons"), pick: |settings_content| { settings_content.file_finder.as_ref()?.file_icons.as_ref() @@ -3524,7 +3524,7 @@ fn search_and_files_page() -> SettingsPage { title: "Modal Max Width", description: "Determines how much space the file finder can take up in relation to the available window width.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("file_finder.modal_max_width"), pick: |settings_content| { settings_content @@ -3547,7 +3547,7 @@ fn search_and_files_page() -> SettingsPage { title: "Skip Focus For Active In Search", description: "Whether the file finder should skip focus for the active file in search results.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("file_finder.skip_focus_for_active_in_search"), pick: |settings_content| { settings_content @@ -3577,7 +3577,7 @@ fn search_and_files_page() -> SettingsPage { description: "Files or globs of files that will be excluded by Zed entirely. They will be skipped during file scans, file searches, and not be displayed in the project file tree. Takes precedence over \"File Scan Inclusions\"", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("file_scan_exclusions"), pick: |settings_content| { settings_content @@ -3600,7 +3600,7 @@ fn search_and_files_page() -> SettingsPage { description: "Files or globs of files that will be included by Zed, even when ignored by git. This is useful for files that are not tracked by git, but are still important to your project. Note that globs that are overly broad can slow down Zed's file scanning. \"File Scan Exclusions\" takes precedence over these inclusions", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("file_scan_inclusions"), pick: |settings_content| { settings_content @@ -3623,7 +3623,7 @@ fn search_and_files_page() -> SettingsPage { description: "When to scan content of linked directories", field: Box::new(SettingField { json_path: Some("scan_symlinks"), - org_override: None, + organization_override: None, pick: |settings_content| { settings_content.project.worktree.scan_symlinks.as_ref() }, @@ -3638,7 +3638,7 @@ fn search_and_files_page() -> SettingsPage { title: "Restore File State", description: "Restore previous file state when reopening.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("restore_on_file_reopen"), pick: |settings_content| { settings_content.workspace.restore_on_file_reopen.as_ref() @@ -3654,7 +3654,7 @@ fn search_and_files_page() -> SettingsPage { title: "Close on File Delete", description: "Automatically close files that have been deleted.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("close_on_file_delete"), pick: |settings_content| { settings_content.workspace.close_on_file_delete.as_ref() @@ -3683,7 +3683,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Project Panel Button", description: "Show the project panel button in the status bar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("project_panel.button"), pick: |settings_content| { settings_content.project_panel.as_ref()?.button.as_ref() @@ -3702,7 +3702,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Active Language Button", description: "Show the active language button in the status bar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("status_bar.active_language_button"), pick: |settings_content| { settings_content @@ -3725,7 +3725,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Active Encoding Button", description: "Control when to show the active encoding in the status bar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("status_bar.active_encoding_button"), pick: |settings_content| { settings_content @@ -3748,7 +3748,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Cursor Position Button", description: "Show the cursor position button in the status bar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("status_bar.cursor_position_button"), pick: |settings_content| { settings_content @@ -3771,7 +3771,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Line Endings Button", description: "Show the active line endings button in the status bar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("status_bar.line_endings_button"), pick: |settings_content| { settings_content @@ -3794,7 +3794,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Terminal Button", description: "Show the terminal button in the status bar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.button"), pick: |settings_content| settings_content.terminal.as_ref()?.button.as_ref(), write: |settings_content, value, _| { @@ -3808,7 +3808,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Diagnostics Button", description: "Show the project diagnostics button in the status bar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("diagnostics.button"), pick: |settings_content| settings_content.diagnostics.as_ref()?.button.as_ref(), write: |settings_content, value, _| { @@ -3822,7 +3822,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Project Search Button", description: "Show the project search button in the status bar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("search.button"), pick: |settings_content| { settings_content.editor.search.as_ref()?.button.as_ref() @@ -3842,7 +3842,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Debugger Button", description: "Show the debugger button in the status bar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("debugger.button"), pick: |settings_content| settings_content.debugger.as_ref()?.button.as_ref(), write: |settings_content, value, _| { @@ -3856,7 +3856,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Active File Name", description: "Show the name of the active file in the status bar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("status_bar.show_active_file"), pick: |settings_content| { settings_content @@ -3885,7 +3885,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show Branch Status Icon", description: "Show git status indicators on the branch icon in the titlebar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("title_bar.show_branch_status_icon"), pick: |settings_content| { settings_content @@ -3908,7 +3908,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show Branch Name", description: "Show the branch name button in the titlebar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("title_bar.show_branch_name"), pick: |settings_content| { settings_content @@ -3931,7 +3931,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show Project Items", description: "Show the project host and name in the titlebar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("title_bar.show_project_items"), pick: |settings_content| { settings_content @@ -3954,7 +3954,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show Onboarding Banner", description: "Show banners announcing new features in the titlebar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("title_bar.show_onboarding_banner"), pick: |settings_content| { settings_content @@ -3977,7 +3977,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show Sign In", description: "Show the sign in button in the titlebar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("title_bar.show_sign_in"), pick: |settings_content| { settings_content.title_bar.as_ref()?.show_sign_in.as_ref() @@ -3996,7 +3996,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show User Menu", description: "Show the user menu button in the titlebar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("title_bar.show_user_menu"), pick: |settings_content| { settings_content.title_bar.as_ref()?.show_user_menu.as_ref() @@ -4015,7 +4015,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show User Picture", description: "Show user picture in the titlebar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("title_bar.show_user_picture"), pick: |settings_content| { settings_content @@ -4038,7 +4038,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show Menus", description: "Show the menus in the titlebar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("title_bar.show_menus"), pick: |settings_content| { settings_content.title_bar.as_ref()?.show_menus.as_ref() @@ -4060,7 +4060,7 @@ fn window_and_layout_page() -> SettingsPage { description: "(Linux only) choose how window control buttons are laid out in the titlebar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("title_bar.button_layout$"), pick: |settings_content| { Some( @@ -4141,7 +4141,7 @@ fn window_and_layout_page() -> SettingsPage { description: "GNOME-style layout string such as \"close:minimize,maximize\".", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("title_bar.button_layout"), pick: |settings_content| match settings_content .title_bar @@ -4181,7 +4181,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show Tab Bar", description: "Show the tab bar in the editor.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("tab_bar.show"), pick: |settings_content| settings_content.tab_bar.as_ref()?.show.as_ref(), write: |settings_content, value, _| { @@ -4195,7 +4195,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show Git Status In Tabs", description: "Show the Git file status on a tab item.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("tabs.git_status"), pick: |settings_content| settings_content.tabs.as_ref()?.git_status.as_ref(), write: |settings_content, value, _| { @@ -4209,7 +4209,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show File Icons In Tabs", description: "Show the file icon for a tab.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("tabs.file_icons"), pick: |settings_content| settings_content.tabs.as_ref()?.file_icons.as_ref(), write: |settings_content, value, _| { @@ -4223,7 +4223,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Tab Close Position", description: "Position of the close button in a tab.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("tabs.close_position"), pick: |settings_content| { settings_content.tabs.as_ref()?.close_position.as_ref() @@ -4243,7 +4243,7 @@ fn window_and_layout_page() -> SettingsPage { // is complex, so I'm going to come back to this later field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("max_tabs"), pick: |settings_content| settings_content.workspace.max_tabs.as_ref(), write: |settings_content, value, _| { @@ -4258,7 +4258,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show Navigation History Buttons", description: "Show the navigation history buttons in the tab bar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("tab_bar.show_nav_history_buttons"), pick: |settings_content| { settings_content @@ -4281,7 +4281,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show Tab Bar Buttons", description: "Show the tab bar buttons (New, Split Pane, Zoom).", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("tab_bar.show_tab_bar_buttons"), pick: |settings_content| { settings_content @@ -4304,7 +4304,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Pinned Tabs Layout", description: "Show pinned tabs in a separate row above unpinned tabs.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("tab_bar.show_pinned_tabs_in_separate_row"), pick: |settings_content| { settings_content @@ -4333,7 +4333,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Activate On Close", description: "What to do after closing the current tab.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("tabs.activate_on_close"), pick: |settings_content| { settings_content.tabs.as_ref()?.activate_on_close.as_ref() @@ -4352,7 +4352,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Tab Show Diagnostics", description: "Which files containing diagnostic errors/warnings to mark in the tabs.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("tabs.show_diagnostics"), pick: |settings_content| { settings_content.tabs.as_ref()?.show_diagnostics.as_ref() @@ -4371,7 +4371,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Show Close Button", description: "Controls the appearance behavior of the tab's close button.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("tabs.show_close_button"), pick: |settings_content| { settings_content.tabs.as_ref()?.show_close_button.as_ref() @@ -4396,7 +4396,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Preview Tabs Enabled", description: "Show opened editors as preview tabs.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("preview_tabs.enabled"), pick: |settings_content| { settings_content.preview_tabs.as_ref()?.enabled.as_ref() @@ -4415,7 +4415,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Enable Preview From Project Panel", description: "Whether to open tabs in preview mode when opened from the project panel with a single click.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("preview_tabs.enable_preview_from_project_panel"), pick: |settings_content| { settings_content @@ -4438,7 +4438,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Enable Preview From File Finder", description: "Whether to open tabs in preview mode when selected from the file finder.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("preview_tabs.enable_preview_from_file_finder"), pick: |settings_content| { settings_content @@ -4461,7 +4461,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Enable Preview From Multibuffer", description: "Whether to open tabs in preview mode when opened from a multibuffer.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("preview_tabs.enable_preview_from_multibuffer"), pick: |settings_content| { settings_content @@ -4484,7 +4484,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Enable Preview Multibuffer From Code Navigation", description: "Whether to open tabs in preview mode when code navigation is used to open a multibuffer.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("preview_tabs.enable_preview_multibuffer_from_code_navigation"), pick: |settings_content| { settings_content @@ -4507,7 +4507,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Enable Preview File From Code Navigation", description: "Whether to open tabs in preview mode when code navigation is used to open a single file.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("preview_tabs.enable_preview_file_from_code_navigation"), pick: |settings_content| { settings_content @@ -4530,7 +4530,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Enable Keep Preview On Code Navigation", description: "Whether to keep tabs in preview mode when code navigation is used to navigate away from them. If `enable_preview_file_from_code_navigation` or `enable_preview_multibuffer_from_code_navigation` is also true, the new tab may replace the existing one.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("preview_tabs.enable_keep_preview_on_code_navigation"), pick: |settings_content| { settings_content @@ -4559,7 +4559,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Bottom Dock Layout", description: "Layout mode for the bottom dock.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("bottom_dock_layout"), pick: |settings_content| settings_content.workspace.bottom_dock_layout.as_ref(), write: |settings_content, value, _| { @@ -4574,7 +4574,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Centered Layout Left Padding", description: "Left padding for centered layout.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("centered_layout.left_padding"), pick: |settings_content| { settings_content @@ -4599,7 +4599,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Centered Layout Right Padding", description: "Right padding for centered layout.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("centered_layout.right_padding"), pick: |settings_content| { settings_content @@ -4623,7 +4623,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Focus Follows Mouse", description: "Whether to change focus to a pane when the mouse hovers over it.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("focus_follows_mouse.enabled"), pick: |settings_content| { settings_content @@ -4647,7 +4647,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Focus Follows Mouse Debounce ms", description: "Amount of time to wait before changing focus.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("focus_follows_mouse.debounce_ms"), pick: |settings_content| { settings_content @@ -4678,7 +4678,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Use System Window Tabs", description: "(macOS only) whether to allow Windows to tab together.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("use_system_window_tabs"), pick: |settings_content| { settings_content.workspace.use_system_window_tabs.as_ref() @@ -4694,7 +4694,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Window Decorations", description: "(Linux only) whether Zed or your compositor should draw window decorations.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("window_decorations"), pick: |settings_content| settings_content.workspace.window_decorations.as_ref(), write: |settings_content, value, _| { @@ -4714,7 +4714,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Inactive Opacity", description: "Opacity of inactive panels (0.0 - 1.0).", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("active_pane_modifiers.inactive_opacity"), pick: |settings_content| { settings_content @@ -4739,7 +4739,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Border Size", description: "Size of the border surrounding the active pane.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("active_pane_modifiers.border_size"), pick: |settings_content| { settings_content @@ -4764,7 +4764,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Zoomed Padding", description: "Show padding for zoomed panes.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("zoomed_padding"), pick: |settings_content| settings_content.workspace.zoomed_padding.as_ref(), write: |settings_content, value, _| { @@ -4784,7 +4784,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Vertical Split Direction", description: "Direction to split vertically.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("pane_split_direction_vertical"), pick: |settings_content| { settings_content @@ -4803,7 +4803,7 @@ fn window_and_layout_page() -> SettingsPage { title: "Horizontal Split Direction", description: "Direction to split horizontally.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("pane_split_direction_horizontal"), pick: |settings_content| { settings_content @@ -4845,7 +4845,7 @@ fn panels_page() -> SettingsPage { title: "Project Panel Dock", description: "Where to dock the project panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("project_panel.dock"), pick: |settings_content| settings_content.project_panel.as_ref()?.dock.as_ref(), write: |settings_content, value, _| { @@ -4859,7 +4859,7 @@ fn panels_page() -> SettingsPage { title: "Project Panel Default Width", description: "Default width of the project panel in pixels.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("project_panel.default_width"), pick: |settings_content| { settings_content @@ -4882,7 +4882,7 @@ fn panels_page() -> SettingsPage { title: "Hide .gitignore", description: "Whether to hide the gitignore entries in the project panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("project_panel.hide_gitignore"), pick: |settings_content| { settings_content @@ -4905,7 +4905,7 @@ fn panels_page() -> SettingsPage { title: "Entry Spacing", description: "Spacing between worktree entries in the project panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("project_panel.entry_spacing"), pick: |settings_content| { settings_content @@ -4928,7 +4928,7 @@ fn panels_page() -> SettingsPage { title: "File Icons", description: "Show file icons in the project panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("project_panel.file_icons"), pick: |settings_content| { settings_content.project_panel.as_ref()?.file_icons.as_ref() @@ -4947,7 +4947,7 @@ fn panels_page() -> SettingsPage { title: "Folder Icons", description: "Whether to show folder icons or chevrons for directories in the project panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("project_panel.folder_icons"), pick: |settings_content| { settings_content @@ -4970,7 +4970,7 @@ fn panels_page() -> SettingsPage { title: "Git Status", description: "Show the Git status in the project panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("project_panel.git_status"), pick: |settings_content| { settings_content.project_panel.as_ref()?.git_status.as_ref() @@ -4989,7 +4989,7 @@ fn panels_page() -> SettingsPage { title: "Indent Size", description: "Amount of indentation for nested items.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("project_panel.indent_size"), pick: |settings_content| { settings_content @@ -5012,7 +5012,7 @@ fn panels_page() -> SettingsPage { title: "Auto Reveal Entries", description: "Whether to reveal entries in the project panel automatically when a corresponding project entry becomes active.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("project_panel.auto_reveal_entries"), pick: |settings_content| { settings_content @@ -5035,7 +5035,7 @@ fn panels_page() -> SettingsPage { title: "Starts Open", description: "Whether the project panel should open on startup.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("project_panel.starts_open"), pick: |settings_content| { settings_content @@ -5058,7 +5058,7 @@ fn panels_page() -> SettingsPage { title: "Auto Fold Directories", description: "Whether to fold directories automatically and show compact folders when a directory has only one subdirectory inside.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("project_panel.auto_fold_dirs"), pick: |settings_content| { settings_content @@ -5081,7 +5081,7 @@ fn panels_page() -> SettingsPage { title: "Bold Folder Labels", description: "Whether to show folder names with bold text in the project panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("project_panel.bold_folder_labels"), pick: |settings_content| { settings_content @@ -5104,7 +5104,7 @@ fn panels_page() -> SettingsPage { title: "Show Scrollbar", description: "Show the scrollbar in the project panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("project_panel.scrollbar.show"), pick: |settings_content| { show_scrollbar_or_editor(settings_content, |settings_content| { @@ -5133,7 +5133,7 @@ fn panels_page() -> SettingsPage { title: "Horizontal Scroll", description: "Whether to allow horizontal scrolling in the project panel. When disabled, the view is always locked to the leftmost position and long file names are clipped.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("project_panel.scrollbar.horizontal_scroll"), pick: |settings_content| { settings_content @@ -5160,7 +5160,7 @@ fn panels_page() -> SettingsPage { title: "Show Diagnostics", description: "Which files containing diagnostic errors/warnings to mark in the project panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("project_panel.show_diagnostics"), pick: |settings_content| { settings_content @@ -5183,7 +5183,7 @@ fn panels_page() -> SettingsPage { title: "Diagnostic Badges", description: "Show error and warning count badges next to file names in the project panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("project_panel.diagnostic_badges"), pick: |settings_content| { settings_content @@ -5206,7 +5206,7 @@ fn panels_page() -> SettingsPage { title: "Git Status Indicator", description: "Show a git status indicator next to file names in the project panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("project_panel.git_status_indicator"), pick: |settings_content| { settings_content @@ -5229,7 +5229,7 @@ fn panels_page() -> SettingsPage { title: "Sticky Scroll", description: "Whether to stick parent directories at top of the project panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("project_panel.sticky_scroll"), pick: |settings_content| { settings_content @@ -5253,7 +5253,7 @@ fn panels_page() -> SettingsPage { title: "Show Indent Guides", description: "Show indent guides in the project panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("project_panel.indent_guides.show"), pick: |settings_content| { settings_content @@ -5279,7 +5279,7 @@ fn panels_page() -> SettingsPage { title: "Drag and Drop", description: "Whether to enable drag-and-drop operations in the project panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("project_panel.drag_and_drop"), pick: |settings_content| { settings_content @@ -5302,7 +5302,7 @@ fn panels_page() -> SettingsPage { title: "Hide Root", description: "Whether to hide the root entry when only one folder is open in the window.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("project_panel.hide_root"), pick: |settings_content| { settings_content.project_panel.as_ref()?.hide_root.as_ref() @@ -5321,7 +5321,7 @@ fn panels_page() -> SettingsPage { title: "Hide Hidden", description: "Whether to hide the hidden entries in the project panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("project_panel.hide_hidden"), pick: |settings_content| { settings_content @@ -5344,7 +5344,7 @@ fn panels_page() -> SettingsPage { title: "Sort Mode", description: "Sort order for entries in the project panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("project_panel.sort_mode"), pick: |settings_content| { settings_content.project_panel.as_ref()?.sort_mode.as_ref() @@ -5363,7 +5363,7 @@ fn panels_page() -> SettingsPage { title: "Sort Order", description: "Whether to sort file and folder names case-sensitively in the project panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, pick: |settings_content| { settings_content.project_panel.as_ref()?.sort_order.as_ref() }, @@ -5382,7 +5382,7 @@ fn panels_page() -> SettingsPage { title: "Auto Open Files On Create", description: "Whether to automatically open newly created files in the editor.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("project_panel.auto_open.on_create"), pick: |settings_content| { settings_content @@ -5409,7 +5409,7 @@ fn panels_page() -> SettingsPage { title: "Auto Open Files On Paste", description: "Whether to automatically open files after pasting or duplicating them.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("project_panel.auto_open.on_paste"), pick: |settings_content| { settings_content @@ -5436,7 +5436,7 @@ fn panels_page() -> SettingsPage { title: "Auto Open Files On Drop", description: "Whether to automatically open files dropped from external sources.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("project_panel.auto_open.on_drop"), pick: |settings_content| { settings_content @@ -5464,7 +5464,7 @@ fn panels_page() -> SettingsPage { description: "Globs to match files that will be considered \"hidden\" and can be hidden from the project panel.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("worktree.hidden_files"), pick: |settings_content| { settings_content.project.worktree.hidden_files.as_ref() @@ -5488,7 +5488,7 @@ fn panels_page() -> SettingsPage { title: "Terminal Dock", description: "Where to dock the terminal panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.dock"), pick: |settings_content| settings_content.terminal.as_ref()?.dock.as_ref(), write: |settings_content, value, _| { @@ -5502,7 +5502,7 @@ fn panels_page() -> SettingsPage { title: "Terminal Panel Flexible Sizing", description: "Whether the terminal panel should use flexible (proportional) sizing when docked to the left or right.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.flexible"), pick: |settings_content| settings_content.terminal.as_ref()?.flexible.as_ref(), write: |settings_content, value, _| { @@ -5516,7 +5516,7 @@ fn panels_page() -> SettingsPage { title: "Show Count Badge", description: "Show a badge on the terminal panel icon with the count of open terminals.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.show_count_badge"), pick: |settings_content| { settings_content @@ -5545,7 +5545,7 @@ fn panels_page() -> SettingsPage { title: "Outline Panel Button", description: "Show the outline panel button in the status bar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("outline_panel.button"), pick: |settings_content| { settings_content.outline_panel.as_ref()?.button.as_ref() @@ -5564,7 +5564,7 @@ fn panels_page() -> SettingsPage { title: "Outline Panel Dock", description: "Where to dock the outline panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("outline_panel.dock"), pick: |settings_content| settings_content.outline_panel.as_ref()?.dock.as_ref(), write: |settings_content, value, _| { @@ -5578,7 +5578,7 @@ fn panels_page() -> SettingsPage { title: "Outline Panel Default Width", description: "Default width of the outline panel in pixels.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("outline_panel.default_width"), pick: |settings_content| { settings_content @@ -5601,7 +5601,7 @@ fn panels_page() -> SettingsPage { title: "File Icons", description: "Show file icons in the outline panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("outline_panel.file_icons"), pick: |settings_content| { settings_content.outline_panel.as_ref()?.file_icons.as_ref() @@ -5620,7 +5620,7 @@ fn panels_page() -> SettingsPage { title: "Folder Icons", description: "Whether to show folder icons or chevrons for directories in the outline panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("outline_panel.folder_icons"), pick: |settings_content| { settings_content @@ -5643,7 +5643,7 @@ fn panels_page() -> SettingsPage { title: "Git Status", description: "Show the Git status in the outline panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("outline_panel.git_status"), pick: |settings_content| { settings_content.outline_panel.as_ref()?.git_status.as_ref() @@ -5662,7 +5662,7 @@ fn panels_page() -> SettingsPage { title: "Indent Size", description: "Amount of indentation for nested items.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("outline_panel.indent_size"), pick: |settings_content| { settings_content @@ -5685,7 +5685,7 @@ fn panels_page() -> SettingsPage { title: "Auto Reveal Entries", description: "Whether to reveal when a corresponding outline entry becomes active.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("outline_panel.auto_reveal_entries"), pick: |settings_content| { settings_content @@ -5708,7 +5708,7 @@ fn panels_page() -> SettingsPage { title: "Auto Fold Directories", description: "Whether to fold directories automatically when a directory contains only one subdirectory.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("outline_panel.auto_fold_dirs"), pick: |settings_content| { settings_content @@ -5732,7 +5732,7 @@ fn panels_page() -> SettingsPage { title: "Show Indent Guides", description: "When to show indent guides in the outline panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("outline_panel.indent_guides.show"), pick: |settings_content| { settings_content @@ -5764,7 +5764,7 @@ fn panels_page() -> SettingsPage { title: "Git Panel Button", description: "Show the Git panel button in the status bar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("git_panel.button"), pick: |settings_content| settings_content.git_panel.as_ref()?.button.as_ref(), write: |settings_content, value, _| { @@ -5778,7 +5778,7 @@ fn panels_page() -> SettingsPage { title: "Git Panel Dock", description: "Where to dock the Git panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("git_panel.dock"), pick: |settings_content| settings_content.git_panel.as_ref()?.dock.as_ref(), write: |settings_content, value, _| { @@ -5792,7 +5792,7 @@ fn panels_page() -> SettingsPage { title: "Git Panel Default Width", description: "Default width of the Git panel in pixels.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("git_panel.default_width"), pick: |settings_content| { settings_content.git_panel.as_ref()?.default_width.as_ref() @@ -5811,7 +5811,7 @@ fn panels_page() -> SettingsPage { title: "Git Panel Status Style", description: "How entry statuses are displayed.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("git_panel.status_style"), pick: |settings_content| { settings_content.git_panel.as_ref()?.status_style.as_ref() @@ -5830,7 +5830,7 @@ fn panels_page() -> SettingsPage { title: "Fallback Branch Name", description: "Default branch name will be when init.defaultbranch is not set in Git.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("git_panel.fallback_branch_name"), pick: |settings_content| { settings_content @@ -5853,7 +5853,7 @@ fn panels_page() -> SettingsPage { title: "Sort By Path", description: "Enable to sort entries in the panel by path, disable to sort by status.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("git_panel.sort_by_path"), pick: |settings_content| { settings_content.git_panel.as_ref()?.sort_by_path.as_ref() @@ -5872,7 +5872,7 @@ fn panels_page() -> SettingsPage { title: "Collapse Untracked Diff", description: "Whether to collapse untracked files in the diff panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("git_panel.collapse_untracked_diff"), pick: |settings_content| { settings_content @@ -5895,7 +5895,7 @@ fn panels_page() -> SettingsPage { title: "Tree View", description: "Enable to show entries in tree view list, disable to show in flat view list.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("git_panel.tree_view"), pick: |settings_content| { settings_content.git_panel.as_ref()?.tree_view.as_ref() @@ -5911,7 +5911,7 @@ fn panels_page() -> SettingsPage { title: "File Icons", description: "Show file icons next to the Git status icon.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("git_panel.file_icons"), pick: |settings_content| { settings_content.git_panel.as_ref()?.file_icons.as_ref() @@ -5930,7 +5930,7 @@ fn panels_page() -> SettingsPage { title: "Folder Icons", description: "Whether to show folder icons or chevrons for directories in the git panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("git_panel.folder_icons"), pick: |settings_content| { settings_content.git_panel.as_ref()?.folder_icons.as_ref() @@ -5949,7 +5949,7 @@ fn panels_page() -> SettingsPage { title: "Diff Stats", description: "Whether to show the addition/deletion change count next to each file in the Git panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("git_panel.diff_stats"), pick: |settings_content| { settings_content.git_panel.as_ref()?.diff_stats.as_ref() @@ -5968,7 +5968,7 @@ fn panels_page() -> SettingsPage { title: "Show Count Badge", description: "Whether to show a badge on the git panel icon with the count of uncommitted changes.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("git_panel.show_count_badge"), pick: |settings_content| { settings_content @@ -5991,7 +5991,7 @@ fn panels_page() -> SettingsPage { title: "Commit Title Max Length", description: "Maximum length of the commit message title before a warning is shown. Set to 0 to disable.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("git_panel.commit_title_max_length"), pick: |settings_content| { settings_content @@ -6014,7 +6014,7 @@ fn panels_page() -> SettingsPage { title: "Scroll Bar", description: "How and when the scrollbar should be displayed.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("git_panel.scrollbar.show"), pick: |settings_content| { show_scrollbar_or_editor(settings_content, |settings_content| { @@ -6049,7 +6049,7 @@ fn panels_page() -> SettingsPage { title: "Debugger Panel Dock", description: "The dock position of the debug panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("debugger.dock"), pick: |settings_content| settings_content.debugger.as_ref()?.dock.as_ref(), write: |settings_content, value, _| { @@ -6069,7 +6069,7 @@ fn panels_page() -> SettingsPage { title: "Collaboration Panel Button", description: "Show the collaboration panel button in the status bar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("collaboration_panel.button"), pick: |settings_content| { settings_content @@ -6092,7 +6092,7 @@ fn panels_page() -> SettingsPage { title: "Collaboration Panel Dock", description: "Where to dock the collaboration panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("collaboration_panel.dock"), pick: |settings_content| { settings_content.collaboration_panel.as_ref()?.dock.as_ref() @@ -6111,7 +6111,7 @@ fn panels_page() -> SettingsPage { title: "Collaboration Panel Default Width", description: "Default width of the collaboration panel in pixels.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("collaboration_panel.dock"), pick: |settings_content| { settings_content @@ -6140,7 +6140,7 @@ fn panels_page() -> SettingsPage { title: "Agent Panel Button", description: "Whether to show the agent panel button in the status bar.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("agent.button"), pick: |settings_content| settings_content.agent.as_ref()?.button.as_ref(), write: |settings_content, value, _| { @@ -6154,7 +6154,7 @@ fn panels_page() -> SettingsPage { title: "Agent Panel Dock", description: "Where to dock the agent panel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("agent.dock"), pick: |settings_content| settings_content.agent.as_ref()?.dock.as_ref(), write: |settings_content, value, _| { @@ -6168,7 +6168,7 @@ fn panels_page() -> SettingsPage { title: "Agent Panel Flexible Sizing", description: "Whether the agent panel should use flexible (proportional) sizing when docked to the left or right.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("agent.flexible"), pick: |settings_content| settings_content.agent.as_ref()?.flexible.as_ref(), write: |settings_content, value, _| { @@ -6182,7 +6182,7 @@ fn panels_page() -> SettingsPage { title: "Agent Panel Default Width", description: "Default width when the agent panel is docked to the left or right.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("agent.default_width"), pick: |settings_content| { settings_content.agent.as_ref()?.default_width.as_ref() @@ -6198,7 +6198,7 @@ fn panels_page() -> SettingsPage { title: "Agent Panel Default Height", description: "Default height when the agent panel is docked to the bottom.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("agent.default_height"), pick: |settings_content| { settings_content.agent.as_ref()?.default_height.as_ref() @@ -6219,7 +6219,7 @@ fn panels_page() -> SettingsPage { title: "Limit Content Width", description: "Whether to constrain the agent panel content to a maximum width, centering it when the panel is wider, for optimal readability.", field: Box::new(SettingField:: { - org_override: None, + organization_override: None, json_path: Some("agent.limit_content_width"), pick: |settings_content| { settings_content @@ -6252,7 +6252,7 @@ fn panels_page() -> SettingsPage { title: "Max Content Width", description: "Maximum content width in pixels. Content will be centered when the panel is wider than this value.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("agent.max_content_width"), pick: |settings_content| { settings_content.agent.as_ref()?.max_content_width.as_ref() @@ -6293,7 +6293,7 @@ fn debugger_page() -> SettingsPage { title: "Stepping Granularity", description: "Determines the stepping granularity for debug operations.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("debugger.stepping_granularity"), pick: |settings_content| { settings_content @@ -6316,7 +6316,7 @@ fn debugger_page() -> SettingsPage { title: "Save Breakpoints", description: "Whether breakpoints should be reused across Zed sessions.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("debugger.save_breakpoints"), pick: |settings_content| { settings_content @@ -6339,7 +6339,7 @@ fn debugger_page() -> SettingsPage { title: "Timeout", description: "Time in milliseconds until timeout error when connecting to a TCP debug adapter.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("debugger.timeout"), pick: |settings_content| settings_content.debugger.as_ref()?.timeout.as_ref(), write: |settings_content, value, _| { @@ -6353,7 +6353,7 @@ fn debugger_page() -> SettingsPage { title: "Log DAP Communications", description: "Whether to log messages between active debug adapters and Zed.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("debugger.log_dap_communications"), pick: |settings_content| { settings_content @@ -6376,7 +6376,7 @@ fn debugger_page() -> SettingsPage { title: "Format DAP Log Messages", description: "Whether to format DAP messages when adding them to debug adapter logger.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("debugger.format_dap_log_messages"), pick: |settings_content| { settings_content @@ -6414,7 +6414,7 @@ fn terminal_page() -> SettingsPage { title: "Shell", description: "What shell to use when opening a terminal.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.shell$"), pick: |settings_content| { Some(&dynamic_variants::()[ @@ -6496,7 +6496,7 @@ fn terminal_page() -> SettingsPage { title: "Program", description: "The shell program to use.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.shell"), pick: |settings_content| match settings_content.terminal.as_ref()?.project.shell.as_ref() { @@ -6527,7 +6527,7 @@ fn terminal_page() -> SettingsPage { title: "Program", description: "The shell program to run.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.shell.program"), pick: |settings_content| { match settings_content.terminal.as_ref()?.project.shell.as_ref() { @@ -6561,7 +6561,7 @@ fn terminal_page() -> SettingsPage { description: "The arguments to pass to the shell program.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.shell.args"), pick: |settings_content| { match settings_content.terminal.as_ref()?.project.shell.as_ref() { @@ -6594,7 +6594,7 @@ fn terminal_page() -> SettingsPage { title: "Title Override", description: "An optional string to override the title of the terminal tab.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.shell.title_override"), pick: |settings_content| { match settings_content.terminal.as_ref()?.project.shell.as_ref() { @@ -6631,7 +6631,7 @@ fn terminal_page() -> SettingsPage { title: "Working Directory", description: "What working directory to use when launching the terminal.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.working_directory$"), pick: |settings_content| { Some(&dynamic_variants::()[ @@ -6705,7 +6705,7 @@ fn terminal_page() -> SettingsPage { title: "Directory", description: "The directory path to use (will be shell expanded).", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.working_directory.always"), pick: |settings_content| { match settings_content.terminal.as_ref()?.project.working_directory.as_ref() { @@ -6737,7 +6737,7 @@ fn terminal_page() -> SettingsPage { description: "Key-value pairs to add to the terminal's environment.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.env"), pick: |settings_content| settings_content.terminal.as_ref()?.project.env.as_ref(), write: |settings_content, value, _| { @@ -6754,7 +6754,7 @@ fn terminal_page() -> SettingsPage { description: "Activates the Python virtual environment, if one is found, in the terminal's working directory.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.detect_venv"), pick: |settings_content| settings_content.terminal.as_ref()?.project.detect_venv.as_ref(), write: |settings_content, value, _| { @@ -6780,7 +6780,7 @@ fn terminal_page() -> SettingsPage { title: "Font Size", description: "Font size for terminal text. If not set, defaults to buffer font size.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.font_size"), pick: |settings_content| { settings_content @@ -6800,7 +6800,7 @@ fn terminal_page() -> SettingsPage { title: "Font Family", description: "Font family for terminal text. If not set, defaults to buffer font family.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.font_family"), pick: |settings_content| { settings_content @@ -6824,7 +6824,7 @@ fn terminal_page() -> SettingsPage { description: "Font fallbacks for terminal text. If not set, defaults to buffer font fallbacks.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.font_fallbacks"), pick: |settings_content| { settings_content @@ -6849,7 +6849,7 @@ fn terminal_page() -> SettingsPage { title: "Font Weight", description: "Font weight for terminal text in CSS weight units (100-900).", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.font_weight"), pick: |settings_content| { settings_content.terminal.as_ref()?.font_weight.as_ref() @@ -6869,7 +6869,7 @@ fn terminal_page() -> SettingsPage { description: "Font features for terminal text.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.font_features"), pick: |settings_content| { settings_content @@ -6901,7 +6901,7 @@ fn terminal_page() -> SettingsPage { description: "Line height for terminal text.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.line_height"), pick: |settings_content| { settings_content.terminal.as_ref()?.line_height.as_ref() @@ -6922,7 +6922,7 @@ fn terminal_page() -> SettingsPage { title: "Cursor Shape", description: "Default cursor shape for the terminal (bar, block, underline, or hollow).", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.cursor_shape"), pick: |settings_content| { settings_content.terminal.as_ref()?.cursor_shape.as_ref() @@ -6941,7 +6941,7 @@ fn terminal_page() -> SettingsPage { title: "Cursor Blinking", description: "Sets the cursor blinking behavior in the terminal.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.blinking"), pick: |settings_content| settings_content.terminal.as_ref()?.blinking.as_ref(), write: |settings_content, value, _| { @@ -6955,7 +6955,7 @@ fn terminal_page() -> SettingsPage { title: "Alternate Scroll", description: "Whether alternate scroll mode is active by default (converts mouse scroll to arrow keys in apps like Vim).", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.alternate_scroll"), pick: |settings_content| { settings_content @@ -6978,7 +6978,7 @@ fn terminal_page() -> SettingsPage { title: "Minimum Contrast", description: "The minimum APCA perceptual contrast between foreground and background colors (0-106).", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.minimum_contrast"), pick: |settings_content| { settings_content @@ -7007,7 +7007,7 @@ fn terminal_page() -> SettingsPage { title: "Option As Meta", description: "Whether the option key behaves as the meta key.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.option_as_meta"), pick: |settings_content| { settings_content.terminal.as_ref()?.option_as_meta.as_ref() @@ -7026,7 +7026,7 @@ fn terminal_page() -> SettingsPage { title: "Copy On Select", description: "Whether selecting text in the terminal automatically copies to the system clipboard.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.copy_on_select"), pick: |settings_content| { settings_content.terminal.as_ref()?.copy_on_select.as_ref() @@ -7045,7 +7045,7 @@ fn terminal_page() -> SettingsPage { title: "Keep Selection On Copy", description: "Whether to keep the text selection after copying it to the clipboard.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.keep_selection_on_copy"), pick: |settings_content| { settings_content @@ -7068,7 +7068,7 @@ fn terminal_page() -> SettingsPage { title: "Audible Bell", description: "Whether to play a sound when the BEL character (`\\a`, `0x07`) is printed", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.bell"), pick: |settings_content| settings_content.terminal.as_ref()?.bell.as_ref(), write: |settings_content, value, _| { @@ -7088,7 +7088,7 @@ fn terminal_page() -> SettingsPage { title: "Default Width", description: "Default width when the terminal is docked to the left or right (in pixels).", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.default_width"), pick: |settings_content| { settings_content.terminal.as_ref()?.default_width.as_ref() @@ -7107,7 +7107,7 @@ fn terminal_page() -> SettingsPage { title: "Default Height", description: "Default height when the terminal is docked to the bottom (in pixels).", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.default_height"), pick: |settings_content| { settings_content.terminal.as_ref()?.default_height.as_ref() @@ -7132,7 +7132,7 @@ fn terminal_page() -> SettingsPage { title: "Max Scroll History Lines", description: "Maximum number of lines to keep in scrollback history (max: 100,000; 0 disables scrolling).", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.max_scroll_history_lines"), pick: |settings_content| { settings_content @@ -7155,7 +7155,7 @@ fn terminal_page() -> SettingsPage { title: "Scroll Multiplier", description: "The multiplier for scrolling in the terminal with the mouse wheel", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.scroll_multiplier"), pick: |settings_content| { settings_content @@ -7184,7 +7184,7 @@ fn terminal_page() -> SettingsPage { title: "Breadcrumbs", description: "Display the terminal title in breadcrumbs inside the terminal pane.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.toolbar.breadcrumbs"), pick: |settings_content| { settings_content @@ -7217,7 +7217,7 @@ fn terminal_page() -> SettingsPage { title: "Show Scrollbar", description: "When to show the scrollbar in the terminal.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("terminal.scrollbar.show"), pick: |settings_content| { show_scrollbar_or_editor(settings_content, |settings_content| { @@ -7270,7 +7270,7 @@ fn version_control_page() -> SettingsPage { title: "Disable Git Integration", description: "Disable all Git integration features in Zed.", field: Box::new(SettingField:: { - org_override: None, + organization_override: None, json_path: Some("git.disable_git"), pick: |settings_content| { settings_content @@ -7310,7 +7310,7 @@ fn version_control_page() -> SettingsPage { title: "Enable Git Status", description: "Show Git status information in the editor.", field: Box::new(SettingField:: { - org_override: None, + organization_override: None, json_path: Some("git.enable_status"), pick: |settings_content| { settings_content @@ -7337,7 +7337,7 @@ fn version_control_page() -> SettingsPage { title: "Enable Git Diff", description: "Show Git diff information in the editor.", field: Box::new(SettingField:: { - org_override: None, + organization_override: None, json_path: Some("git.enable_diff"), pick: |settings_content| { settings_content @@ -7372,7 +7372,7 @@ fn version_control_page() -> SettingsPage { title: "Visibility", description: "Control whether Git status is shown in the editor's gutter.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("git.git_gutter"), pick: |settings_content| settings_content.git.as_ref()?.git_gutter.as_ref(), write: |settings_content, value, _| { @@ -7387,7 +7387,7 @@ fn version_control_page() -> SettingsPage { title: "Debounce", description: "Debounce threshold in milliseconds after which changes are reflected in the Git gutter.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("git.gutter_debounce"), pick: |settings_content| { settings_content.git.as_ref()?.gutter_debounce.as_ref() @@ -7409,7 +7409,7 @@ fn version_control_page() -> SettingsPage { title: "Enabled", description: "Whether or not to show Git blame data inline in the currently focused line.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("git.inline_blame.enabled"), pick: |settings_content| { settings_content @@ -7436,7 +7436,7 @@ fn version_control_page() -> SettingsPage { title: "Delay", description: "The delay after which the inline blame information is shown.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("git.inline_blame.delay_ms"), pick: |settings_content| { settings_content @@ -7463,7 +7463,7 @@ fn version_control_page() -> SettingsPage { title: "Padding", description: "Padding between the end of the source line and the start of the inline blame in columns.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("git.inline_blame.padding"), pick: |settings_content| { settings_content @@ -7490,7 +7490,7 @@ fn version_control_page() -> SettingsPage { title: "Minimum Column", description: "The minimum column number at which to show the inline blame information.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("git.inline_blame.min_column"), pick: |settings_content| { settings_content @@ -7517,7 +7517,7 @@ fn version_control_page() -> SettingsPage { title: "Show Commit Summary", description: "Show commit summary as part of the inline blame.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("git.inline_blame.show_commit_summary"), pick: |settings_content| { settings_content @@ -7550,7 +7550,7 @@ fn version_control_page() -> SettingsPage { title: "Show Avatar", description: "Show the avatar of the author of the commit.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("git.blame.show_avatar"), pick: |settings_content| { settings_content @@ -7583,7 +7583,7 @@ fn version_control_page() -> SettingsPage { title: "Show Author Name", description: "Show author name as part of the commit information in branch picker.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("git.branch_picker.show_author_name"), pick: |settings_content| { settings_content @@ -7616,7 +7616,7 @@ fn version_control_page() -> SettingsPage { title: "Hunk Style", description: "How Git hunks are displayed visually in the editor.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("git.hunk_style"), pick: |settings_content| settings_content.git.as_ref()?.hunk_style.as_ref(), write: |settings_content, value, _| { @@ -7630,7 +7630,7 @@ fn version_control_page() -> SettingsPage { title: "Path Style", description: "Should the name or path be displayed first in the git view.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("git.path_style"), pick: |settings_content| settings_content.git.as_ref()?.path_style.as_ref(), write: |settings_content, value, _| { @@ -7644,7 +7644,7 @@ fn version_control_page() -> SettingsPage { title: "Show Stage/Restore Buttons", description: "Whether to show the stage and restore buttons on diff hunks.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("git.show_stage_restore_buttons"), pick: |settings_content| { settings_content @@ -7687,7 +7687,7 @@ fn collaboration_page() -> SettingsPage { title: "Mute On Join", description: "Whether the microphone should be muted when joining a channel or a call.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("calls.mute_on_join"), pick: |settings_content| settings_content.calls.as_ref()?.mute_on_join.as_ref(), write: |settings_content, value, _| { @@ -7701,7 +7701,7 @@ fn collaboration_page() -> SettingsPage { title: "Share On Join", description: "Whether your current project should be shared when joining an empty channel.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("calls.share_on_join"), pick: |settings_content| { settings_content.calls.as_ref()?.share_on_join.as_ref() @@ -7731,7 +7731,7 @@ fn collaboration_page() -> SettingsPage { title: "Output Audio Device", description: "Select output audio device", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("audio.experimental.output_audio_device"), pick: |settings_content| { settings_content @@ -7755,7 +7755,7 @@ fn collaboration_page() -> SettingsPage { title: "Input Audio Device", description: "Select input audio device", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("audio.experimental.input_audio_device"), pick: |settings_content| { settings_content @@ -7792,7 +7792,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Disable AI", description: "Whether to disable all AI features in Zed.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("disable_ai"), pick: |settings_content| settings_content.project.disable_ai.as_ref(), write: |settings_content, value, _| { @@ -7806,7 +7806,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Threads Sidebar Side", description: "Which side of the window the threads sidebar appears on.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("agent.sidebar_side"), pick: |settings_content| settings_content.agent.as_ref()?.sidebar_side.as_ref(), write: |settings_content, value, _| { @@ -7847,7 +7847,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Single File Review", description: "When enabled, agent edits will also be displayed in single-file buffers for review.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("agent.single_file_review"), pick: |settings_content| { settings_content.agent.as_ref()?.single_file_review.as_ref() @@ -7866,7 +7866,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Enable Feedback", description: "Show voting thumbs up/down icon buttons for feedback on agent edits.", field: Box::new(SettingField { - org_override: Some(|org_config| if org_config.is_agent_thread_feedback_enabled { + organization_override: Some(|org_config| if org_config.is_agent_thread_feedback_enabled { None } else { Some(&false) @@ -7889,7 +7889,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Notify When Agent Waiting", description: "Where to show notifications when the agent has completed its response or needs confirmation before running a tool action.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("agent.notify_when_agent_waiting"), pick: |settings_content| { settings_content @@ -7912,7 +7912,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Play Sound When Agent Done", description: "When to play a sound when the agent has either completed its response, or needs user input.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("agent.play_sound_when_agent_done"), pick: |settings_content| { settings_content @@ -7935,7 +7935,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Expand Edit Card", description: "Whether to have edit cards in the agent panel expanded, showing a Preview of the diff.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("agent.expand_edit_card"), pick: |settings_content| { settings_content.agent.as_ref()?.expand_edit_card.as_ref() @@ -7954,7 +7954,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Expand Terminal Card", description: "Whether to have terminal cards in the agent panel expanded, showing the whole command output.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("agent.expand_terminal_card"), pick: |settings_content| { settings_content @@ -7977,7 +7977,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Thinking Display", description: "How thinking blocks should be displayed by default. 'Auto' fully expands during streaming, then auto-collapses when done. 'Preview' auto-expands with a height constraint during streaming. 'Always Expanded' shows full content. 'Always Collapsed' keeps them collapsed.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("agent.thinking_display"), pick: |settings_content| { settings_content @@ -8000,7 +8000,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Cancel Generation On Terminal Stop", description: "Whether clicking the stop button on a running terminal tool should also cancel the agent's generation. Note that this only applies to the stop button, not to ctrl+c inside the terminal.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("agent.cancel_generation_on_terminal_stop"), pick: |settings_content| { settings_content @@ -8023,7 +8023,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Use Modifier To Send", description: "Whether to always use cmd-enter (or ctrl-enter on Linux or Windows) to send messages.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("agent.use_modifier_to_send"), pick: |settings_content| { settings_content @@ -8046,7 +8046,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Message Editor Min Lines", description: "Minimum number of lines to display in the agent message editor.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("agent.message_editor_min_lines"), pick: |settings_content| { settings_content @@ -8069,7 +8069,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Show Turn Stats", description: "Whether to show turn statistics like elapsed time during generation and final turn duration.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("agent.show_turn_stats"), pick: |settings_content| { settings_content.agent.as_ref()?.show_turn_stats.as_ref() @@ -8088,7 +8088,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Show Merge Conflict Indicator", description: "Whether to show the merge conflict indicator in the status bar that offers to resolve conflicts using the agent.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("agent.show_merge_conflict_indicator"), pick: |settings_content| { settings_content.agent.as_ref()?.show_merge_conflict_indicator.as_ref() @@ -8115,7 +8115,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Context Server Timeout", description: "Default timeout in seconds for context server tool calls. Can be overridden per-server in context_servers configuration.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("context_server_timeout"), pick: |settings_content| { settings_content.project.context_server_timeout.as_ref() @@ -8135,7 +8135,7 @@ fn ai_page(cx: &App) -> SettingsPage { title: "Display Mode", description: "When to show edit predictions previews in buffer. The eager mode displays them inline, while the subtle mode displays them only when holding a modifier key.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("edit_prediction.display_mode"), pick: |settings_content| { settings_content @@ -8180,7 +8180,7 @@ fn network_page() -> SettingsPage { title: "Proxy", description: "The proxy to use for network requests.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("proxy"), pick: |settings_content| settings_content.proxy.as_ref(), write: |settings_content, value, _| { @@ -8197,7 +8197,7 @@ fn network_page() -> SettingsPage { title: "Server URL", description: "The URL of the Zed server to connect to.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("server_url"), pick: |settings_content| settings_content.server_url.as_ref(), write: |settings_content, value, _| { @@ -8262,7 +8262,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Tab Size", description: "How many columns a tab should occupy.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).tab_size"), // TODO(cameron): not JQ syntax because not URL-safe pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8282,7 +8282,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Hard Tabs", description: "Whether to indent lines using tab characters, as opposed to multiple spaces.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).hard_tabs"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8302,7 +8302,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Auto Indent", description: "Controls automatic indentation behavior when typing.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).auto_indent"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8322,7 +8322,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Auto Indent On Paste", description: "Whether indentation of pasted content should be adjusted based on the context.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).auto_indent_on_paste"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8348,7 +8348,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Soft Wrap", description: "How to soft-wrap long lines of text.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).soft_wrap"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8368,7 +8368,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Show Wrap Guides", description: "Show wrap guides in the editor.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).show_wrap_guides"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8388,7 +8388,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Preferred Line Length", description: "The column at which to soft-wrap lines, for buffers where soft-wrap is enabled.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).preferred_line_length"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8409,7 +8409,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { description: "Character counts at which to show wrap guides in the editor.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).wrap_guides"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8435,7 +8435,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Allow Rewrap", description: "Controls where the `editor::rewrap` action is allowed for this language.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).allow_rewrap"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8461,7 +8461,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Enabled", description: "Display indent guides in the editor.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).indent_guides.enabled"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8484,7 +8484,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Line Width", description: "The width of the indent guides in pixels, between 1 and 10.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).indent_guides.line_width"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8507,7 +8507,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Active Line Width", description: "The width of the active indent guide in pixels, between 1 and 10.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).indent_guides.active_line_width"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8533,7 +8533,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Coloring", description: "Determines how indent guides are colored.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).indent_guides.coloring"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8556,7 +8556,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Background Coloring", description: "Determines how indent guide backgrounds are colored.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).indent_guides.background_coloring"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8589,7 +8589,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { field: Box::new( // TODO(settings_ui): this setting should just be a bool SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).format_on_save"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8614,7 +8614,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Remove Trailing Whitespace On Save", description: "Whether or not to remove any trailing whitespace from lines of a buffer before saving it.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).remove_trailing_whitespace_on_save"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8634,7 +8634,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Ensure Final Newline On Save", description: "Whether or not to ensure there's a single newline at the end of a buffer when saving it.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).ensure_final_newline_on_save"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8654,7 +8654,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Line Ending", description: "How line endings should be handled for new files and during format and save operations.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).line_ending"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8678,7 +8678,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { description: "How to perform a buffer format.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).formatter"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8704,7 +8704,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Use On Type Format", description: "Whether to use additional LSP queries to format (and amend) the code after every \"trigger\" symbol input, defined by LSP server capabilities", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).use_on_type_format"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8725,7 +8725,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { description: "Additional code actions to run when formatting.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).code_actions_on_format"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8757,7 +8757,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Use Autoclose", description: "Whether to automatically type closing characters for you. For example, when you type '(', Zed will automatically add a closing ')' at the correct position.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).use_autoclose"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8777,7 +8777,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Use Auto Surround", description: "Whether to automatically surround text with characters for you. For example, when you select text and type '(', Zed will automatically surround text with ().", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).use_auto_surround"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8797,7 +8797,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Always Treat Brackets As Autoclosed", description: "Controls whether the closing characters are always skipped over and auto-removed no matter how they were inserted.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).always_treat_brackets_as_autoclosed"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8817,7 +8817,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "JSX Tag Auto Close", description: "Whether to automatically close JSX tags.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).jsx_tag_auto_close"), // TODO(settings_ui): this setting should just be a bool pick: |settings_content| { @@ -8844,7 +8844,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Show Whitespaces", description: "Whether to show tabs and spaces in the editor.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).show_whitespaces"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8865,7 +8865,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { description: "Visible character used to render space characters when show_whitespaces is enabled (default: \"•\")", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).whitespace_map.space"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8892,7 +8892,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { description: "Visible character used to render tab characters when show_whitespaces is enabled (default: \"→\")", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).whitespace_map.tab"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8924,7 +8924,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Show Completions On Input", description: "Whether to pop the completions menu while typing in an editor without explicitly requesting it.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).show_completions_on_input"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8944,7 +8944,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Show Completion Documentation", description: "Whether to display inline and alongside documentation for items in the completions menu.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).show_completion_documentation"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8964,7 +8964,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Words", description: "Controls how words are completed.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).completions.words"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -8984,7 +8984,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Words Min Length", description: "How many characters has to be in the completions query to automatically show the words-based completions.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).completions.words_min_length"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9007,7 +9007,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Completion Menu Scrollbar", description: "When to show the scrollbar in the completion menu.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("editor.completion_menu_scrollbar"), pick: |settings_content| { settings_content.editor.completion_menu_scrollbar.as_ref() @@ -9023,7 +9023,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Completion Detail Alignment", description: "Whether to align detail text in code completions context menus left or right.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("editor.completion_detail_alignment"), pick: |settings_content| { settings_content.editor.completion_detail_alignment.as_ref() @@ -9039,7 +9039,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Completion Menu Item Kind", description: "How to display the LSP item kind (function, method, variable, etc.) of each entry in the completions menu.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("editor.completion_menu_item_kind"), pick: |settings_content| { settings_content.editor.completion_menu_item_kind.as_ref() @@ -9061,7 +9061,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Enabled", description: "Global switch to toggle hints on and off.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).inlay_hints.enabled"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9081,7 +9081,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Show Value Hints", description: "Global switch to toggle inline values on and off when debugging.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).inlay_hints.show_value_hints"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9104,7 +9104,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Show Type Hints", description: "Whether type hints should be shown.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).inlay_hints.show_type_hints"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9124,7 +9124,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Show Parameter Hints", description: "Whether parameter hints should be shown.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).inlay_hints.show_parameter_hints"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9147,7 +9147,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Show Other Hints", description: "Whether other hints should be shown.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).inlay_hints.show_other_hints"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9170,7 +9170,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Show Background", description: "Show a background for inlay hints.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).inlay_hints.show_background"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9190,7 +9190,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Edit Debounce Ms", description: "Whether or not to debounce inlay hints updates after buffer edits (set to 0 to disable debouncing).", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).inlay_hints.edit_debounce_ms"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9213,7 +9213,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Scroll Debounce Ms", description: "Whether or not to debounce inlay hints updates after buffer scrolls (set to 0 to disable debouncing).", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).inlay_hints.scroll_debounce_ms"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9237,7 +9237,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { description: "Toggles inlay hints (hides or shows) when the user presses the modifiers specified.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some( "languages.$(language).inlay_hints.toggle_on_modifiers_press", ), @@ -9278,7 +9278,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Enabled", description: "Whether tasks are enabled for this language.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).tasks.enabled"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9299,7 +9299,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { description: "Extra task variables to set for a particular language.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).tasks.variables"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9325,7 +9325,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Prefer LSP", description: "Use LSP tasks over Zed language extension tasks.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).tasks.prefer_lsp"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9351,7 +9351,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Word Diff Enabled", description: "Whether to enable word diff highlighting in the editor. When enabled, changed words within modified lines are highlighted to show exactly what changed.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).word_diff_enabled"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9372,7 +9372,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { description: "Preferred debuggers for this language.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).debuggers"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9398,7 +9398,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Middle Click Paste", description: "Enable middle-click paste on Linux.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).editor.middle_click_paste"), pick: |settings_content| settings_content.editor.middle_click_paste.as_ref(), write: |settings_content, value, _| { @@ -9412,7 +9412,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Extend Comment On Newline", description: "Whether to start a new line with a comment when a previous line is a comment as well.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).extend_comment_on_newline"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9432,7 +9432,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Colorize Brackets", description: "Whether to colorize brackets in the editor.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).colorize_brackets"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9452,7 +9452,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Vim/Emacs Modeline Support", description: "Number of lines to search for modelines (set to 0 to disable).", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("modeline_lines"), pick: |settings_content| settings_content.modeline_lines.as_ref(), write: |settings_content, value, _| { @@ -9471,7 +9471,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Image Viewer", description: "The unit for image file sizes.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("image_viewer.unit"), pick: |settings_content| { settings_content @@ -9490,7 +9490,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Auto Replace Emoji Shortcode", description: "Whether to automatically replace emoji shortcodes with emoji characters.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("message_editor.auto_replace_emoji_shortcode"), pick: |settings_content| { settings_content @@ -9514,7 +9514,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Drop Size Target", description: "Relative size of the drop target in the editor that will open dropped file as a split pane.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("drop_target_size"), pick: |settings_content| settings_content.workspace.drop_target_size.as_ref(), write: |settings_content, value, _| { @@ -9533,7 +9533,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "Code Lens", description: "Whether and how to display code lenses from language servers.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("code_lens"), pick: |settings_content| settings_content.editor.code_lens.as_ref(), write: |settings_content, value, _| { @@ -9548,7 +9548,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { title: "LSP Document Colors", description: "How to render LSP color previews in the editor.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("lsp_document_colors"), pick: |settings_content| settings_content.editor.lsp_document_colors.as_ref(), write: |settings_content, value, _| { @@ -9602,7 +9602,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { title: "Enable Language Server", description: "Whether to use language servers to provide code intelligence.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).enable_language_server"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9623,7 +9623,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { description: "The list of language servers to use (or disable) for this language.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).language_servers"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9649,7 +9649,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { title: "Linked Edits", description: "Whether to perform linked edits of associated ranges, if the LS supports it. For example, when editing opening tag, the contents of the closing tag will be edited as well.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).linked_edits"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9669,7 +9669,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { title: "Go To Definition Fallback", description: "Whether to follow-up empty Go to definition responses from the language server.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("go_to_definition_fallback"), pick: |settings_content| { settings_content.editor.go_to_definition_fallback.as_ref() @@ -9685,7 +9685,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { title: "Go To Definition Scroll Strategy", description: "How to scroll the target into view when navigating to a definition or reference.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("go_to_definition_scroll_strategy"), pick: |settings_content| { settings_content @@ -9715,7 +9715,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { }) }, field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).semantic_tokens"), pick: |settings_content| { settings_content @@ -9740,7 +9740,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { title: "LSP Folding Ranges", description: "When enabled, use folding ranges from the language server instead of indent-based folding.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).document_folding_ranges"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9760,7 +9760,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { title: "LSP Document Symbols", description: "When enabled, use the language server's document symbols for outlines and breadcrumbs instead of tree-sitter.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).document_symbols"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9786,7 +9786,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { title: "Enabled", description: "Whether to fetch LSP completions or not.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).completions.lsp"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9806,7 +9806,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { title: "Fetch Timeout (milliseconds)", description: "When fetching LSP completions, determines how long to wait for a response of a particular server (set to 0 to wait indefinitely).", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).completions.lsp_fetch_timeout_ms"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9829,7 +9829,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { title: "Insert Mode", description: "Controls how LSP completions are inserted.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).completions.lsp_insert_mode"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9856,7 +9856,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { description: "Preferred debuggers for this language.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).debuggers"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9888,7 +9888,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { title: "Allowed", description: "Enables or disables formatting with Prettier for a given language.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).prettier.allowed"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9908,7 +9908,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { title: "Parser", description: "Forces Prettier integration to use a specific parser name when formatting files with the language.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).prettier.parser"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9929,7 +9929,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { description: "Forces Prettier integration to use specific plugins when formatting files with the language.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).prettier.plugins"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -9956,7 +9956,7 @@ fn non_editor_language_settings_data() -> Box<[SettingsPageItem]> { description: "Default Prettier options, in the format as in package.json section for Prettier.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).prettier.options"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -10005,7 +10005,7 @@ fn edit_prediction_language_settings_section() -> [SettingsPageItem; 5] { title: "Data Collection", description: "Controls whether Zed may collect training data when using Zed's Edit Predictions. Data is only collected for files in projects detected as open source. The default value uses the preference previously set via the status-bar toggle, or false if no preference has been stored.", field: Box::new(SettingField { - org_override: Some(|org_settings| { + organization_override: Some(|org_settings| { const DATA_COLLECTION_DISABLED: EditPredictionDataCollectionChoice = EditPredictionDataCollectionChoice::No; if !org_settings.edit_prediction.is_feedback_enabled { @@ -10040,7 +10040,7 @@ fn edit_prediction_language_settings_section() -> [SettingsPageItem; 5] { title: "Show Edit Predictions", description: "Controls whether edit predictions are shown immediately or manually.", field: Box::new(SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).show_edit_predictions"), pick: |settings_content| { language_settings_field(settings_content, |language| { @@ -10061,7 +10061,7 @@ fn edit_prediction_language_settings_section() -> [SettingsPageItem; 5] { description: "Controls whether edit predictions are shown in the given language scopes.", field: Box::new( SettingField { - org_override: None, + organization_override: None, json_path: Some("languages.$(language).edit_predictions_disabled_in"), pick: |settings_content| { language_settings_field(settings_content, |language| { diff --git a/crates/settings_ui/src/pages/edit_prediction_provider_setup.rs b/crates/settings_ui/src/pages/edit_prediction_provider_setup.rs index 31c29100ce2466..2e93f6c65cbf0e 100644 --- a/crates/settings_ui/src/pages/edit_prediction_provider_setup.rs +++ b/crates/settings_ui/src/pages/edit_prediction_provider_setup.rs @@ -362,7 +362,7 @@ fn ollama_settings() -> Box<[SettingsPageItem]> { title: "API URL", description: "The base URL of your Ollama server.", field: Box::new(SettingField { - org_override: None, + organization_override: None, pick: |settings| { settings .project @@ -396,7 +396,7 @@ fn ollama_settings() -> Box<[SettingsPageItem]> { title: "Model", description: "The Ollama model to use for edit predictions.", field: Box::new(SettingField { - org_override: None, + organization_override: None, pick: |settings| { settings .project @@ -430,7 +430,7 @@ fn ollama_settings() -> Box<[SettingsPageItem]> { title: "Prompt Format", description: "The prompt format to use when requesting predictions. Set to Infer to have the format inferred based on the model name.", field: Box::new(SettingField { - org_override: None, + organization_override: None, pick: |settings| { settings .project @@ -461,7 +461,7 @@ fn ollama_settings() -> Box<[SettingsPageItem]> { title: "Max Output Tokens", description: "The maximum number of tokens to generate.", field: Box::new(SettingField { - org_override: None, + organization_override: None, pick: |settings| { settings .project @@ -497,7 +497,7 @@ fn open_ai_compatible_settings() -> Box<[SettingsPageItem]> { title: "API URL", description: "The URL of your OpenAI-compatible server's completions API.", field: Box::new(SettingField { - org_override: None, + organization_override: None, pick: |settings| { settings .project @@ -531,7 +531,7 @@ fn open_ai_compatible_settings() -> Box<[SettingsPageItem]> { title: "Model", description: "The model string to pass to the OpenAI-compatible server.", field: Box::new(SettingField { - org_override: None, + organization_override: None, pick: |settings| { settings .project @@ -565,7 +565,7 @@ fn open_ai_compatible_settings() -> Box<[SettingsPageItem]> { title: "Prompt Format", description: "The prompt format to use when requesting predictions. Set to Infer to have the format inferred based on the model name.", field: Box::new(SettingField { - org_override: None, + organization_override: None, pick: |settings| { settings .project @@ -596,7 +596,7 @@ fn open_ai_compatible_settings() -> Box<[SettingsPageItem]> { title: "Max Output Tokens", description: "The maximum number of tokens to generate.", field: Box::new(SettingField { - org_override: None, + organization_override: None, pick: |settings| { settings .project @@ -632,7 +632,7 @@ fn codestral_settings() -> Box<[SettingsPageItem]> { title: "API URL", description: "The API URL to use for Codestral.", field: Box::new(SettingField { - org_override: None, + organization_override: None, pick: |settings| { settings .project @@ -666,7 +666,7 @@ fn codestral_settings() -> Box<[SettingsPageItem]> { title: "Max Tokens", description: "The maximum number of tokens to generate.", field: Box::new(SettingField { - org_override: None, + organization_override: None, pick: |settings| { settings .project @@ -697,7 +697,7 @@ fn codestral_settings() -> Box<[SettingsPageItem]> { title: "Model", description: "The Codestral model id to use.", field: Box::new(SettingField { - org_override: None, + organization_override: None, pick: |settings| { settings .project diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs index e17b3b21a27b68..5ac57074d6f4e7 100644 --- a/crates/settings_ui/src/settings_ui.rs +++ b/crates/settings_ui/src/settings_ui.rs @@ -109,7 +109,7 @@ struct SettingField { /// organization's settings. Takes the organization configuration and the /// resolved settings value, and returns `Some(...)` if the organization /// overrides the setting, otherwise `None`. - org_override: Option Option<&T>>, + organization_override: Option Option<&T>>, /// A json-path-like string that gives a unique-ish string that identifies /// where in the JSON the setting is defined. @@ -159,8 +159,8 @@ impl SettingField { SettingField { pick: |_| Some(&UnimplementedSettingField), write: |_, _, _| unreachable!(), - org_override: None, - json_path: None, + organization_override: None, + json_path: self.json_path, } } } @@ -180,7 +180,7 @@ trait AnySettingField { fn json_path(&self) -> Option<&'static str>; - fn is_overriden_by_organization(&self, cx: &App) -> bool; + fn is_overridden_by_organization(&self, cx: &App) -> bool; } impl AnySettingField for SettingField { @@ -257,8 +257,8 @@ impl AnySettingField for SettingFi self.json_path } - fn is_overriden_by_organization(&self, cx: &App) -> bool { - let Some(org_override) = self.org_override else { + fn is_overridden_by_organization(&self, cx: &App) -> bool { + let Some(org_override) = self.organization_override else { return false; }; @@ -1258,12 +1258,15 @@ fn render_settings_item( .render_code_spans(), ), ) - .child(if setting_item.field.is_overriden_by_organization(cx) { + .child(if setting_item.field.is_overridden_by_organization(cx) { h_flex() .gap_2() .child( div() - .id("organization-configuration-warning") + .id(format!( + "{}-organization-configuration-warning", + setting_item.title + )) .child( Icon::new(IconName::Warning) .size(IconSize::Small) @@ -1271,7 +1274,7 @@ fn render_settings_item( ) .tooltip(|_, cx| { Tooltip::with_meta( - "Overriden by Organization", + "Overridden by Organization", None, "Contact your organization admins to adjust this setting.", cx, @@ -4273,11 +4276,11 @@ fn get_current_value<'a, T>( let user_store = AppState::global(cx).user_store.read(cx); let org_config = user_store.current_organization_configuration(); - let (file, value) = settings_store.get_value_from_file(file.to_settings(), field.pick); + let (_file, value) = settings_store.get_value_from_file(file.to_settings(), field.pick); let value = value?; let org_value = org_config - .zip(field.org_override) + .zip(field.organization_override) .and_then(|(org_config, org_override)| (org_override)(org_config)); Some(CurrentSettingsValue { @@ -4330,9 +4333,12 @@ fn render_toggle_button + From + Copy>( _window: &mut Window, cx: &mut App, ) -> AnyElement { - let (_, value) = SettingsStore::global(cx).get_value_from_file(file.to_settings(), field.pick); + let value = get_current_value(&SettingsStore::global(cx), &file, &field, cx); + let (value, disabled) = value + .map(|current_value| (*current_value.value, current_value.disabled)) + .unwrap_or((false.into(), false)); - let toggle_state = if value.copied().map_or(false, Into::into) { + let toggle_state = if value.into() { ToggleState::Selected } else { ToggleState::Unselected @@ -4340,6 +4346,7 @@ fn render_toggle_button + From + Copy>( Switch::new("toggle_button", toggle_state) .tab_index(0_isize) + .disabled(disabled) .on_click({ move |state, window, cx| { telemetry::event!("Settings Change", setting = field.json_path, type = file.setting_type());