From 840e07c7fc742415796027e32df19f315ddcf912 Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Tue, 20 Jul 2021 23:34:44 +0200
Subject: [Feature] Make common_on_attach configurable (#1024)

---
 lua/lsp/init.lua | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'lua/lsp')

diff --git a/lua/lsp/init.lua b/lua/lsp/init.lua
index 7e6982b5..7884f763 100644
--- a/lua/lsp/init.lua
+++ b/lua/lsp/init.lua
@@ -111,7 +111,10 @@ autocmd BufWritePre *.lua lua vim.lsp.buf.formatting_sync(nil, 100) ]]
 -- Java
 -- autocmd FileType java nnoremap ca <Cmd>lua require('jdtls').code_action()<CR>
 
-local function documentHighlight(client, _)
+local function lsp_highlight_document(client)
+  if O.lsp.document_highlight == false then
+    return -- we don't need further
+  end
   -- Set autocommands conditional on server_capabilities
   if client.resolved_capabilities.document_highlight then
     vim.api.nvim_exec(
@@ -197,9 +200,10 @@ function lsp_config.PeekImplementation()
 end
 
 function lsp_config.common_on_attach(client, bufnr)
-  if O.lsp.document_highlight then
-    documentHighlight(client, bufnr)
+  if O.lsp.on_attach_callback then
+    O.lsp.on_attach_callback(client, bufnr)
   end
+  lsp_highlight_document(client)
 end
 
 function lsp_config.tsserver_on_attach(client, _)
-- 
cgit v1.2.3