mirror of
https://github.com/zed-industries/zed.git
synced 2025-02-10 04:09:37 +00:00
7c5bc3c26f
This PR adds the ability for extensions to provide certain language settings via the language `config.toml`. These settings are then merged in with the rest of the settings when the language is loaded from the extension. The language settings that are available are: - `tab_size` - `hard_tabs` - `soft_wrap` Additionally, for bundled languages we moved these settings out of the `settings/default.json` and into their respective `config.toml`s . For languages currently provided by extensions, we are leaving the values in the `settings/default.json` temporarily until all released versions of Zed are able to load these settings from the extension. --- Along the way we ended up refactoring the `Settings::load` method slightly, introducing a new `SettingsSources` struct to better convey where the settings are being loaded from. This makes it easier to load settings from specific locations/sets of locations in an explicit way. Release Notes: - N/A --------- Co-authored-by: Max <max@zed.dev> Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
81 lines
2.4 KiB
Rust
81 lines
2.4 KiB
Rust
use std::fmt::{Display, Formatter};
|
|
|
|
use schemars::JsonSchema;
|
|
use serde::{Deserialize, Serialize};
|
|
use settings::{Settings, SettingsSources};
|
|
|
|
/// Base key bindings scheme. Base keymaps can be overridden with user keymaps.
|
|
///
|
|
/// Default: VSCode
|
|
#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq, Default)]
|
|
pub enum BaseKeymap {
|
|
#[default]
|
|
VSCode,
|
|
JetBrains,
|
|
SublimeText,
|
|
Atom,
|
|
TextMate,
|
|
None,
|
|
}
|
|
|
|
impl Display for BaseKeymap {
|
|
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
|
|
match self {
|
|
BaseKeymap::VSCode => write!(f, "VSCode"),
|
|
BaseKeymap::JetBrains => write!(f, "JetBrains"),
|
|
BaseKeymap::SublimeText => write!(f, "Sublime Text"),
|
|
BaseKeymap::Atom => write!(f, "Atom"),
|
|
BaseKeymap::TextMate => write!(f, "TextMate"),
|
|
BaseKeymap::None => write!(f, "None"),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl BaseKeymap {
|
|
pub const OPTIONS: [(&'static str, Self); 5] = [
|
|
("VSCode (Default)", Self::VSCode),
|
|
("Atom", Self::Atom),
|
|
("JetBrains", Self::JetBrains),
|
|
("Sublime Text", Self::SublimeText),
|
|
("TextMate", Self::TextMate),
|
|
];
|
|
|
|
pub fn asset_path(&self) -> Option<&'static str> {
|
|
match self {
|
|
BaseKeymap::JetBrains => Some("keymaps/jetbrains.json"),
|
|
BaseKeymap::SublimeText => Some("keymaps/sublime_text.json"),
|
|
BaseKeymap::Atom => Some("keymaps/atom.json"),
|
|
BaseKeymap::TextMate => Some("keymaps/textmate.json"),
|
|
BaseKeymap::VSCode => None,
|
|
BaseKeymap::None => None,
|
|
}
|
|
}
|
|
|
|
pub fn names() -> impl Iterator<Item = &'static str> {
|
|
Self::OPTIONS.iter().map(|(name, _)| *name)
|
|
}
|
|
|
|
pub fn from_names(option: &str) -> BaseKeymap {
|
|
Self::OPTIONS
|
|
.iter()
|
|
.copied()
|
|
.find_map(|(name, value)| (name == option).then(|| value))
|
|
.unwrap_or_default()
|
|
}
|
|
}
|
|
|
|
impl Settings for BaseKeymap {
|
|
const KEY: Option<&'static str> = Some("base_keymap");
|
|
|
|
type FileContent = Option<Self>;
|
|
|
|
fn load(
|
|
sources: SettingsSources<Self::FileContent>,
|
|
_: &mut gpui::AppContext,
|
|
) -> anyhow::Result<Self> {
|
|
if let Some(Some(user_value)) = sources.user.copied() {
|
|
return Ok(user_value);
|
|
}
|
|
sources.default.ok_or_else(Self::missing_default)
|
|
}
|
|
}
|