From e4b2fc0afe7887d7b8f9e4790755890954eb9c1e Mon Sep 17 00:00:00 2001
From: ray-x <rayx.cn@gmail.com>
Date: Tue, 22 Feb 2022 19:41:21 +1100
Subject: [PATCH] merge master

---
 lua/navigator/lspclient/clients.lua | 34 +++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/lua/navigator/lspclient/clients.lua b/lua/navigator/lspclient/clients.lua
index d05d67e..24b434e 100644
--- a/lua/navigator/lspclient/clients.lua
+++ b/lua/navigator/lspclient/clients.lua
@@ -527,11 +527,29 @@ local function lsp_startup(ft, retry, user_lsp_opts)
         cfg.on_attach = function(client, bufnr)
           config.on_attach(client, bufnr)
           client.resolved_capabilities.document_formatting = enable_fmt
+          require('navigator.lspclient.mapping').setup({
+            client = client,
+            bufnr = bufnr,
+            cap = capabilities,
+          })
+        end
+      end
+      if config.combined_attach == 'their' then
+        cfg.on_attach = function(client, bufnr)
+          on_attach(client, bufnr)
+          config.on_attach(client, bufnr)
+          client.resolved_capabilities.document_formatting = enable_fmt
+          require('navigator.lspclient.mapping').setup({
+            client = client,
+            bufnr = bufnr,
+            cap = capabilities,
+          })
         end
       end
       if config.combined_attach == 'both' then
         cfg.on_attach = function(client, bufnr)
-          if config.on_attach then
+          client.resolved_capabilities.document_formatting = enable_fmt
+          if config.on_attach and type(config.on_attach) == 'function' then
             config.on_attach(client, bufnr)
           end
           if setups[lspclient] and setups[lspclient].on_attach then
@@ -539,7 +557,11 @@ local function lsp_startup(ft, retry, user_lsp_opts)
           else
             on_attach(client, bufnr)
           end
-          client.resolved_capabilities.document_formatting = enable_fmt
+          require('navigator.lspclient.mapping').setup({
+            client = client,
+            bufnr = bufnr,
+            cap = capabilities,
+          })
         end
       end
       cfg.on_init = function(client)
@@ -552,11 +574,9 @@ local function lsp_startup(ft, retry, user_lsp_opts)
         end
       end
     else
-      if disable_fmt then
-        cfg.on_attach = function(client, bufnr)
-          on_attach(client, bufnr)
-          client.resolved_capabilities.document_formatting = enable_fmt
-        end
+      cfg.on_attach = function(client, bufnr)
+        on_attach(client, bufnr)
+        client.resolved_capabilities.document_formatting = enable_fmt
       end
     end