Do document highlighting only for file types which lsps support it

2 files changed, 15 insertions, 6 deletions

diff --git a/init.vim b/init.vim
index 8126339..65cafff 100644
--- a/init.vim
+++ b/init.vim
@@ -129,9 +129,9 @@ augroup InitVim
   autocmd TextYankPost *
         \ lua require'vim.highlight'.on_yank(
         \   { higroup = "IncSearch", timeout = 100 });
-  autocmd CursorHold * lua vim.lsp.buf.document_highlight()
-  autocmd CursorHoldI * lua vim.lsp.buf.document_highlight()
-  autocmd CursorMoved * lua vim.lsp.buf.clear_references()
+  " autocmd CursorHold * lua vim.lsp.buf.document_highlight()
+  " autocmd CursorHoldI * lua vim.lsp.buf.document_highlight()
+  " autocmd CursorMoved * lua vim.lsp.buf.clear_references()
 augroup END
 
 " Local configuration that can be set by hostname or just a local configuration.
diff --git a/lua/lsp.lua b/lua/lsp.lua
index 47eb97e..9a34981 100644
--- a/lua/lsp.lua
+++ b/lua/lsp.lua
@@ -219,9 +219,18 @@ M.on_attach = function(client, bufnr)
   vim.api.nvim_command("augroup LSP")
   vim.api.nvim_command("autocmd!")
   if client.server_capabilities.documentHighlightProvider then
-    vim.api.nvim_command("autocmd CursorHold  <buffer> lua vim.lsp.buf.document_highlight()")
-    vim.api.nvim_command("autocmd CursorHoldI <buffer> lua vim.lsp.buf.document_highlight()")
-    vim.api.nvim_command("autocmd CursorMoved <buffer> lua vim.lsp.util.buf_clear_references()")
+    vim.api.nvim_create_autocmd("CursorHold", {
+      buffer = bufnr,
+      callback = vim.lsp.buf.document_highlight
+    })
+    vim.api.nvim_create_autocmd("CursorHoldI", {
+      buffer = bufnr,
+      callback = vim.lsp.buf.document_highlight
+    })
+    vim.api.nvim_create_autocmd("CursorMoved", {
+      buffer = bufnr,
+      callback = vim.lsp.buf.buf_clear_references
+    })
   end
   vim.api.nvim_command("augroup END")