Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add ability to provide custom LSP server initialization options

Browse source
This commit is contained in:
ForLoveOfCats 2022-08-03 22:32:18 -04:00
parent 134803745a
commit c21314bfbd
3 changed files with 47 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/settings/src/settings.rs
View file

@ -34,6 +34,7 @@ pub struct Settings {
pub terminal_overrides: TerminalSettings,
pub language_defaults: HashMap<Arc<str>, EditorSettings>,
pub language_overrides: HashMap<Arc<str>, EditorSettings>,
pub lsp: HashMap<Arc<str>, LspSettings>,
pub theme: Arc<Theme>,
}
@ -131,9 +132,17 @@ pub struct SettingsFileContent {
#[serde(alias = "language_overrides")]
pub languages: HashMap<Arc<str>, EditorSettings>,
#[serde(default)]
pub lsp: HashMap<Arc<str>, LspSettings>,
#[serde(default)]
pub theme: Option<String>,
}
#[derive(Clone, Debug, Deserialize, PartialEq, Eq, JsonSchema)]
#[serde(rename_all = "snake_case")]
pub struct LspSettings {
pub initialization_options: Option<Value>,
}
impl Settings {
pub fn defaults(
assets: impl AssetSource,
@ -174,6 +183,7 @@ impl Settings {
terminal_overrides: Default::default(),
language_defaults: defaults.languages,
language_overrides: Default::default(),
lsp: defaults.lsp.clone(),
theme: themes.get(&defaults.theme.unwrap()).unwrap(),
}
}
@ -218,6 +228,7 @@ impl Settings {
self.terminal_defaults.font_size = data.terminal.font_size;
self.terminal_overrides = data.terminal;
self.language_overrides = data.languages;
self.lsp = data.lsp;
}
pub fn with_language_defaults(
@ -288,6 +299,7 @@ impl Settings {
terminal_overrides: Default::default(),
language_defaults: Default::default(),
language_overrides: Default::default(),
lsp: Default::default(),
projects_online_by_default: true,
theme: gpui::fonts::with_font_cache(cx.font_cache().clone(), || Default::default()),
}