From 7aad7782e2e5c9fbf1014cd223987d36306afec3 Mon Sep 17 00:00:00 2001
From: Andrew Lee <candrewlee14@gmail.com>
Date: Thu, 3 Feb 2022 00:29:57 -0700
Subject: [PATCH] fix nvim lsp_keymap function call

---
 dot_config/nvim/cmp_init.vim       | 4 +---
 dot_config/nvim/coq_init.vim       | 5 ++---
 dot_config/nvim/lua/lsp_keymap.lua | 4 +++-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dot_config/nvim/cmp_init.vim b/dot_config/nvim/cmp_init.vim
index 43630db..f61935a 100644
--- a/dot_config/nvim/cmp_init.vim
+++ b/dot_config/nvim/cmp_init.vim
@@ -88,8 +88,6 @@ lua <<EOF
     -- Use an on_attach function to only map the following keys
     -- after the language server attaches to the current buffer
   local lsp_keymap = require('lsp_keymap')
-  local on_attach = lsp_keymap.attach(client, bufnr)
-
 
   local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
     lsp_installer.on_server_ready(function(server)
@@ -101,7 +99,7 @@ lua <<EOF
 
         -- This setup() function is exactly the same as lspconfig's setup function.
         -- Refer to https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md
-        server:setup {capabilities = capabilities, on_attach = on_attach}
+        server:setup {capabilities = capabilities, on_attach = lsp_keymap.custom_attach}
     end)
 EOF
 
diff --git a/dot_config/nvim/coq_init.vim b/dot_config/nvim/coq_init.vim
index 2d81c82..2fc0a04 100644
--- a/dot_config/nvim/coq_init.vim
+++ b/dot_config/nvim/coq_init.vim
@@ -30,8 +30,7 @@ local lsp_installer = require("nvim-lsp-installer")
 
 -- Use an on_attach function to only map the following keys
 -- after the language server attaches to the current buffer
-  local lsp_keymap = require('lsp_keymap')
-  local on_attach = lsp_keymap.attach(client, bufnr)
+local lsp_keymap = require('lsp_keymap')
 
 -- Register a handler that will be called for all installed servers.
 -- Alternatively, you may also register handlers on specific server instances instead (see example below).
@@ -50,7 +49,7 @@ lsp_installer.on_server_ready(function(server)
     -- server:setup(opts)
 
     -- With coq.nvim:
-    server:setup(coq.lsp_ensure_capabilities{on_attach = on_attach})
+    server:setup(coq.lsp_ensure_capabilities{on_attach = lsp_keymap.custom_attach})
 end)
 EOF
 
diff --git a/dot_config/nvim/lua/lsp_keymap.lua b/dot_config/nvim/lua/lsp_keymap.lua
index 4eb32cc..6dd0083 100644
--- a/dot_config/nvim/lua/lsp_keymap.lua
+++ b/dot_config/nvim/lua/lsp_keymap.lua
@@ -1,5 +1,5 @@
 local M = {}
-function M.attach(client, bufnr)
+function M.custom_attach(client, bufnr)
   local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
   local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
 
@@ -28,6 +28,8 @@ function M.attach(client, bufnr)
   buf_set_keymap('n', '<leader>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
   buf_set_keymap('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
 
+  print("Language Server attached!")
+
 end
 
 return M