Anthony EidandBen Kunkle
5f03202b5c
This PR separates out the associated constant `KEY` from the `Settings` trait into a new trait `SettingsKey`. This allows for the key trait to be derived using attributes to specify the path so that the new `SettingsUi` derive macro can use the same attributes to determine top level settings paths thereby removing the need to duplicate the path in both `Settings::KEY` and `#[settings_ui(path = "...")]` Co-authored-by: Ben Kunkle <ben@zed.dev> Release Notes: - N/A --------- Co-authored-by: Ben Kunkle <ben@zed.dev>
33 lines
1.1 KiB
Rust
33 lines
1.1 KiB
Rust
use anyhow::Result;
|
|
use gpui::App;
|
|
use schemars::JsonSchema;
|
|
use serde::{Deserialize, Serialize};
|
|
use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
|
|
|
|
#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
|
|
pub struct AudioSettings {
|
|
/// Opt into the new audio system.
|
|
#[serde(rename = "experimental.rodio_audio", default)]
|
|
pub rodio_audio: bool, // default is false
|
|
}
|
|
|
|
/// Configuration of audio in Zed.
|
|
#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey)]
|
|
#[serde(default)]
|
|
#[settings_key(key = "audio")]
|
|
pub struct AudioSettingsContent {
|
|
/// Whether to use the experimental audio system
|
|
#[serde(rename = "experimental.rodio_audio", default)]
|
|
pub rodio_audio: bool,
|
|
}
|
|
|
|
impl Settings for AudioSettings {
|
|
type FileContent = AudioSettingsContent;
|
|
|
|
fn load(sources: SettingsSources<Self::FileContent>, _cx: &mut App) -> Result<Self> {
|
|
sources.json_merge()
|
|
}
|
|
|
|
fn import_from_vscode(_vscode: &settings::VsCodeSettings, _current: &mut Self::FileContent) {}
|
|
}
|