WIP

Author: vitallium

Cargo.lock

@@ -10,4 +10,4 @@ path = "src/ruby.rs"
 crate-type = ["cdylib"]
 
 [dependencies]
-zed_extension_api = { path = "../zed/crates/extension_api" }
+zed_extension_api = "0.3.0"

Cargo.toml

@@ -29,3 +29,13 @@ commit = "332262529bc51abf5746317b2255ccc2fff778f8"
 [grammars.rbs]
 repository = "https://github.com/joker1007/tree-sitter-rbs"
 commit = "de893b166476205b09e79cd3689f95831269579a"
+
+[[capabilities]]
+kind = "process:exec"
+command = "gem"
+args = ["install", "--no-user-install", "--no-format-executable", "--no-document", "*"]
+
+[[capabilities]]
+kind = "process:exec"
+command = "bundle"
+args = ["info", "*"]

extension.toml

@@ -6,6 +6,7 @@ use zed_extension_api::{
 pub struct LanguageServerBinary {
     pub path: String,
     pub args: Option<Vec<String>>,
+    pub env: Option<Vec<(String, String)>>,
 }
 
 pub trait LanguageServer {
@@ -31,7 +32,7 @@ pub trait LanguageServer {
         Ok(zed::Command {
             command: binary.path,
             args: binary.args.unwrap_or(Self::get_executable_args()),
-            env: Default::default(),
+            env: binary.env.unwrap_or_default(),
         })
     }
 
@@ -40,19 +41,14 @@ pub trait LanguageServer {
         language_server_id: &LanguageServerId,
         worktree: &zed::Worktree,
     ) -> Result<LanguageServerBinary> {
-        let output = Command::new("ls").output()?;
-
-        dbg!(&output.status);
-        dbg!(String::from_utf8_lossy(&output.stdout).to_string());
-        dbg!(String::from_utf8_lossy(&output.stderr).to_string());
-
         let lsp_settings = LspSettings::for_worktree(language_server_id.as_ref(), worktree)?;
 
         if let Some(binary_settings) = lsp_settings.binary {
             if let Some(path) = binary_settings.path {
                 return Ok(LanguageServerBinary {
                     path,
                     args: binary_settings.arguments,
+                    env: Default::default(),
                 });
             }
         }
@@ -75,16 +71,58 @@ pub trait LanguageServer {
                         ]
                         .concat(),
                     ),
+                    env: Default::default(),
                 })
                 .ok_or_else(|| "Unable to find the 'bundle' command.".into())
         } else {
-            worktree
-                .which(Self::EXECUTABLE_NAME)
-                .map(|path| LanguageServerBinary {
-                    path,
+            let gem_home = std::env::current_dir()
+                .map_err(|e| format!("Failed to get current directory: {}", e))?
+                .to_string_lossy()
+                .to_string();
+
+            // Check if the gem is already installed
+            if let Some(existing_binary) = worktree.which(Self::EXECUTABLE_NAME) {
+                return Ok(LanguageServerBinary {
+                    path: existing_binary,
                     args: Some(Self::get_executable_args()),
-                })
-                .ok_or_else(|| format!("Unable to find the '{}' command.", Self::EXECUTABLE_NAME))
+                    env: Some(vec![(
+                        "GEM_PATH".to_string(),
+                        format!("{}:$GEM_PATH", gem_home),
+                    )]),
+                });
+            }
+
+            let output = Command::new("gem")
+                .env("GEM_HOME", gem_home.clone())
+                .arg("install")
+                .arg("--no-user-install")
+                .arg("--no-format-executable")
+                .arg("--no-document")
+                .arg(Self::GEM_NAME)
+                .output()?;
+
+            let stderr_output = String::from_utf8_lossy(&output.stderr).to_string();
+
+            match output.status {
+                Some(0) => Ok(LanguageServerBinary {
+                    path: format!("{}/bin/{}", gem_home, Self::EXECUTABLE_NAME),
+                    args: Some(Self::get_executable_args()),
+                    env: Some(vec![(
+                        "GEM_PATH".to_string(),
+                        format!("{}:$GEM_PATH", gem_home),
+                    )]),
+                }),
+                Some(status) => Err(format!(
+                    "Failed to install {} gem (status: {})\nError: {}",
+                    Self::GEM_NAME,
+                    status,
+                    stderr_output
+                )),
+                None => Err(format!(
+                    "Failed to start language server: {}",
+                    stderr_output
+                )),
+            }
         }
     }
 }

src/language_servers/language_server.rs

@@ -14,6 +14,10 @@ impl LanguageServer for Solargraph {
     fn get_executable_args() -> Vec<String> {
         vec!["stdio".to_string()]
     }
+
+    fn default_use_bundler() -> bool {
+        false
+    }
 }
 
 impl Solargraph {