summaryrefslogtreecommitdiff
path: root/lua
diff options
context:
space:
mode:
Diffstat (limited to 'lua')
-rw-r--r--lua/default-config.lua1
-rw-r--r--lua/lsp/init.lua10
2 files changed, 8 insertions, 3 deletions
diff --git a/lua/default-config.lua b/lua/default-config.lua
index a04db869..aaba1829 100644
--- a/lua/default-config.lua
+++ b/lua/default-config.lua
@@ -73,6 +73,7 @@ O = {
document_highlight = true,
popup_border = "single",
default_keybinds = true,
+ on_attach_callback = nil,
},
disabled_built_ins = {
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, _)