refact lspclient

lua/navigator/lspclient/clients.lua

@@ -23,29 +23,27 @@ local config = require "navigator".config_values()
 
 local cap = vim.lsp.protocol.make_client_capabilities()
 local on_attach = require("navigator.lspclient.attach").on_attach
--- local gopls = {}
 -- gopls["ui.completion.usePlaceholders"] = true
 
-local golang_setup = {
+-- lua setup
+local sumneko_root_path = config.sumneko_root_path
+local sumneko_binary = config.sumneko_binary
+
+local setups = {
+  gopls = {
     on_attach = on_attach,
     capabilities = cap,
     filetypes = {"go", "gomod"},
-  -- init_options = {
-  --   useplaceholders = true,
-  --   completeunimported = true
-  -- },
     message_level = vim.lsp.protocol.MessageType.Error,
     cmd = {
-    "gopls"
-
+      "gopls",
       -- share the gopls instance if there is one already
-    -- "-remote=auto",
-
+      "-remote=auto",
       --[[ debug options ]]
       --
       -- "-logfile=auto",
       -- "-debug=:0",
-    -- "-remote.debug=:0",
+      "-remote.debug=:0"
       -- "-rpc.trace",
     },
     settings = {
@@ -68,8 +66,8 @@ local golang_setup = {
     root_dir = function(fname)
       return util.root_pattern("go.mod", ".git")(fname) or util.path.dirname(fname)
     end
-}
-local clang_cfg = {
+  },
+  clangd = {
     cmd = {
       "clangd",
       "--background-index",
@@ -82,8 +80,8 @@ local clang_cfg = {
       client.resolved_capabilities.document_formatting = true
       on_attach(client)
     end
-}
-local rust_cfg = {
+  },
+  rust_analyzer = {
     root_dir = util.root_pattern("Cargo.toml", "rust-project.json", ".git"),
     filetypes = {"rust"},
     message_level = vim.lsp.protocol.MessageType.error,
@@ -95,9 +93,8 @@ local rust_cfg = {
         procMacro = {enable = true}
       }
     }
-}
-
-local sqls_cfg = {
+  },
+  sqls = {
     filetypes = {"sql"},
     on_attach = function(client, bufnr)
       client.resolved_capabilities.execute_command = true
@@ -114,12 +111,8 @@ local sqls_cfg = {
       --   },
       -- },
     }
-}
--- lua setup
-local sumneko_root_path = config.sumneko_root_path
-local sumneko_binary = config.sumneko_binary
-
-local lua_cfg = {
+  },
+  sumneko_lua = {
     cmd = {sumneko_binary, "-E", sumneko_root_path .. "/main.lua"},
     filetypes = {"lua"},
     on_attach = on_attach,
@@ -155,9 +148,8 @@ local lua_cfg = {
         }
       }
     }
-}
-
-local pyright_cfg = {
+  },
+  pyright = {
     cmd = {"pyright-langserver", "--stdio"},
     filetypes = {"python"},
     settings = {
@@ -168,9 +160,8 @@ local pyright_cfg = {
         }
       }
     }
-}
-
-local ccls_cfg = {
+  },
+  ccls = {
     init_options = {
       compilationDatabaseDirectory = "build",
       root_dir = [[ util.root_pattern("compile_commands.json", "compile_flags.txt", "CMakeLists.txt", "Makefile", ".git") or util.path.dirname ]],
@@ -181,6 +172,7 @@ local ccls_cfg = {
         excludeArgs = {"-frounding-math"}
       }
     }
+  }
 }
 
 local servers = {
@@ -218,12 +210,12 @@ local servers = {
   "rust_analyzer",
   "terraformls"
 }
+
 local default_cfg = {on_attach = on_attach}
 
 -- check and load based on file type
 local function load_cfg(ft, client, cfg, loaded)
   -- log("trying", client)
-  -- log(client, "loaded for", ft)
 
   if lspconfig[client] == nil then
     log("not supported", client)
@@ -233,7 +225,6 @@ local function load_cfg(ft, client, cfg, loaded)
 
   local should_load = false
   if lspft ~= nil and #lspft > 0 then
-    -- log(client, "loaded for", ft, lspft)
     for _, value in ipairs(lspft) do
       if ft == value then
         should_load = true
@@ -247,11 +238,11 @@ local function load_cfg(ft, client, cfg, loaded)
           return
         end
       end
-
       lspconfig[client].setup(cfg)
-      log(client, "loaded for", ft)
+      log(client, "loading for", ft)
     end
   end
+  -- need to verify the lsp server is up
 end
 
 vim.cmd([[autocmd filetype * lua require'navigator.lspclient.clients'.setup()]]) -- BufWinEnter BufNewFile,BufRead ?
@@ -274,6 +265,8 @@ local function setup(user_opts)
     log("nil filetype")
     return
   end
+
+  for i = 1, 2 do
     local clients = vim.lsp.get_active_clients() or {}
     local loaded = {}
     for _, client in ipairs(clients) do
@@ -282,14 +275,26 @@ local function setup(user_opts)
       end
     end
     for _, lspclient in ipairs(servers) do
-    load_cfg(ft, lspclient, default_cfg, loaded)
+      local cfg = setups[lspclient] or default_cfg
+      load_cfg(ft, lspclient, cfg, loaded)
+    end
+
+    local timer = vim.loop.new_timer()
+    local i = 0
+    -- Waits 20ms, then repeats every 20ms until lsp is loaded.
+    timer:start(
+      20,
+      20,
+      function()
+        local clients = vim.lsp.get_active_clients() or {}
+        if i > 20 or #clients > 0 then
+          timer:close() -- Always close handles to avoid leaks.
+          log("active", #clients)
+          return true
+        end
+        i = i + 1
+      end
+    )
   end
-  load_cfg(ft, "gopls", golang_setup, loaded)
-  load_cfg(ft, "sqls", sqls_cfg, loaded)
-  load_cfg(ft, "sumneko_lua", lua_cfg, loaded)
-  load_cfg(ft, "clangd", clang_cfg, loaded)
-  load_cfg(ft, "rust_analyzer", rust_cfg, loaded)
-  load_cfg(ft, "pyright", pyright_cfg, loaded)
-  load_cfg(ft, "ccls", ccls_cfg, loaded)
 end
 return {setup = setup, cap = cap}

lua/navigator/util.lua

@@ -95,7 +95,7 @@ local default_config = {
   plugin = "navigator",
   use_console = false,
   use_file = true,
-  level = "error"
+  level = "info"
 }
 
 M._log = require("guihua.log").new({level = default_config.level}, true)