From 21d66eb9d593dafdf9d878ddeae0e7fcd08549df Mon Sep 17 00:00:00 2001 From: Bennet Bo Fenner Date: Thu, 2 Jul 2026 13:45:37 +0200 Subject: [PATCH] settings: Remove unused `message_editor` setting (#60260) Used this at one point when we still had chat in Collab, but now it's unused. Release Notes: - N/A --- assets/settings/default.json | 5 ---- crates/settings/src/vscode_import.rs | 1 - .../settings_content/src/settings_content.rs | 13 ---------- crates/settings_ui/src/page_data.rs | 26 +------------------ 4 files changed, 1 insertion(+), 44 deletions(-) diff --git a/assets/settings/default.json b/assets/settings/default.json index 74c6252fe7..8725587ade 100644 --- a/assets/settings/default.json +++ b/assets/settings/default.json @@ -1025,11 +1025,6 @@ // Default: project_diff "entry_primary_click_action": "project_diff", }, - "message_editor": { - // Whether to automatically replace emoji shortcodes with emoji characters. - // For example: typing `:wave:` gets replaced with `👋`. - "auto_replace_emoji_shortcode": true, - }, "agent": { // Whether the inline assistant should use streaming tools, when available "inline_assistant_use_streaming_tools": true, diff --git a/crates/settings/src/vscode_import.rs b/crates/settings/src/vscode_import.rs index 75b953e7cb..f7ad53118d 100644 --- a/crates/settings/src/vscode_import.rs +++ b/crates/settings/src/vscode_import.rs @@ -199,7 +199,6 @@ impl VsCodeSettings { language_models: None, line_indicator_format: None, log: None, - message_editor: None, node: self.node_binary_settings(), outline_panel: self.outline_panel_settings_content(), diff --git a/crates/settings_content/src/settings_content.rs b/crates/settings_content/src/settings_content.rs index a1d1a43381..f0f652d2ba 100644 --- a/crates/settings_content/src/settings_content.rs +++ b/crates/settings_content/src/settings_content.rs @@ -211,9 +211,6 @@ pub struct SettingsContent { pub project_panel: Option, - /// Configuration for the Message Editor - pub message_editor: Option, - /// Configuration for Node-related features pub node: Option, @@ -839,16 +836,6 @@ pub struct PanelSettingsContent { pub default_width: Option, } -#[with_fallible_options] -#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, MergeFrom, Debug, PartialEq)] -pub struct MessageEditorSettings { - /// Whether to automatically replace emoji shortcodes with emoji characters. - /// For example: typing `:wave:` gets replaced with `👋`. - /// - /// Default: false - pub auto_replace_emoji_shortcode: Option, -} - #[with_fallible_options] #[derive(Clone, Default, Serialize, Deserialize, JsonSchema, MergeFrom, Debug, PartialEq)] pub struct FileFinderSettingsContent { diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs index 34ee444072..94dff0038f 100644 --- a/crates/settings_ui/src/page_data.rs +++ b/crates/settings_ui/src/page_data.rs @@ -9791,7 +9791,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { ] } - fn global_only_miscellaneous_sub_section() -> [SettingsPageItem; 4] { + fn global_only_miscellaneous_sub_section() -> [SettingsPageItem; 3] { [ SettingsPageItem::SettingItem(SettingItem { title: "Image Viewer", @@ -9871,30 +9871,6 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { }], ], }), - SettingsPageItem::SettingItem(SettingItem { - title: "Auto Replace Emoji Shortcode", - description: "Whether to automatically replace emoji shortcodes with emoji characters.", - field: Box::new(SettingField { - organization_override: None, - json_path: Some("message_editor.auto_replace_emoji_shortcode"), - pick: |settings_content| { - settings_content - .message_editor - .as_ref() - .and_then(|message_editor| { - message_editor.auto_replace_emoji_shortcode.as_ref() - }) - }, - write: |settings_content, value, _| { - settings_content - .message_editor - .get_or_insert_default() - .auto_replace_emoji_shortcode = value; - }, - }), - metadata: None, - files: USER, - }), SettingsPageItem::SettingItem(SettingItem { title: "Drop Size Target", description: "Relative size of the drop target in the editor that will open dropped file as a split pane.",