be83c5e1c5
This PR updates two existing settings to use the settings migrator instead of a manually implemented visitor. Both of these settings were changed prior to the introduction of automatic migrations and the visitor ensured that the settings were kept backwards compatible. See https://github.com/zed-industries/zed/pull/22200 and https://github.com/zed-industries/zed/pull/22364 respectively. WIth this change, existing user configurations are updated accordingly and the corresponding settings can derive `Deserialize` again. I also added tests for the replacement of settings values, as there was no test for this behaviour. Additionally, I added a seperate test for the existing migration of `always_show_close_button`, since that migration updated both the key and value. Release Notes: - N/A
128 lines
3.2 KiB
Rust
128 lines
3.2 KiB
Rust
use gpui::Pixels;
|
|
use schemars::JsonSchema;
|
|
use serde::{Deserialize, Serialize};
|
|
use settings::{Settings, SettingsSources};
|
|
use workspace::dock::DockPosition;
|
|
|
|
#[derive(Deserialize, Debug)]
|
|
pub struct CollaborationPanelSettings {
|
|
pub button: bool,
|
|
pub dock: DockPosition,
|
|
pub default_width: Pixels,
|
|
}
|
|
|
|
#[derive(Clone, Copy, Default, Serialize, Deserialize, JsonSchema, Debug)]
|
|
#[serde(rename_all = "snake_case")]
|
|
pub enum ChatPanelButton {
|
|
Never,
|
|
Always,
|
|
#[default]
|
|
WhenInCall,
|
|
}
|
|
|
|
#[derive(Deserialize, Debug)]
|
|
pub struct ChatPanelSettings {
|
|
pub button: ChatPanelButton,
|
|
pub dock: DockPosition,
|
|
pub default_width: Pixels,
|
|
}
|
|
|
|
#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
|
|
pub struct ChatPanelSettingsContent {
|
|
/// When to show the panel button in the status bar.
|
|
///
|
|
/// Default: only when in a call
|
|
pub button: Option<ChatPanelButton>,
|
|
/// Where to dock the panel.
|
|
///
|
|
/// Default: right
|
|
pub dock: Option<DockPosition>,
|
|
/// Default width of the panel in pixels.
|
|
///
|
|
/// Default: 240
|
|
pub default_width: Option<f32>,
|
|
}
|
|
|
|
#[derive(Deserialize, Debug)]
|
|
pub struct NotificationPanelSettings {
|
|
pub button: bool,
|
|
pub dock: DockPosition,
|
|
pub default_width: Pixels,
|
|
}
|
|
|
|
#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
|
|
pub struct PanelSettingsContent {
|
|
/// Whether to show the panel button in the status bar.
|
|
///
|
|
/// Default: true
|
|
pub button: Option<bool>,
|
|
/// Where to dock the panel.
|
|
///
|
|
/// Default: left
|
|
pub dock: Option<DockPosition>,
|
|
/// Default width of the panel in pixels.
|
|
///
|
|
/// Default: 240
|
|
pub default_width: Option<f32>,
|
|
}
|
|
|
|
#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
|
|
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<bool>,
|
|
}
|
|
|
|
impl Settings for CollaborationPanelSettings {
|
|
const KEY: Option<&'static str> = Some("collaboration_panel");
|
|
|
|
type FileContent = PanelSettingsContent;
|
|
|
|
fn load(
|
|
sources: SettingsSources<Self::FileContent>,
|
|
_: &mut gpui::App,
|
|
) -> anyhow::Result<Self> {
|
|
sources.json_merge()
|
|
}
|
|
}
|
|
|
|
impl Settings for ChatPanelSettings {
|
|
const KEY: Option<&'static str> = Some("chat_panel");
|
|
|
|
type FileContent = ChatPanelSettingsContent;
|
|
|
|
fn load(
|
|
sources: SettingsSources<Self::FileContent>,
|
|
_: &mut gpui::App,
|
|
) -> anyhow::Result<Self> {
|
|
sources.json_merge()
|
|
}
|
|
}
|
|
|
|
impl Settings for NotificationPanelSettings {
|
|
const KEY: Option<&'static str> = Some("notification_panel");
|
|
|
|
type FileContent = PanelSettingsContent;
|
|
|
|
fn load(
|
|
sources: SettingsSources<Self::FileContent>,
|
|
_: &mut gpui::App,
|
|
) -> anyhow::Result<Self> {
|
|
sources.json_merge()
|
|
}
|
|
}
|
|
|
|
impl Settings for MessageEditorSettings {
|
|
const KEY: Option<&'static str> = Some("message_editor");
|
|
|
|
type FileContent = MessageEditorSettings;
|
|
|
|
fn load(
|
|
sources: SettingsSources<Self::FileContent>,
|
|
_: &mut gpui::App,
|
|
) -> anyhow::Result<Self> {
|
|
sources.json_merge()
|
|
}
|
|
}
|