Ben Kunkle and Mikayla created
Closes #ISSUE
Release Notes:
- N/A *or* Added/Fixed/Improved ...
---------
Co-authored-by: Mikayla <mikayla@zed.dev>crates/language/src/buffer_tests.rs | 2
crates/language/src/language_settings.rs | 3
crates/settings/src/settings_content.rs | 45
crates/settings/src/settings_content/editor.rs | 13
crates/settings/src/settings_content/language.rs | 3
crates/settings/src/settings_content/workspace.rs | 32
crates/settings_ui/src/page_data.rs | 879 +++++++++++++---
crates/settings_ui/src/settings_ui.rs | 51
8 files changed, 799 insertions(+), 229 deletions(-)
@@ -269,7 +269,7 @@ async fn test_first_line_pattern(cx: &mut TestAppContext) {
async fn test_language_for_file_with_custom_file_types(cx: &mut TestAppContext) {
cx.update(|cx| {
init_settings(cx, |settings| {
- settings.file_types.extend([
+ settings.file_types.get_or_insert_default().extend([
("TypeScript".into(), vec!["js".into()].into()),
(
"JavaScript".into(),
@@ -639,7 +639,7 @@ impl settings::Settings for AllLanguageSettings {
let mut file_types: FxHashMap<Arc<str>, GlobSet> = FxHashMap::default();
- for (language, patterns) in &all_languages.file_types {
+ for (language, patterns) in all_languages.file_types.iter().flatten() {
let mut builder = GlobSetBuilder::new();
for pattern in &patterns.0 {
@@ -778,6 +778,7 @@ impl settings::Settings for AllLanguageSettings {
.project
.all_languages
.file_types
+ .get_or_insert_default()
.extend(associations);
// cursor global ignore list applies to cursor-tab, so transfer it to edit_predictions.disabled_globs
@@ -234,7 +234,6 @@ impl UserSettingsContent {
Eq,
Default,
strum::VariantArray,
- strum::VariantNames,
)]
pub enum BaseKeymapContent {
#[default]
@@ -248,6 +247,19 @@ pub enum BaseKeymapContent {
None,
}
+impl strum::VariantNames for BaseKeymapContent {
+ const VARIANTS: &'static [&'static str] = &[
+ "VSCode",
+ "JetBrains",
+ "Sublime Text",
+ "Atom",
+ "TextMate",
+ "Emacs",
+ "Cursor",
+ "None",
+ ];
+}
+
#[skip_serializing_none]
#[derive(Clone, PartialEq, Default, Serialize, Deserialize, JsonSchema, MergeFrom, Debug)]
pub struct TitleBarSettingsContent {
@@ -502,7 +514,18 @@ pub struct GitPanelSettingsContent {
}
#[derive(
- Default, Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq, Eq,
+ Default,
+ Copy,
+ Clone,
+ Debug,
+ Serialize,
+ Deserialize,
+ JsonSchema,
+ MergeFrom,
+ PartialEq,
+ Eq,
+ strum::VariantArray,
+ strum::VariantNames,
)]
#[serde(rename_all = "snake_case")]
pub enum StatusStyle {
@@ -512,7 +535,9 @@ pub enum StatusStyle {
}
#[skip_serializing_none]
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq, Eq)]
+#[derive(
+ Copy, Clone, Default, Debug, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq, Eq,
+)]
pub struct ScrollbarSettings {
pub show: Option<ShowScrollbar>,
}
@@ -814,7 +839,19 @@ pub struct ImageViewerSettingsContent {
}
#[skip_serializing_none]
-#[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema, MergeFrom, Default, PartialEq)]
+#[derive(
+ Clone,
+ Copy,
+ Debug,
+ Serialize,
+ Deserialize,
+ JsonSchema,
+ MergeFrom,
+ Default,
+ PartialEq,
+ strum::VariantArray,
+ strum::VariantNames,
+)]
#[serde(rename_all = "snake_case")]
pub enum ImageFileSizeUnit {
/// Displays file size in binary units (e.g., KiB, MiB).
@@ -334,7 +334,18 @@ pub struct GutterContent {
/// How to render LSP `textDocument/documentColor` colors in the editor.
#[derive(
- Copy, Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq, JsonSchema, MergeFrom,
+ Copy,
+ Clone,
+ Debug,
+ Default,
+ Serialize,
+ Deserialize,
+ PartialEq,
+ Eq,
+ JsonSchema,
+ MergeFrom,
+ strum::VariantArray,
+ strum::VariantNames,
)]
#[serde(rename_all = "snake_case")]
pub enum DocumentColorsRenderMode {
@@ -27,8 +27,7 @@ pub struct AllLanguageSettingsContent {
pub languages: LanguageToSettingsMap,
/// Settings for associating file extensions and filenames
/// with languages.
- #[serde(default)]
- pub file_types: HashMap<Arc<str>, ExtendingVec<String>>,
+ pub file_types: Option<HashMap<Arc<str>, ExtendingVec<String>>>,
}
impl merge_from::MergeFrom for AllLanguageSettingsContent {
@@ -12,7 +12,7 @@ use crate::{DockPosition, DockSide, ScrollbarSettingsContent, ShowIndentGuides};
#[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize, JsonSchema, MergeFrom)]
pub struct WorkspaceSettingsContent {
/// Active pane styling settings.
- pub active_pane_modifiers: Option<ActivePanelModifiers>,
+ pub active_pane_modifiers: Option<ActivePaneModifiers>,
/// Layout mode for the bottom dock
///
/// Default: contained
@@ -243,7 +243,7 @@ pub enum ActivateOnClose {
#[skip_serializing_none]
#[derive(Copy, Clone, PartialEq, Debug, Default, Serialize, Deserialize, JsonSchema, MergeFrom)]
#[serde(rename_all = "snake_case")]
-pub struct ActivePanelModifiers {
+pub struct ActivePaneModifiers {
/// Size of the border surrounding the active pane.
/// When set to 0, the active pane doesn't have any border.
/// The border is drawn inset.
@@ -403,14 +403,38 @@ impl AutosaveSetting {
}
}
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema, MergeFrom)]
+#[derive(
+ Copy,
+ Clone,
+ Debug,
+ Serialize,
+ Deserialize,
+ PartialEq,
+ Eq,
+ JsonSchema,
+ MergeFrom,
+ strum::VariantArray,
+ strum::VariantNames,
+)]
#[serde(rename_all = "snake_case")]
pub enum PaneSplitDirectionHorizontal {
Up,
Down,
}
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema, MergeFrom)]
+#[derive(
+ Copy,
+ Clone,
+ Debug,
+ Serialize,
+ Deserialize,
+ PartialEq,
+ Eq,
+ JsonSchema,
+ MergeFrom,
+ strum::VariantArray,
+ strum::VariantNames,
+)]
#[serde(rename_all = "snake_case")]
pub enum PaneSplitDirectionVertical {
Left,
@@ -24,18 +24,6 @@ pub(crate) fn settings_data(cx: &App) -> Vec<SettingsPage> {
metadata: None,
files: USER,
}),
- SettingsPageItem::SettingItem(SettingItem {
- title: "Restore On Startup",
- description: "Restore previous session when opening Zed",
- field: Box::new(SettingField {
- pick: |settings_content| &settings_content.workspace.restore_on_startup,
- pick_mut: |settings_content| {
- &mut settings_content.workspace.restore_on_startup
- },
- }),
- metadata: None,
- files: USER,
- }),
SettingsPageItem::SettingItem(SettingItem {
title: "When Closing With No Tabs",
description: "What to do when using the 'close active item' action with no tabs",
@@ -100,6 +88,54 @@ pub(crate) fn settings_data(cx: &App) -> Vec<SettingsPage> {
metadata: None,
files: USER,
}),
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "Private Files",
+ description: "Globs to match against file paths to determine if a file is private",
+ field: Box::new(
+ SettingField {
+ pick: |settings_content| {
+ &settings_content.project.worktree.private_files
+ },
+ pick_mut: |settings_content| {
+ &mut settings_content.project.worktree.private_files
+ },
+ }
+ .unimplemented(),
+ ),
+ metadata: None,
+ files: USER,
+ }),
+ SettingsPageItem::SectionHeader("Workspace Restoration"),
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "Restore Unsaved Buffers",
+ description: "Whether or not to restore unsaved buffers on restart",
+ field: Box::new(SettingField {
+ pick: |settings_content| match settings_content.session.as_ref() {
+ Some(session) => &session.restore_unsaved_buffers,
+ None => &None,
+ },
+ pick_mut: |settings_content| {
+ &mut settings_content
+ .session
+ .get_or_insert_default()
+ .restore_unsaved_buffers
+ },
+ }),
+ metadata: None,
+ files: USER,
+ }),
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "Restore On Startup",
+ description: "What to restore from the previous session when opening Zed",
+ field: Box::new(SettingField {
+ pick: |settings_content| &settings_content.workspace.restore_on_startup,
+ pick_mut: |settings_content| {
+ &mut settings_content.workspace.restore_on_startup
+ },
+ }),
+ metadata: None,
+ files: USER,
+ }),
SettingsPageItem::SectionHeader("Scoped Settings"),
SettingsPageItem::SettingItem(SettingItem {
// todo(settings_ui): Implement another setting item type that just shows an edit in settings.json
@@ -172,10 +208,21 @@ pub(crate) fn settings_data(cx: &App) -> Vec<SettingsPage> {
metadata: None,
files: USER,
}),
+ SettingsPageItem::SectionHeader("Auto Update"),
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "Auto Update",
+ description: "Whether or not to automatically check for updates",
+ field: Box::new(SettingField {
+ pick: |settings_content| &settings_content.auto_update,
+ pick_mut: |settings_content| &mut settings_content.auto_update,
+ }),
+ metadata: None,
+ files: USER,
+ }),
],
},
SettingsPage {
- title: "Appearance & Behavior",
+ title: "Appearance",
items: vec![
SettingsPageItem::SectionHeader("Theme"),
// todo(settings_ui): Figure out how we want to add these
@@ -254,6 +301,36 @@ pub(crate) fn settings_data(cx: &App) -> Vec<SettingsPage> {
),
metadata: None,
}),
+ SettingsPageItem::SettingItem(SettingItem {
+ files: USER,
+ title: "Buffer Font Features",
+ description: "The OpenType features to enable for rendering in text buffers.",
+ field: Box::new(
+ SettingField {
+ pick: |settings_content| &settings_content.theme.buffer_font_features,
+ pick_mut: |settings_content| {
+ &mut settings_content.theme.buffer_font_features
+ },
+ }
+ .unimplemented(),
+ ),
+ metadata: None,
+ }),
+ SettingsPageItem::SettingItem(SettingItem {
+ files: USER,
+ title: "Buffer Font Fallbacks",
+ description: "The font fallbacks to use for rendering in text buffers.",
+ field: Box::new(
+ SettingField {
+ pick: |settings_content| &settings_content.theme.buffer_font_fallbacks,
+ pick_mut: |settings_content| {
+ &mut settings_content.theme.buffer_font_fallbacks
+ },
+ }
+ .unimplemented(),
+ ),
+ metadata: None,
+ }),
SettingsPageItem::SettingItem(SettingItem {
title: "UI Font Family",
description: "Font family for UI elements",
@@ -284,6 +361,36 @@ pub(crate) fn settings_data(cx: &App) -> Vec<SettingsPage> {
metadata: None,
files: USER,
}),
+ SettingsPageItem::SettingItem(SettingItem {
+ files: USER,
+ title: "UI Font Features",
+ description: "The OpenType features to enable for rendering in UI elements.",
+ field: Box::new(
+ SettingField {
+ pick: |settings_content| &settings_content.theme.ui_font_features,
+ pick_mut: |settings_content| {
+ &mut settings_content.theme.ui_font_features
+ },
+ }
+ .unimplemented(),
+ ),
+ metadata: None,
+ }),
+ SettingsPageItem::SettingItem(SettingItem {
+ files: USER,
+ title: "UI Font Fallbacks",
+ description: "The font fallbacks to use for rendering in the UI.",
+ field: Box::new(
+ SettingField {
+ pick: |settings_content| &settings_content.theme.ui_font_fallbacks,
+ pick_mut: |settings_content| {
+ &mut settings_content.theme.ui_font_fallbacks
+ },
+ }
+ .unimplemented(),
+ ),
+ metadata: None,
+ }),
SettingsPageItem::SettingItem(SettingItem {
title: "Agent Panel UI Font Size",
description: "Font size for agent response text in the agent panel. Falls back to the regular UI font size.",
@@ -312,39 +419,6 @@ pub(crate) fn settings_data(cx: &App) -> Vec<SettingsPage> {
metadata: None,
files: USER,
}),
- SettingsPageItem::SectionHeader("Keymap"),
- SettingsPageItem::SettingItem(SettingItem {
- title: "Base Keymap",
- description: "The name of a base set of key bindings to use",
- field: Box::new(SettingField {
- pick: |settings_content| &settings_content.base_keymap,
- pick_mut: |settings_content| &mut settings_content.base_keymap,
- }),
- metadata: None,
- files: USER,
- }),
- // todo(settings_ui): Vim/Helix Mode should be apart of one type because it's undefined
- // behavior to have them both enabled at the same time
- SettingsPageItem::SettingItem(SettingItem {
- title: "Vim Mode",
- description: "Enable vim modes and key bindings",
- field: Box::new(SettingField {
- pick: |settings_content| &settings_content.vim_mode,
- pick_mut: |settings_content| &mut settings_content.vim_mode,
- }),
- metadata: None,
- files: USER,
- }),
- SettingsPageItem::SettingItem(SettingItem {
- title: "Helix Mode",
- description: "Enable helix modes and key bindings",
- field: Box::new(SettingField {
- pick: |settings_content| &settings_content.helix_mode,
- pick_mut: |settings_content| &mut settings_content.helix_mode,
- }),
- metadata: None,
- files: USER,
- }),
SettingsPageItem::SettingItem(SettingItem {
title: "Multi Cursor Modifier",
description: "Modifier key for adding multiple cursors",
@@ -490,87 +564,44 @@ pub(crate) fn settings_data(cx: &App) -> Vec<SettingsPage> {
metadata: None,
files: USER | LOCAL,
}),
- SettingsPageItem::SectionHeader("Layout"),
- SettingsPageItem::SettingItem(SettingItem {
- title: "Bottom Dock Layout",
- description: "Layout mode for the bottom dock",
- field: Box::new(SettingField {
- pick: |settings_content| &settings_content.workspace.bottom_dock_layout,
- pick_mut: |settings_content| {
- &mut settings_content.workspace.bottom_dock_layout
- },
- }),
- metadata: None,
- files: USER,
- }),
+ ],
+ },
+ SettingsPage {
+ title: "Keymap",
+ items: vec![
+ SettingsPageItem::SectionHeader("Base Keymap"),
SettingsPageItem::SettingItem(SettingItem {
- files: USER,
- title: "Centered Layout Left Padding",
- description: "Left padding for centered layout",
+ title: "Base Keymap",
+ description: "The name of a base set of key bindings to use",
field: Box::new(SettingField {
- pick: |settings_content| {
- if let Some(centered_layout) =
- &settings_content.workspace.centered_layout
- {
- ¢ered_layout.left_padding
- } else {
- &None
- }
- },
- pick_mut: |settings_content| {
- &mut settings_content
- .workspace
- .centered_layout
- .get_or_insert_default()
- .left_padding
- },
+ pick: |settings_content| &settings_content.base_keymap,
+ pick_mut: |settings_content| &mut settings_content.base_keymap,
}),
- metadata: None,
- }),
- SettingsPageItem::SettingItem(SettingItem {
+ metadata: Some(Box::new(SettingsFieldMetadata {
+ should_do_titlecase: Some(false),
+ ..Default::default()
+ })),
files: USER,
- title: "Centered Layout Right Padding",
- description: "Right padding for centered layout",
- field: Box::new(SettingField {
- pick: |settings_content| {
- if let Some(centered_layout) =
- &settings_content.workspace.centered_layout
- {
- ¢ered_layout.right_padding
- } else {
- &None
- }
- },
- pick_mut: |settings_content| {
- &mut settings_content
- .workspace
- .centered_layout
- .get_or_insert_default()
- .right_padding
- },
- }),
- metadata: None,
}),
+ SettingsPageItem::SectionHeader("Modal Editing"),
+ // todo(settings_ui): Vim/Helix Mode should be apart of one type because it's undefined
+ // behavior to have them both enabled at the same time
SettingsPageItem::SettingItem(SettingItem {
- title: "Zoomed Padding",
- description: "Show padding for zoomed panels",
+ title: "Vim Mode",
+ description: "Enable vim modes and key bindings",
field: Box::new(SettingField {
- pick: |settings_content| &settings_content.workspace.zoomed_padding,
- pick_mut: |settings_content| &mut settings_content.workspace.zoomed_padding,
+ pick: |settings_content| &settings_content.vim_mode,
+ pick_mut: |settings_content| &mut settings_content.vim_mode,
}),
metadata: None,
files: USER,
}),
- SettingsPageItem::SectionHeader("Window"),
- // todo(settings_ui): Should we filter by platform?
SettingsPageItem::SettingItem(SettingItem {
- title: "Use System Window Tabs",
- description: "(macOS only) Whether to allow windows to tab together",
+ title: "Helix Mode",
+ description: "Enable helix modes and key bindings",
field: Box::new(SettingField {
- pick: |settings_content| &settings_content.workspace.use_system_window_tabs,
- pick_mut: |settings_content| {
- &mut settings_content.workspace.use_system_window_tabs
- },
+ pick: |settings_content| &settings_content.helix_mode,
+ pick_mut: |settings_content| &mut settings_content.helix_mode,
}),
metadata: None,
files: USER,
@@ -581,6 +612,22 @@ pub(crate) fn settings_data(cx: &App) -> Vec<SettingsPage> {
title: "Editor",
items: {
let mut items = vec![
+ SettingsPageItem::SectionHeader("Auto Save"),
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "Auto Save Mode",
+ description: "When to Auto Save Buffer Changes",
+ field: Box::new(
+ SettingField {
+ pick: |settings_content| &settings_content.workspace.autosave,
+ pick_mut: |settings_content| {
+ &mut settings_content.workspace.autosave
+ },
+ }
+ .unimplemented(),
+ ),
+ metadata: None,
+ files: USER,
+ }),
SettingsPageItem::SectionHeader("Multibuffer"),
SettingsPageItem::SettingItem(SettingItem {
title: "Double Click In Multibuffer",
@@ -620,6 +667,27 @@ pub(crate) fn settings_data(cx: &App) -> Vec<SettingsPage> {
metadata: None,
files: USER,
}),
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "Expand Outlines With Depth",
+ description: "Default depth to expand outline items in the current file",
+ field: Box::new(SettingField {
+ pick: |settings_content| {
+ if let Some(outline_panel) = &settings_content.outline_panel {
+ &outline_panel.expand_outlines_with_depth
+ } else {
+ &None
+ }
+ },
+ pick_mut: |settings_content| {
+ &mut settings_content
+ .outline_panel
+ .get_or_insert_default()
+ .expand_outlines_with_depth
+ },
+ }),
+ metadata: None,
+ files: USER,
+ }),
SettingsPageItem::SectionHeader("Scrolling"),
SettingsPageItem::SettingItem(SettingItem {
title: "Scroll Beyond Last Line",
@@ -1409,6 +1477,242 @@ pub(crate) fn settings_data(cx: &App) -> Vec<SettingsPage> {
items: {
let mut items = vec![];
items.extend(non_editor_language_settings_data());
+ items.extend([
+ SettingsPageItem::SectionHeader("File Types"),
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "File Type Associations",
+ description: "A Mapping from Languages to files and file extensions that should be treated as that language",
+ field: Box::new(
+ SettingField {
+ pick: |settings_content| {
+ &settings_content.project.all_languages.file_types
+ },
+ pick_mut: |settings_content| {
+ &mut settings_content.project.all_languages.file_types
+ },
+ }
+ .unimplemented(),
+ ),
+ metadata: None,
+ files: USER | LOCAL,
+ }),
+ ]);
+
+ items.extend([
+ SettingsPageItem::SectionHeader("Diagnostics"),
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "Max Severity",
+ description: "Which level to use to filter out diagnostics displayed in the editor",
+ field: Box::new(SettingField {
+ pick: |settings_content| &settings_content.editor.diagnostics_max_severity,
+ pick_mut: |settings_content| {
+ &mut settings_content.editor.diagnostics_max_severity
+ },
+ }),
+ metadata: None,
+ files: USER,
+ }),
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "Include Warnings",
+ description: "Whether to show warnings or not by default",
+ field: Box::new(SettingField {
+ pick: |settings_content| {
+ if let Some(diagnostics) = &settings_content.diagnostics {
+ &diagnostics.include_warnings
+ } else {
+ &None
+ }
+ },
+ pick_mut: |settings_content| {
+ &mut settings_content
+ .diagnostics
+ .get_or_insert_default()
+ .include_warnings
+ },
+ }),
+ metadata: None,
+ files: USER,
+ }),
+ SettingsPageItem::SectionHeader("Inline Diagnostics"),
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "Enabled",
+ description: "Whether to show diagnostics inline or not",
+ field: Box::new(SettingField {
+ pick: |settings_content| {
+ if let Some(diagnostics) = &settings_content.diagnostics {
+ if let Some(inline) = &diagnostics.inline {
+ &inline.enabled
+ } else {
+ &None
+ }
+ } else {
+ &None
+ }
+ },
+ pick_mut: |settings_content| {
+ &mut settings_content
+ .diagnostics
+ .get_or_insert_default()
+ .inline
+ .get_or_insert_default()
+ .enabled
+ },
+ }),
+ metadata: None,
+ files: USER,
+ }),
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "Update Debounce",
+ description: "The delay in milliseconds to show inline diagnostics after the last diagnostic update",
+ field: Box::new(SettingField {
+ pick: |settings_content| {
+ if let Some(diagnostics) = &settings_content.diagnostics {
+ if let Some(inline) = &diagnostics.inline {
+ &inline.update_debounce_ms
+ } else {
+ &None
+ }
+ } else {
+ &None
+ }
+ },
+ pick_mut: |settings_content| {
+ &mut settings_content
+ .diagnostics
+ .get_or_insert_default()
+ .inline
+ .get_or_insert_default()
+ .update_debounce_ms
+ },
+ }),
+ metadata: None,
+ files: USER,
+ }),
+ SettingsPageItem::SettingItem(SettingItem {
+ 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 {
+ pick: |settings_content| {
+ if let Some(diagnostics) = &settings_content.diagnostics {
+ if let Some(inline) = &diagnostics.inline {
+ &inline.padding
+ } else {
+ &None
+ }
+ } else {
+ &None
+ }
+ },
+ pick_mut: |settings_content| {
+ &mut settings_content
+ .diagnostics
+ .get_or_insert_default()
+ .inline
+ .get_or_insert_default()
+ .padding
+ },
+ }),
+ metadata: None,
+ files: USER,
+ }),
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "Minimum Column",
+ description: "The minimum column at which to display inline diagnostics",
+ field: Box::new(SettingField {
+ pick: |settings_content| {
+ if let Some(diagnostics) = &settings_content.diagnostics {
+ if let Some(inline) = &diagnostics.inline {
+ &inline.min_column
+ } else {
+ &None
+ }
+ } else {
+ &None
+ }
+ },
+ pick_mut: |settings_content| {
+ &mut settings_content
+ .diagnostics
+ .get_or_insert_default()
+ .inline
+ .get_or_insert_default()
+ .min_column
+ },
+ }),
+ metadata: None,
+ files: USER,
+ }),
+ SettingsPageItem::SectionHeader("LSP Pull Diagnostics"),
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "Enabled",
+ description: "Whether to pull for language server-powered diagnostics or not",
+ field: Box::new(SettingField {
+ pick: |settings_content| {
+ if let Some(diagnostics) = &settings_content.diagnostics {
+ if let Some(lsp_pull) = &diagnostics.lsp_pull_diagnostics {
+ &lsp_pull.enabled
+ } else {
+ &None
+ }
+ } else {
+ &None
+ }
+ },
+ pick_mut: |settings_content| {
+ &mut settings_content
+ .diagnostics
+ .get_or_insert_default()
+ .lsp_pull_diagnostics
+ .get_or_insert_default()
+ .enabled
+ },
+ }),
+ metadata: None,
+ files: USER,
+ }),
+ // todo(settings_ui): Needs unit
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "Debounce",
+ description: "Minimum time to wait before pulling diagnostics from the language server(s)",
+ field: Box::new(SettingField {
+ pick: |settings_content| {
+ if let Some(diagnostics) = &settings_content.diagnostics {
+ if let Some(lsp_pull) = &diagnostics.lsp_pull_diagnostics {
+ &lsp_pull.debounce_ms
+ } else {
+ &None
+ }
+ } else {
+ &None
+ }
+ },
+ pick_mut: |settings_content| {
+ &mut settings_content
+ .diagnostics
+ .get_or_insert_default()
+ .lsp_pull_diagnostics
+ .get_or_insert_default()
+ .debounce_ms
+ },
+ }),
+ metadata: None,
+ files: USER,
+ }),
+ SettingsPageItem::SectionHeader("LSP Highlights"),
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "Debounce",
+ description: "The debounce delay before querying highlights from the language",
+ field: Box::new(SettingField {
+ pick: |settings_content| &settings_content.editor.lsp_highlight_debounce,
+ pick_mut: |settings_content| {
+ &mut settings_content.editor.lsp_highlight_debounce
+ },
+ }),
+ metadata: None,
+ files: USER,
+ }),
+ ]);
+
// todo(settings_ui): Refresh on extension (un)/installed
// Note that `crates/json_schema_store` solves the same problem, there is probably a way to unify the two
items.push(SettingsPageItem::SectionHeader(LANGUAGES_SECTION_HEADER));
@@ -1482,15 +1786,27 @@ pub(crate) fn settings_data(cx: &App) -> Vec<SettingsPage> {
files: USER,
}),
SettingsPageItem::SettingItem(SettingItem {
- title: "Include Ignored",
- description: "Include ignored files in search results by default",
+ title: "Use Smartcase Search",
+ description: "Whether to automatically enable case-sensitive search based on the search query",
field: Box::new(SettingField {
- pick: |settings_content| {
- if let Some(search) = &settings_content.editor.search {
- &search.include_ignored
- } else {
- &None
- }
+ pick: |settings_content| &settings_content.editor.use_smartcase_search,
+ pick_mut: |settings_content| {
+ &mut settings_content.editor.use_smartcase_search
+ },
+ }),
+ metadata: None,
+ files: USER,
+ }),
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "Include Ignored",
+ description: "Include ignored files in search results by default",
+ field: Box::new(SettingField {
+ pick: |settings_content| {
+ if let Some(search) = &settings_content.editor.search {
+ &search.include_ignored
+ } else {
+ &None
+ }
},
pick_mut: |settings_content| {
&mut settings_content
@@ -1521,31 +1837,6 @@ pub(crate) fn settings_data(cx: &App) -> Vec<SettingsPage> {
metadata: None,
files: USER,
}),
- // todo: null by default
- SettingsPageItem::SettingItem(SettingItem {
- title: "Include Ignored in Search",
- description: "Use gitignored files when searching",
- field: Box::new(
- SettingField {
- pick: |settings_content| {
- if let Some(file_finder) = &settings_content.file_finder {
- &file_finder.include_ignored
- } else {
- &None
- }
- },
- pick_mut: |settings_content| {
- &mut settings_content
- .file_finder
- .get_or_insert_default()
- .include_ignored
- },
- }
- .unimplemented(),
- ),
- metadata: None,
- files: USER,
- }),
SettingsPageItem::SettingItem(SettingItem {
title: "Search Wrap",
description: "Whether the editor search results will loop",
@@ -1570,19 +1861,32 @@ pub(crate) fn settings_data(cx: &App) -> Vec<SettingsPage> {
metadata: None,
files: USER,
}),
+ SettingsPageItem::SectionHeader("File Finder"),
+ // todo: null by default
SettingsPageItem::SettingItem(SettingItem {
- title: "Use Smartcase Search",
- description: "Use smartcase (i.e., case-sensitive) search",
- field: Box::new(SettingField {
- pick: |settings_content| &settings_content.editor.use_smartcase_search,
- pick_mut: |settings_content| {
- &mut settings_content.editor.use_smartcase_search
- },
- }),
+ title: "Include Ignored in Search",
+ description: "Use gitignored files when searching",
+ field: Box::new(
+ SettingField {
+ pick: |settings_content| {
+ if let Some(file_finder) = &settings_content.file_finder {
+ &file_finder.include_ignored
+ } else {
+ &None
+ }
+ },
+ pick_mut: |settings_content| {
+ &mut settings_content
+ .file_finder
+ .get_or_insert_default()
+ .include_ignored
+ },
+ }
+ .unimplemented(),
+ ),
metadata: None,
files: USER,
}),
- SettingsPageItem::SectionHeader("File Management"),
SettingsPageItem::SettingItem(SettingItem {
title: "File Icons",
description: "Show file icons in the file finder",
@@ -1625,30 +1929,6 @@ pub(crate) fn settings_data(cx: &App) -> Vec<SettingsPage> {
metadata: None,
files: USER,
}),
- SettingsPageItem::SettingItem(SettingItem {
- title: "Restore File State",
- description: "Restore previous file state when reopening",
- field: Box::new(SettingField {
- pick: |settings_content| &settings_content.workspace.restore_on_file_reopen,
- pick_mut: |settings_content| {
- &mut settings_content.workspace.restore_on_file_reopen
- },
- }),
- metadata: None,
- files: USER,
- }),
- SettingsPageItem::SettingItem(SettingItem {
- title: "Close on File Delete",
- description: "Automatically close files that have been deleted",
- field: Box::new(SettingField {
- pick: |settings_content| &settings_content.workspace.close_on_file_delete,
- pick_mut: |settings_content| {
- &mut settings_content.workspace.close_on_file_delete
- },
- }),
- metadata: None,
- files: USER,
- }),
SettingsPageItem::SettingItem(SettingItem {
title: "Skip Focus For Active In Search",
description: "Whether the file finder should skip focus for the active file in search results",
@@ -1692,10 +1972,68 @@ pub(crate) fn settings_data(cx: &App) -> Vec<SettingsPage> {
files: USER,
}),
SettingsPageItem::SectionHeader("File Scan"),
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "File Scan Exclusions",
+ 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 {
+ pick: |settings_content| {
+ &settings_content.project.worktree.file_scan_exclusions
+ },
+ pick_mut: |settings_content| {
+ &mut settings_content.project.worktree.file_scan_exclusions
+ },
+ }
+ .unimplemented(),
+ ),
+ metadata: None,
+ files: USER,
+ }),
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "File Scan Inclusions",
+ 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 {
+ pick: |settings_content| {
+ &settings_content.project.worktree.file_scan_exclusions
+ },
+ pick_mut: |settings_content| {
+ &mut settings_content.project.worktree.file_scan_exclusions
+ },
+ }
+ .unimplemented(),
+ ),
+ metadata: None,
+ files: USER,
+ }),
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "Restore File State",
+ description: "Restore previous file state when reopening",
+ field: Box::new(SettingField {
+ pick: |settings_content| &settings_content.workspace.restore_on_file_reopen,
+ pick_mut: |settings_content| {
+ &mut settings_content.workspace.restore_on_file_reopen
+ },
+ }),
+ metadata: None,
+ files: USER,
+ }),
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "Close on File Delete",
+ description: "Automatically close files that have been deleted",
+ field: Box::new(SettingField {
+ pick: |settings_content| &settings_content.workspace.close_on_file_delete,
+ pick_mut: |settings_content| {
+ &mut settings_content.workspace.close_on_file_delete
+ },
+ }),
+ metadata: None,
+ files: USER,
+ }),
],
},
SettingsPage {
- title: "Workbench & Window",
+ title: "Window & Layout",
items: vec![
SettingsPageItem::SectionHeader("Status Bar"),
SettingsPageItem::SettingItem(SettingItem {
@@ -2004,24 +2342,6 @@ pub(crate) fn settings_data(cx: &App) -> Vec<SettingsPage> {
metadata: None,
files: USER,
}),
- SettingsPageItem::SettingItem(SettingItem {
- title: "Editor Tabs",
- description: "Show the tab bar in the editor",
- field: Box::new(SettingField {
- pick: |settings_content| {
- if let Some(tab_bar) = &settings_content.tab_bar {
- &tab_bar.show
- } else {
- &None
- }
- },
- pick_mut: |settings_content| {
- &mut settings_content.tab_bar.get_or_insert_default().show
- },
- }),
- metadata: None,
- files: USER,
- }),
SettingsPageItem::SettingItem(SettingItem {
title: "Show Git Status In Tabs",
description: "Show the Git file status on a tab item",
@@ -2240,6 +2560,167 @@ pub(crate) fn settings_data(cx: &App) -> Vec<SettingsPage> {
metadata: None,
files: USER,
}),
+ SettingsPageItem::SectionHeader("Layout"),
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "Bottom Dock Layout",
+ description: "Layout mode for the bottom dock",
+ field: Box::new(SettingField {
+ pick: |settings_content| &settings_content.workspace.bottom_dock_layout,
+ pick_mut: |settings_content| {
+ &mut settings_content.workspace.bottom_dock_layout
+ },
+ }),
+ metadata: None,
+ files: USER,
+ }),
+ SettingsPageItem::SettingItem(SettingItem {
+ files: USER,
+ title: "Centered Layout Left Padding",
+ description: "Left padding for centered layout",
+ field: Box::new(SettingField {
+ pick: |settings_content| {
+ if let Some(centered_layout) =
+ &settings_content.workspace.centered_layout
+ {
+ ¢ered_layout.left_padding
+ } else {
+ &None
+ }
+ },
+ pick_mut: |settings_content| {
+ &mut settings_content
+ .workspace
+ .centered_layout
+ .get_or_insert_default()
+ .left_padding
+ },
+ }),
+ metadata: None,
+ }),
+ SettingsPageItem::SettingItem(SettingItem {
+ files: USER,
+ title: "Centered Layout Right Padding",
+ description: "Right padding for centered layout",
+ field: Box::new(SettingField {
+ pick: |settings_content| {
+ if let Some(centered_layout) =
+ &settings_content.workspace.centered_layout
+ {
+ ¢ered_layout.right_padding
+ } else {
+ &None
+ }
+ },
+ pick_mut: |settings_content| {
+ &mut settings_content
+ .workspace
+ .centered_layout
+ .get_or_insert_default()
+ .right_padding
+ },
+ }),
+ metadata: None,
+ }),
+ SettingsPageItem::SectionHeader("Window"),
+ // todo(settings_ui): Should we filter by platform?
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "Use System Window Tabs",
+ description: "(macOS only) Whether to allow windows to tab together",
+ field: Box::new(SettingField {
+ pick: |settings_content| &settings_content.workspace.use_system_window_tabs,
+ pick_mut: |settings_content| {
+ &mut settings_content.workspace.use_system_window_tabs
+ },
+ }),
+ metadata: None,
+ files: USER,
+ }),
+ SettingsPageItem::SectionHeader("Pane Modifiers"),
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "Inactive Opacity",
+ description: "Opacity of inactive panels (0.0 - 1.0)",
+ field: Box::new(SettingField {
+ pick: |settings_content| match settings_content
+ .workspace
+ .active_pane_modifiers
+ .as_ref()
+ {
+ Some(modifiers) => &modifiers.inactive_opacity,
+ None => &None,
+ },
+ pick_mut: |settings_content| {
+ &mut settings_content
+ .workspace
+ .active_pane_modifiers
+ .get_or_insert_default()
+ .inactive_opacity
+ },
+ }),
+ metadata: None,
+ files: USER,
+ }),
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "Border Size",
+ description: "Size of the border surrounding the active pane",
+ field: Box::new(SettingField {
+ pick: |settings_content| match settings_content
+ .workspace
+ .active_pane_modifiers
+ .as_ref()
+ {
+ Some(modifiers) => &modifiers.border_size,
+ None => &None,
+ },
+ pick_mut: |settings_content| {
+ &mut settings_content
+ .workspace
+ .active_pane_modifiers
+ .get_or_insert_default()
+ .border_size
+ },
+ }),
+ metadata: None,
+ files: USER,
+ }),
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "Zoomed Padding",
+ description: "Show padding for zoomed panes",
+ field: Box::new(SettingField {
+ pick: |settings_content| &settings_content.workspace.zoomed_padding,
+ pick_mut: |settings_content| &mut settings_content.workspace.zoomed_padding,
+ }),
+ metadata: None,
+ files: USER,
+ }),
+ SettingsPageItem::SectionHeader("Pane Split Direction"),
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "Vertical Split Direction",
+ description: "Direction to split vertically",
+ field: Box::new(SettingField {
+ pick: |settings_content| {
+ &settings_content.workspace.pane_split_direction_vertical
+ },
+ pick_mut: |settings_content| {
+ &mut settings_content.workspace.pane_split_direction_vertical
+ },
+ }),
+ metadata: None,
+ files: USER,
+ }),
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "Horizontal Split Direction",
+ description: "Direction to split horizontally",
+ field: Box::new(SettingField {
+ pick: |settings_content| {
+ &settings_content.workspace.pane_split_direction_horizontal
+ },
+ pick_mut: |settings_content| {
+ &mut settings_content.workspace.pane_split_direction_horizontal
+ },
+ }),
+ metadata: None,
+ files: USER,
+ }),
],
},
SettingsPage {
@@ -1,4 +1,3 @@
-//! # settings_ui
mod components;
mod page_data;
@@ -16,10 +15,7 @@ use heck::ToTitleCase as _;
use project::WorktreeId;
use schemars::JsonSchema;
use serde::Deserialize;
-use settings::{
- BottomDockLayout, CloseWindowWhenNoItems, CodeFade, CursorShape, OnLastWindowClosed,
- RestoreOnStartupBehavior, SaturatingBool, SettingsContent, SettingsStore,
-};
+use settings::{SettingsContent, SettingsStore};
use std::{
any::{Any, TypeId, type_name},
cell::RefCell,
@@ -330,8 +326,10 @@ impl Focusable for NonFocusableHandle {
}
}
+#[derive(Default)]
struct SettingsFieldMetadata {
placeholder: Option<&'static str>,
+ should_do_titlecase: Option<bool>,
}
pub struct SettingsUiFeatureFlag;
@@ -369,12 +367,12 @@ fn init_renderers(cx: &mut App) {
})
.add_basic_renderer::<bool>(render_toggle_button)
.add_basic_renderer::<String>(render_text_field)
- .add_basic_renderer::<SaturatingBool>(render_toggle_button)
- .add_basic_renderer::<CursorShape>(render_dropdown)
- .add_basic_renderer::<RestoreOnStartupBehavior>(render_dropdown)
- .add_basic_renderer::<BottomDockLayout>(render_dropdown)
- .add_basic_renderer::<OnLastWindowClosed>(render_dropdown)
- .add_basic_renderer::<CloseWindowWhenNoItems>(render_dropdown)
+ .add_basic_renderer::<settings::SaturatingBool>(render_toggle_button)
+ .add_basic_renderer::<settings::CursorShape>(render_dropdown)
+ .add_basic_renderer::<settings::RestoreOnStartupBehavior>(render_dropdown)
+ .add_basic_renderer::<settings::BottomDockLayout>(render_dropdown)
+ .add_basic_renderer::<settings::OnLastWindowClosed>(render_dropdown)
+ .add_basic_renderer::<settings::CloseWindowWhenNoItems>(render_dropdown)
.add_basic_renderer::<settings::FontFamilyName>(render_font_picker)
// todo(settings_ui): This needs custom ui
// .add_renderer::<settings::BufferLineHeight>(|settings_field, file, _, window, cx| {
@@ -421,7 +419,7 @@ fn init_renderers(cx: &mut App) {
.add_basic_renderer::<usize>(render_number_field)
.add_basic_renderer::<NonZero<usize>>(render_number_field)
.add_basic_renderer::<NonZeroU32>(render_number_field)
- .add_basic_renderer::<CodeFade>(render_number_field)
+ .add_basic_renderer::<settings::CodeFade>(render_number_field)
.add_basic_renderer::<FontWeight>(render_number_field)
.add_basic_renderer::<settings::MinimumContrast>(render_number_field)
.add_basic_renderer::<settings::ShowScrollbar>(render_dropdown)
@@ -431,7 +429,15 @@ fn init_renderers(cx: &mut App) {
.add_basic_renderer::<settings::MinimapThumb>(render_dropdown)
.add_basic_renderer::<settings::MinimapThumbBorder>(render_dropdown)
.add_basic_renderer::<settings::SteppingGranularity>(render_dropdown)
- .add_basic_renderer::<settings::NotifyWhenAgentWaiting>(render_dropdown);
+ .add_basic_renderer::<settings::NotifyWhenAgentWaiting>(render_dropdown)
+ .add_basic_renderer::<settings::ImageFileSizeUnit>(render_dropdown)
+ .add_basic_renderer::<settings::StatusStyle>(render_dropdown)
+ .add_basic_renderer::<settings::PaneSplitDirectionHorizontal>(render_dropdown)
+ .add_basic_renderer::<settings::PaneSplitDirectionVertical>(render_dropdown)
+ .add_basic_renderer::<settings::PaneSplitDirectionVertical>(render_dropdown)
+ .add_basic_renderer::<settings::DocumentColorsRenderMode>(render_dropdown)
+ // please semicolon stay on next line
+ ;
// .add_renderer::<ThemeSelection>(|settings_field, file, _, window, cx| {
// render_dropdown(*settings_field, file, window, cx)
// });
@@ -1913,7 +1919,7 @@ impl SettingsWindow {
return;
};
self.page_scroll_handle
- .scroll_to_top_of_item(selected_item_index);
+ .scroll_to_top_of_item(selected_item_index + 1);
if focus_content {
self.focus_content_element(entry_item_index, window, cx);
@@ -2606,7 +2612,7 @@ fn render_number_field<T: NumberFieldType + Send + Sync>(
fn render_dropdown<T>(
field: SettingField<T>,
file: SettingsUiFile,
- _metadata: Option<&SettingsFieldMetadata>,
+ metadata: Option<&SettingsFieldMetadata>,
window: &mut Window,
cx: &mut App,
) -> AnyElement
@@ -2615,6 +2621,9 @@ where
{
let variants = || -> &'static [T] { <T as strum::VariantArray>::VARIANTS };
let labels = || -> &'static [&'static str] { <T as strum::VariantNames>::VARIANTS };
+ let should_do_titlecase = metadata
+ .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);
@@ -2625,12 +2634,20 @@ where
DropdownMenu::new(
"dropdown",
- current_value_label.to_title_case(),
+ if should_do_titlecase {
+ current_value_label.to_title_case()
+ } else {
+ current_value_label.to_string()
+ },
ContextMenu::build(window, cx, move |mut menu, _, _| {
for (&value, &label) in std::iter::zip(variants(), labels()) {
let file = file.clone();
menu = menu.toggleable_entry(
- label.to_title_case(),
+ if should_do_titlecase {
+ label.to_title_case()
+ } else {
+ label.to_string()
+ },
value == current_value,
IconPosition::End,
None,