From aee9d91355262d40e88542474693c5bc3e42ebb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Sat, 30 Jul 2022 08:42:20 +0200
Subject: [PATCH] fix(neovim): fix lsp capabilities & attach handling

---
 home/editors/neovim/lsp/lsp.lua | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/home/editors/neovim/lsp/lsp.lua b/home/editors/neovim/lsp/lsp.lua
index 9652440..9d9bb7c 100644
--- a/home/editors/neovim/lsp/lsp.lua
+++ b/home/editors/neovim/lsp/lsp.lua
@@ -17,8 +17,8 @@ local on_attach = function(client, bufnr)
 end
 
 -- format on save
-local diagnosticls_on_attach = function(_, bufnr)
-  on_attach(_, bufnr)
+local diagnosticls_on_attach = function(client, bufnr)
+  on_attach(client, bufnr)
   vim.api.nvim_create_autocmd("BufWritePre", {
     callback = function()
       vim.lsp.buf.formatting_seq_sync(nil, nil, { "tsserver", "diagnosticls" })
@@ -68,6 +68,7 @@ for _, lsp in ipairs(servers) do
 end
 
 config.rust_analyzer.setup{
+  on_attach = on_attach,
   capabilities = capabilities,
   root_dir = config.util.root_pattern("Cargo.toml", "rust-project.json", ".git"),
   settings = {
@@ -78,6 +79,7 @@ config.rust_analyzer.setup{
 }
 
 config.omnisharp.setup{
+  on_attach = on_attach,
   capabilities = capabilities,
   cmd = {"OmniSharp", "--languageserver", "--hostPID", tostring(pid)},
 }
@@ -87,6 +89,7 @@ table.insert(runtime_path, "lua/?.lua")
 table.insert(runtime_path, "lua/?/init.lua")
 
 config.sumneko_lua.setup {
+  on_attach = on_attach,
   capabilities = capabilities,
   settings = {
     Lua = {
@@ -109,6 +112,7 @@ config.sumneko_lua.setup {
 
 config.diagnosticls.setup {
   on_attach = diagnosticls_on_attach,
+  capabilities = capabilities,
   filetypes = {
     "javascript",
     "javascript.jsx",