feat: add Solargraph as the built-in Ruby LSP preset

src/lsp_config.rs

@@ -10,9 +10,10 @@ pub fn resolve(value: Value) -> Result<Vec<ServerConfig>, String> {
         if language_id.is_empty() || language_id.chars().any(char::is_control) {
             return Err("LSP language keys must not be empty or contain control characters".into());
         }
-        let preset = match language_id.as_str() {
-            "rust" => Some(("rust-analyzer", "rs")),
-            "python" => Some(("pylsp", "py")),
+        let preset: Option<(&[&str], &str)> = match language_id.as_str() {
+            "rust" => Some((&["rust-analyzer"], "rs")),
+            "python" => Some((&["pylsp"], "py")),
+            "ruby" => Some((&["solargraph", "stdio"], "rb")),
             _ => None,
         };
         let mut options = match value {
@@ -45,7 +46,7 @@ pub fn resolve(value: Value) -> Result<Vec<ServerConfig>, String> {
         let command = match options.remove("command") {
             Some(value) => command(value, &language_id)?,
             None => match preset {
-                Some((command, _)) => vec![command.into()],
+                Some((command, _)) => command.iter().map(|argument| (*argument).into()).collect(),
                 None => {
                     return Err(format!(
                         "LSP language {language_id:?} requires command argv"

src/main.rs

@@ -37,6 +37,7 @@ Ruby config: $XDG_CONFIG_HOME/vamp/config.rb or ~/.config/vamp/config.rb
 Set VAMP_RUBY to choose the Ruby executable.
 
 Native LSP is disabled by default: config.lsp[\"rust\"] = true enables a preset
+Presets: rust -> rust-analyzer, python -> pylsp, ruby -> solargraph stdio
 Custom languages: config.lsp[\"my-language\"] = { command: [...], extensions: [...] }
 LSP commands: :lsp.definition, :lsp.diagnostics, :lsp.hover
 Hover binding: config.bind \"K\", config.core.lsp.hover (no default key)";

src/ruby.rs

@@ -969,19 +969,21 @@ end"#,
             r#"Vamp.configure do |config|
   config.lsp["rust"] = true
   config.lsp["python"] = true
+  config.lsp["ruby"] = true
 end"#,
         );
         let config = load_config(&path).unwrap();
-        assert_eq!(config.lsp.len(), 2);
-        for (language, command, extension) in
-            [("rust", "rust-analyzer", "rs"), ("python", "pylsp", "py")]
-        {
+        for (language, command, extension) in [
+            ("rust", &["rust-analyzer"][..], "rs"),
+            ("python", &["pylsp"][..], "py"),
+            ("ruby", &["solargraph", "stdio"][..], "rb"),
+        ] {
             let server = config
                 .lsp
                 .iter()
                 .find(|server| server.language_id == language)
                 .unwrap();
-            assert_eq!(server.command, [command]);
+            assert_eq!(server.command, command);
             assert_eq!(server.extensions, [extension]);
             assert_eq!(server.initialization_options, serde_json::json!({}));
             assert_eq!(server.settings, serde_json::json!({}));
@@ -996,6 +998,7 @@ end"#,
     settings: {"rust-analyzer" => {check: {command: "clippy"}}}
   }
   config.lsp["python"] = {command: ["custom pylsp", "--stdio"]}
+  config.lsp["ruby"] = {command: ["bundle", "exec", "solargraph", "stdio"]}
   config.lsp["my-language.c++"] = {
     command: ["custom server", "--flag", ""],
     extensions: ["custom", "لغة"],
@@ -1004,7 +1007,6 @@ end"#,
 end"#,
         );
         let config = load_config(&path).unwrap();
-        assert_eq!(config.lsp.len(), 3);
         let rust = config
             .lsp
             .iter()
@@ -1029,6 +1031,13 @@ end"#,
         assert_eq!(python.extensions, ["py"]);
         assert_eq!(python.initialization_options, serde_json::json!({}));
         assert_eq!(python.settings, serde_json::json!({}));
+        let ruby = config
+            .lsp
+            .iter()
+            .find(|server| server.language_id == "ruby")
+            .unwrap();
+        assert_eq!(ruby.command, ["bundle", "exec", "solargraph", "stdio"]);
+        assert_eq!(ruby.extensions, ["rb"]);
         let custom = config
             .lsp
             .iter()
@@ -1087,12 +1096,14 @@ end"#,
         }
         let path = fixture.file(
             "invalid.rb",
-            r#"Vamp.configure { |config| config.lsp["ruby"] = true }"#,
+            r#"Vamp.configure { |config| config.lsp["unsupported-language"] = true }"#,
         );
         let error = load_config(&path).unwrap_err();
         assert!(!error.contains("Malformed Ruby protocol frame"), "{error}");
         assert!(
-            error.contains("\"ruby\"") && error.contains("command") && error.contains("extensions"),
+            error.contains("\"unsupported-language\"")
+                && error.contains("command")
+                && error.contains("extensions"),
             "{error}"
         );
     }

src/session.rs

@@ -2355,8 +2355,8 @@ end
         for (config, reason, dismiss) in [
             ("raise 'broken config'", "broken config", Input::Enter),
             (
-                "Vamp.configure { |config| config.lsp['ruby'] = true }",
-                "ruby",
+                "Vamp.configure { |config| config.lsp['unsupported-language'] = true }",
+                "unsupported-language",
                 Input::Escape,
             ),
         ] {