From 5083b0797287ffa6db7fc371798695b3a50a4040 Mon Sep 17 00:00:00 2001
From: ray-x <rayx.cn@gmail.com>
Date: Mon, 18 Oct 2021 13:15:17 +1100
Subject: [PATCH] setup with lsp installer

---
 README.md                           | 17 ++++++++++++++---
 lua/navigator/lspclient/clients.lua | 22 +++++++++++++++++++---
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index aa65674..6090ad3 100644
--- a/README.md
+++ b/README.md
@@ -405,17 +405,21 @@ The terminal will need to be able to output nerdfont and emoji correctly. I am u
 If you'd like to only use the lsp servers installed by lsp_installer. Please set
 
 ```lua
-lsp_installer = false
+lsp_installer = true
+
 ```
 
 In the config.
 
-If you need to use the setup from navigator instead of default setup in lsp_installer. Please setup
+Navigator will startup the server installed by lsp-installer. Please do not call `server:setup{opts}` from lsp installer
+as it will override the navigator setup
+
+Also, could use following setups
 
 ```lua
--- lsp_installer = false -- default value is false
 
 require'navigator'.setup({
+  -- lsp_installer = false -- default value is false
   lsp = {
     tsserver = { cmd = {'your tsserver installed by lsp_installer'} }
   }
@@ -423,6 +427,13 @@ require'navigator'.setup({
 
 ```
 
+example cmd setup (mac) for pyright :
+
+```
+cmd = { "/Users/username/.local/share/nvim/lsp_servers/python/node_modules/.bin/pyright-langserver", "--stdio" }
+
+```
+
 ## Usage
 
 Please refer to lua/navigator/lspclient/mapping.lua on key mappings. Should be able to work out-of-box.
diff --git a/lua/navigator/lspclient/clients.lua b/lua/navigator/lspclient/clients.lua
index ffb7910..e9e087b 100644
--- a/lua/navigator/lspclient/clients.lua
+++ b/lua/navigator/lspclient/clients.lua
@@ -269,8 +269,10 @@ local servers = {
   "r_language_server", "rust_analyzer", "terraformls", "svelte"
 }
 
+local has_lspinst = false
+
 if config.lsp_installer == true then
-  local has_lspinst, lspinst = pcall(require, "nvim-lsp-installer")
+  has_lspinst, _ = pcall(require, "nvim-lsp-installer")
   if has_lspinst then
     local srvs = require'nvim-lsp-installer.servers'.get_installed_servers()
     log('lsp_installered servers', srvs)
@@ -280,7 +282,6 @@ if config.lsp_installer == true then
   end
   log(servers)
 end
-
 if config.lsp.disable_lsp == 'all' then
   config.lsp.disable_lsp = servers
 end
@@ -290,6 +291,8 @@ local ng_default_cfg = {
   flags = {allow_incremental_sync = true, debounce_text_changes = 1000}
 }
 
+local configs = {}
+
 -- check and load based on file type
 local function load_cfg(ft, client, cfg, loaded)
   -- if _NG_LSPCfgSetup ~= true then
@@ -297,6 +300,7 @@ local function load_cfg(ft, client, cfg, loaded)
   -- lspconfig_setup(cfg)
   -- _NG_LSPCfgSetup = true
   -- end
+
   log(ft, client, loaded)
   if lspconfig[client] == nil then
     log("not supported by nvim", client)
@@ -476,8 +480,18 @@ local function lsp_startup(ft, retry, user_lsp_opts)
       end
     end
 
-    log('loading', lspclient, 'name', lspconfig[lspclient].name)
+    log('loading', lspclient, 'name', lspconfig[lspclient].name, 'has lspinst', has_lspinst)
     -- start up lsp
+    if has_lspinst and _NgConfigValues.lsp_installer then
+      local installed, installer_cfg = require("nvim-lsp-installer.servers").get_server(lspconfig[lspclient].name)
+
+      log('lsp server', installer_cfg, lspconfig[lspclient].name)
+      if installed and installer_cfg then
+        cfg.cmd = installer_cfg:get_default_options().cmd
+        log(cfg)
+      end
+    end
+
     load_cfg(ft, lspclient, cfg, loaded)
 
     _NG_Loaded[lspclient] = true
@@ -501,8 +515,10 @@ local function lsp_startup(ft, retry, user_lsp_opts)
       lspconfig.efm.setup(cfg)
       log('efm loading')
       _NG_Loaded['efm'] = true
+      configs['efm'] = cfg
     end
   end
+
   if not retry or ft == nil then
     return
   end