Allow ruby based configs and custom syntax parsers

src/lsp/handlers.cc

@@ -7,7 +7,7 @@ void request_add_to_lsp(Language language, Editor *editor) {
 }
 
 void add_to_lsp(Language language, Editor *editor) {
-  std::shared_ptr<LSPInstance> lsp = get_or_init_lsp(language.lsp_id);
+  std::shared_ptr<LSPInstance> lsp = get_or_init_lsp(language.lsp_name);
   if (!lsp)
     return;
   std::unique_lock lock(lsp->mtx);
@@ -41,11 +41,11 @@ void open_editor(std::shared_ptr<LSPInstance> lsp,
   lsp_send(lsp, message, nullptr);
 }
 
-static uint8_t find_lsp_id(std::shared_ptr<LSPInstance> needle) {
+static std::string find_lsp_id(std::shared_ptr<LSPInstance> needle) {
   for (const auto &[id, lsp] : active_lsps)
     if (lsp == needle)
       return id;
-  return 0;
+  return "";
 }
 
 void remove_from_lsp(Editor *editor) {
@@ -64,8 +64,8 @@ void remove_from_lsp(Editor *editor) {
                   {"method", "textDocument/didClose"},
                   {"params", {{"textDocument", {{"uri", editor->uri}}}}}};
   lsp_send(lsp, message, nullptr);
-  uint8_t lsp_id = find_lsp_id(lsp);
-  if (lsp_id && lsp->editors.empty())
+  std::string lsp_id = find_lsp_id(lsp);
+  if (!lsp_id.empty() && lsp->editors.empty())
     close_lsp(lsp_id);
 }
 

src/lsp/process.cc

@@ -1,4 +1,3 @@
-#include "config.h"
 #include "lsp/lsp.h"
 
 static bool init_lsp(std::shared_ptr<LSPInstance> lsp) {
@@ -25,7 +24,12 @@ static bool init_lsp(std::shared_ptr<LSPInstance> lsp) {
     close(in_pipe[1]);
     close(out_pipe[0]);
     close(out_pipe[1]);
-    execvp(lsp->lsp->command, (char *const *)(lsp->lsp->args.data()));
+    std::vector<char *> argv;
+    argv.push_back(const_cast<char *>(lsp->lsp->command.c_str()));
+    for (auto &arg : lsp->lsp->args)
+      argv.push_back(const_cast<char *>(arg.c_str()));
+    argv.push_back(nullptr);
+    execvp(lsp->lsp->command.c_str(), argv.data());
     perror("execvp");
     _exit(127);
   }
@@ -37,12 +41,12 @@ static bool init_lsp(std::shared_ptr<LSPInstance> lsp) {
   return true;
 }
 
-std::shared_ptr<LSPInstance> get_or_init_lsp(uint8_t lsp_id) {
+std::shared_ptr<LSPInstance> get_or_init_lsp(std::string lsp_id) {
   std::unique_lock lock(active_lsps_mtx);
   auto it = active_lsps.find(lsp_id);
   if (it == active_lsps.end()) {
-    auto map_it = kLsps.find(lsp_id);
-    if (map_it == kLsps.end())
+    auto map_it = lsps.find(lsp_id);
+    if (map_it == lsps.end())
       return nullptr;
     std::shared_ptr<LSPInstance> lsp = std::make_shared<LSPInstance>();
     lsp->lsp = &map_it->second;
@@ -54,12 +58,13 @@ std::shared_ptr<LSPInstance> get_or_init_lsp(uint8_t lsp_id) {
     pending->callback = [lsp, lsp_id](Editor *, std::string, json msg) {
       if (msg.contains("result") && msg["result"].contains("capabilities")) {
         auto &caps = msg["result"]["capabilities"];
-        if (caps.contains("positionEncoding")) {
-          std::string s = caps["positionEncoding"].get<std::string>();
-          if (s == "utf-8")
-            lsp->is_utf8 = true;
-          log("Lsp name: %s, supports: %s", lsp->lsp->command, s.c_str());
-        }
+        // if (caps.contains("positionEncoding")) {
+        //   std::string s = caps["positionEncoding"].get<std::string>();
+        //   if (s == "utf-8")
+        //     lsp->is_utf8 = true;
+        //   log("Lsp name: %s, supports: %s", lsp->lsp->command.c_str(),
+        //       s.c_str());
+        // }
         if (caps.contains("textDocumentSync")) {
           auto &sync = caps["textDocumentSync"];
           if (sync.is_number()) {
@@ -71,8 +76,8 @@ std::shared_ptr<LSPInstance> get_or_init_lsp(uint8_t lsp_id) {
           }
         }
         lsp->allow_formatting = caps.value("documentFormattingProvider", false);
-        if (lsp_id !=
-                LUA_LS /* Lua ls gives terrible ontype formatting so disable */
+        if (lsp_id != "lua-language-server" /* Lua ls gives terrible ontype
+                                               formatting so disable */
             && caps.contains("documentOnTypeFormattingProvider")) {
           auto &fmt = caps["documentOnTypeFormattingProvider"];
           if (fmt.is_object()) {
@@ -149,7 +154,7 @@ std::shared_ptr<LSPInstance> get_or_init_lsp(uint8_t lsp_id) {
   return it->second;
 }
 
-void close_lsp(uint8_t lsp_id) {
+void close_lsp(std::string lsp_id) {
   std::shared_lock active_lsps_lock(active_lsps_mtx);
   auto it = active_lsps.find(lsp_id);
   if (it == active_lsps.end())
@@ -186,7 +191,7 @@ void close_lsp(uint8_t lsp_id) {
   t.detach();
 }
 
-void clean_lsp(std::shared_ptr<LSPInstance> lsp, uint8_t lsp_id) {
+void clean_lsp(std::shared_ptr<LSPInstance> lsp, std::string lsp_id) {
   for (auto &kv : lsp->pending)
     delete kv.second;
   lsp->pid = -1;

src/lsp/workers.cc

@@ -1,7 +1,7 @@
 #include "lsp/lsp.h"
 
 std::shared_mutex active_lsps_mtx;
-std::unordered_map<uint8_t, std::shared_ptr<LSPInstance>> active_lsps;
+std::unordered_map<std::string, std::shared_ptr<LSPInstance>> active_lsps;
 
 void lsp_send(std::shared_ptr<LSPInstance> lsp, json message,
               LSPPending *pending) {