Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions src/language_servers/ruby_lsp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,36 @@ impl RubyLsp {
_ => None,
}
}

pub fn language_server_initialization_options(
&self,
language_server_id: &zed::LanguageServerId,
worktree: &zed::Worktree,
) -> zed::Result<Option<zed::serde_json::Value>> {
let mut initialization_options =
zed::settings::LspSettings::for_worktree(language_server_id.as_ref(), worktree)
.ok()
.and_then(|lsp_settings| lsp_settings.initialization_options.clone())
.unwrap_or_else(|| zed::serde_json::json!({}));

let options_obj = initialization_options
.as_object_mut()
.expect("initialization_options must be an object");

let enabled_features = options_obj
.entry("enabledFeatures")
.or_insert_with(|| zed::serde_json::json!({}));

// Workaround ruby-lsp upstream issue
// https://github.com/zed-extensions/ruby/issues/38
if let Some(features_obj) = enabled_features.as_object_mut() {
features_obj
.entry("onTypeFormatting")
.or_insert(zed::serde_json::Value::Bool(false));
}

Ok(Some(initialization_options))
}
}

#[cfg(test)]
Expand Down
19 changes: 12 additions & 7 deletions src/ruby.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,18 @@ impl zed::Extension for RubyExtension {
language_server_id: &zed::LanguageServerId,
worktree: &zed::Worktree,
) -> zed::Result<Option<zed::serde_json::Value>> {
let initialization_options =
zed::settings::LspSettings::for_worktree(language_server_id.as_ref(), worktree)
.ok()
.and_then(|lsp_settings| lsp_settings.initialization_options.clone())
.unwrap_or_default();

Ok(Some(zed::serde_json::json!(initialization_options)))
match language_server_id.as_ref() {
RubyLsp::SERVER_ID => {
let ruby = self.ruby_lsp.get_or_insert_with(RubyLsp::new);
ruby.language_server_initialization_options(language_server_id, worktree)
}
_ => Ok(Some(
zed::settings::LspSettings::for_worktree(language_server_id.as_ref(), worktree)
.ok()
.and_then(|lsp_settings| lsp_settings.initialization_options.clone())
.unwrap_or_default(),
)),
}
}

fn label_for_completion(
Expand Down