Skip to content
Closed
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
4 changes: 4 additions & 0 deletions extension.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ languages = ["Ruby", "ERB"]
name = "Rubocop"
languages = ["Ruby"]

[language_servers.sorbet]
name = "Sorbet"
languages = ["Ruby"]

[grammars.ruby]
repository = "https://github.com/tree-sitter/tree-sitter-ruby"
commit = "7dbc1e2d0e2d752577655881f73b4573f3fe85d4"
Expand Down
2 changes: 2 additions & 0 deletions src/language_servers.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
mod rubocop;
mod ruby_lsp;
mod solargraph;
mod sorbet;

pub use rubocop::*;
pub use ruby_lsp::*;
pub use solargraph::*;
pub use sorbet::*;
139 changes: 139 additions & 0 deletions src/language_servers/sorbet.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
use zed_extension_api::{
self as zed,
lsp::{Completion, CompletionKind, Symbol, SymbolKind},
settings::LspSettings,
CodeLabel, CodeLabelSpan, LanguageServerId, Result,
};

pub struct SorbetBinary {
pub path: String,
pub args: Option<Vec<String>>,
}

pub struct Sorbet {}

impl Sorbet {
pub const LANGUAGE_SERVER_ID: &'static str = "sorbet";

pub fn new() -> Self {
Self {}
}

pub fn language_server_command(
&mut self,
language_server_id: &LanguageServerId,
worktree: &zed::Worktree,
) -> Result<zed::Command> {
let binary = self.language_server_binary(language_server_id, worktree)?;

Ok(zed::Command {
command: binary.path,
args: binary.args.unwrap_or_default(),
env: worktree.shell_env(),
})
}

fn language_server_binary(
&self,
language_server_id: &LanguageServerId,
worktree: &zed::Worktree,
) -> Result<SorbetBinary> {
let binary_settings =
LspSettings::for_worktree(language_server_id.to_string().as_str(), worktree)
.ok()
.and_then(|lsp_settings| lsp_settings.binary);

let default_binary_args = Some(
vec![
"tc",
"--lsp",
"--enable-experimental-lsp-document-highlight",
]
.iter()
.map(|s| s.to_string())
.collect(),
);

let binary_args = binary_settings
.as_ref()
.and_then(|binary_settings| binary_settings.arguments.clone())
.or(default_binary_args);

if let Some(path) = binary_settings.and_then(|binary_settings| binary_settings.path) {
return Ok(SorbetBinary {
path,
args: binary_args,
});
}

if let Some(path) = worktree.which("srb") {
return Ok(SorbetBinary {
path,
args: binary_args,
});
}

Err("srb gem must be installed manually. Install it with `gem install sorbet`.".to_string())
}

pub fn label_for_completion(&self, completion: Completion) -> Option<CodeLabel> {
let highlight_name = match completion.kind? {
CompletionKind::Class | CompletionKind::Module => "type",
CompletionKind::Constant => "constant",
CompletionKind::Method => "function.method",
CompletionKind::Reference => "function.method",
CompletionKind::Keyword => "keyword",
_ => return None,
};

let len = completion.label.len();
let name_span = CodeLabelSpan::literal(completion.label, Some(highlight_name.to_string()));

Some(CodeLabel {
code: Default::default(),
spans: vec![name_span],
filter_range: (0..len).into(),
})
}

pub fn label_for_symbol(&self, symbol: Symbol) -> Option<CodeLabel> {
let name = &symbol.name;

match symbol.kind {
SymbolKind::Method => {
let code = format!("def {name}; end");
let filter_range = 0..name.len();
let display_range = 4..4 + name.len();

Some(CodeLabel {
code,
spans: vec![CodeLabelSpan::code_range(display_range)],
filter_range: filter_range.into(),
})
}
SymbolKind::Class | SymbolKind::Module => {
let code = format!("class {name}; end");
let filter_range = 0..name.len();
let display_range = 6..6 + name.len();

Some(CodeLabel {
code,
spans: vec![CodeLabelSpan::code_range(display_range)],
filter_range: filter_range.into(),
})
}
SymbolKind::Constant => {
let code = name.to_uppercase().to_string();
let filter_range = 0..name.len();
let display_range = 0..name.len();

Some(CodeLabel {
code,
spans: vec![CodeLabelSpan::code_range(display_range)],
filter_range: filter_range.into(),
})
}
_ => None,
}
}
}
10 changes: 9 additions & 1 deletion src/ruby.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ use zed::settings::LspSettings;
use zed::{serde_json, CodeLabel, LanguageServerId};
use zed_extension_api::{self as zed, Result};

use crate::language_servers::{Rubocop, RubyLsp, Solargraph};
use crate::language_servers::{Rubocop, RubyLsp, Solargraph, Sorbet};

struct RubyExtension {
solargraph: Option<Solargraph>,
ruby_lsp: Option<RubyLsp>,
rubocop: Option<Rubocop>,
sorbet: Option<Sorbet>,
}

impl zed::Extension for RubyExtension {
Expand All @@ -19,6 +20,7 @@ impl zed::Extension for RubyExtension {
solargraph: None,
ruby_lsp: None,
rubocop: None,
sorbet: None,
}
}

Expand All @@ -40,6 +42,10 @@ impl zed::Extension for RubyExtension {
let rubocop = self.rubocop.get_or_insert_with(Rubocop::new);
rubocop.language_server_command(language_server_id, worktree)
}
Sorbet::LANGUAGE_SERVER_ID => {
let sorbet = self.sorbet.get_or_insert_with(Sorbet::new);
sorbet.language_server_command(language_server_id, worktree)
}
language_server_id => Err(format!("unknown language server: {language_server_id}")),
}
}
Expand All @@ -52,6 +58,7 @@ impl zed::Extension for RubyExtension {
match language_server_id.as_ref() {
Solargraph::LANGUAGE_SERVER_ID => self.solargraph.as_ref()?.label_for_symbol(symbol),
RubyLsp::LANGUAGE_SERVER_ID => self.ruby_lsp.as_ref()?.label_for_symbol(symbol),
Sorbet::LANGUAGE_SERVER_ID => self.sorbet.as_ref()?.label_for_symbol(symbol),
_ => None,
}
}
Expand All @@ -66,6 +73,7 @@ impl zed::Extension for RubyExtension {
self.solargraph.as_ref()?.label_for_completion(completion)
}
RubyLsp::LANGUAGE_SERVER_ID => self.ruby_lsp.as_ref()?.label_for_completion(completion),
Sorbet::LANGUAGE_SERVER_ID => self.sorbet.as_ref()?.label_for_completion(completion),
_ => None,
}
}
Expand Down