From c15458eb7d8152c05e557a17b8859a5d2cd77ad5 Mon Sep 17 00:00:00 2001
From: Michael Lingelbach <m.j.lbach@gmail.com>
Date: Tue, 12 Jan 2021 12:21:21 -0800
Subject: LspInfo: fix display when client cmd contains newlines

---
 lua/lspconfig.lua | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

(limited to 'lua/lspconfig.lua')

diff --git a/lua/lspconfig.lua b/lua/lspconfig.lua
index d84b8a01..78916010 100644
--- a/lua/lspconfig.lua
+++ b/lua/lspconfig.lua
@@ -40,15 +40,36 @@ function M._root._setup()
         }
         vim.list_extend(buf_lines, header)
 
-        for _, client in ipairs(buf_clients) do
-          local client_info = {
+        local function trim_whitespace(cmd)
+          local trimmed_cmd = {}
+          for _, str in ipairs(cmd) do
+            table.insert(trimmed_cmd, str:match'^%s*(.*)')
+          end
+          return trimmed_cmd
+        end
+
+        local function remove_newlines(cmd)
+          cmd = trim_whitespace(cmd)
+          cmd = table.concat(cmd, ' ')
+          cmd = vim.split(cmd, '\n')
+          cmd = trim_whitespace(cmd)
+          cmd = table.concat(cmd, ' ')
+          return cmd
+        end
+
+        local function make_client_info(client)
+          return {
             "",
             "Client: "..tostring(client.id),
             "\tname: "..client.name,
             "\troot: "..client.workspaceFolders[1].name,
             "\tfiletypes: "..table.concat(client.config.filetypes, ', '),
-            "\tcmd: "..table.concat(client.config.cmd, ', '),
+            "\tcmd: "..remove_newlines(client.config.cmd),
           }
+        end
+
+        for _, client in ipairs(buf_clients) do
+           local client_info = make_client_info(client)
            vim.list_extend(buf_lines, client_info)
         end
 
@@ -58,14 +79,7 @@ function M._root._setup()
         }
         vim.list_extend(buf_lines, active_section_header)
         for _, client in ipairs(clients) do
-          local client_info = {
-            "",
-            "Client: "..tostring(client.id),
-            "\tname: "..client.name,
-            "\troot: "..client.workspaceFolders[1].name,
-            "\tfiletypes: "..table.concat(client.config.filetypes, ', '),
-            "\tcmd: "..table.concat(client.config.cmd, ', '),
-          }
+           local client_info = make_client_info(client)
            vim.list_extend(buf_lines, client_info)
         end
         local matching_config_header = {
@@ -77,7 +91,7 @@ function M._root._setup()
         for _, config in pairs(configs) do
           local cmd_is_executable, cmd
           if config.cmd then
-            cmd = table.concat(config.cmd, " ")
+            cmd = remove_newlines(config.cmd)
             if vim.fn.executable(config.cmd[1]) == 1 then
               cmd_is_executable = "True"
             else
-- 
cgit v1.2.3-70-g09d2