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
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.steep]
name = "Steep"
languages = ["Ruby"]

[grammars.ruby]
repository = "https://github.com/tree-sitter/tree-sitter-ruby"
commit = "71bd32fb7607035768799732addba884a37a6210"
Expand Down
2 changes: 2 additions & 0 deletions src/language_servers/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ mod language_server;
mod rubocop;
mod ruby_lsp;
mod solargraph;
mod steep;

pub use language_server::LanguageServer;
pub use rubocop::*;
pub use ruby_lsp::*;
pub use solargraph::*;
pub use steep::*;
74 changes: 74 additions & 0 deletions src/language_servers/steep.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
use super::LanguageServer;
use zed_extension_api::{
self as zed, set_language_server_installation_status, settings::LspSettings, LanguageServerId,
LanguageServerInstallationStatus, Result,
};

pub struct Steep {}

impl LanguageServer for Steep {
const SERVER_ID: &str = "steep";
const EXECUTABLE_NAME: &str = "steep";
const GEM_NAME: &str = "steep";

fn get_executable_args() -> Vec<String> {
vec!["langserver".to_string()]
}

fn language_server_command(
&mut self,
language_server_id: &LanguageServerId,
worktree: &zed::Worktree,
) -> Result<zed::Command> {
let lsp_settings = LspSettings::for_worktree(language_server_id.as_ref(), worktree)?;

let require_root_steepfile = lsp_settings
.settings
.as_ref()
.and_then(|settings| settings["require_root_steepfile"].as_bool())
.unwrap_or(true);

if require_root_steepfile && worktree.read_text_file("Steepfile").is_err() {
return Err("Steep language server requires a Steepfile in the project root. You can disable this requirement by setting 'require_root_steepfile': false in your LSP settings.".to_string());
}

let binary = self.language_server_binary(language_server_id, worktree)?;

set_language_server_installation_status(
language_server_id,
&LanguageServerInstallationStatus::None,
);

Ok(zed::Command {
command: binary.path,
args: binary.args.unwrap_or(Self::get_executable_args()),
env: binary.env.unwrap_or_default(),
})
}
}

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

#[cfg(test)]
mod tests {
use crate::language_servers::{LanguageServer, Steep};

#[test]
fn test_server_id() {
assert_eq!(Steep::SERVER_ID, "steep");
}

#[test]
fn test_executable_name() {
assert_eq!(Steep::EXECUTABLE_NAME, "steep");
}

#[test]
fn test_executable_args() {
assert_eq!(Steep::get_executable_args(), vec!["langserver"]);
}
}
7 changes: 6 additions & 1 deletion src/ruby.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ mod bundler;
mod command_executor;
mod gemset;
mod language_servers;
use language_servers::{LanguageServer, Rubocop, RubyLsp, Solargraph};
use language_servers::{LanguageServer, Rubocop, RubyLsp, Solargraph, Steep};

use zed::lsp::{Completion, Symbol};
use zed::settings::LspSettings;
Expand All @@ -14,6 +14,7 @@ struct RubyExtension {
solargraph: Option<Solargraph>,
ruby_lsp: Option<RubyLsp>,
rubocop: Option<Rubocop>,
steep: Option<Steep>,
}

impl zed::Extension for RubyExtension {
Expand All @@ -39,6 +40,10 @@ impl zed::Extension for RubyExtension {
let rubocop = self.rubocop.get_or_insert_with(Rubocop::new);
rubocop.language_server_command(language_server_id, worktree)
}
Steep::SERVER_ID => {
let steep = self.steep.get_or_insert_with(Steep::new);
steep.language_server_command(language_server_id, worktree)
}
language_server_id => Err(format!("unknown language server: {language_server_id}")),
}
}
Expand Down