refactor lsp keybinds

3 files changed, 21 insertions, 31 deletions

diff --git a/init.lua b/init.lua
index f41f78c1..7f06285d 100644
--- a/init.lua
+++ b/init.lua
@@ -22,7 +22,7 @@ require("settings").load_commands()
 require("core.autocmds").define_augroups(lvim.autocommands)
 
 require "keymappings"
-require("lsp").setup_default_bindings()
+-- require("lsp").setup_default_bindings()
 
 local plugins = require "plugins"
 local plugin_loader = require("plugin-loader").init()
diff --git a/lua/lsp/init.lua b/lua/lsp/init.lua
index ddaa4740..f9e65c67 100644
--- a/lua/lsp/init.lua
+++ b/lua/lsp/init.lua
@@ -4,17 +4,9 @@ function lsp_config.config()
   require("lsp.kind").setup()
   require("lsp.handlers").setup()
   require("lsp.signs").setup()
-  require("ls.keybindings").setup()
+  require("lsp.keybinds").setup()
 end
 
--- My font didn't like this :/
--- vim.api.nvim_set_keymap(
---   "n",
---   "gl",
---   '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics({ show_header = false, border = { { "🭽", "FloatBorder" }, { "▔", "FloatBorder" }, { "🭾", "FloatBorder" }, { "▕", "FloatBorder" }, { "🭿", "FloatBorder" }, { "▁", "FloatBorder" }, { "🭼", "FloatBorder" }, { "▏", "FloatBorder" }, } })<CR>',
---   { noremap = true, silent = true }
--- )
-
 local function no_formatter_on_attach(client, bufnr)
   if lvim.lsp.on_attach_callback then
     lvim.lsp.on_attach_callback(client, bufnr)
diff --git a/lua/lsp/keybinds.lua b/lua/lsp/keybinds.lua
index 2ca930c7..5722dab7 100644
--- a/lua/lsp/keybinds.lua
+++ b/lua/lsp/keybinds.lua
@@ -1,28 +1,26 @@
 local M = {}
 
 function M.setup()
-  function M.setup_default_bindings()
-    if lvim.lsp.default_keybinds then
-      vim.cmd "nnoremap <silent> gd <cmd>lua vim.lsp.buf.definition()<CR>"
-      vim.cmd "nnoremap <silent> gD <cmd>lua vim.lsp.buf.declaration()<CR>"
-      vim.cmd "nnoremap <silent> gr <cmd>lua vim.lsp.buf.references()<CR>"
-      vim.cmd "nnoremap <silent> gi <cmd>lua vim.lsp.buf.implementation()<CR>"
-      vim.api.nvim_set_keymap(
-        "n",
-        "gl",
-        '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics({ show_header = false, border = "single" })<CR>',
-        { noremap = true, silent = true }
-      )
+  if lvim.lsp.default_keybinds then
+    vim.cmd "nnoremap <silent> gd <cmd>lua vim.lsp.buf.definition()<CR>"
+    vim.cmd "nnoremap <silent> gD <cmd>lua vim.lsp.buf.declaration()<CR>"
+    vim.cmd "nnoremap <silent> gr <cmd>lua vim.lsp.buf.references()<CR>"
+    vim.cmd "nnoremap <silent> gi <cmd>lua vim.lsp.buf.implementation()<CR>"
+    vim.api.nvim_set_keymap(
+      "n",
+      "gl",
+      '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics({ show_header = false, border = "single" })<CR>',
+      { noremap = true, silent = true }
+    )
 
-      vim.cmd "nnoremap <silent> gp <cmd>lua require'lsp.utils'.PeekDefinition()<CR>"
-      vim.cmd "nnoremap <silent> K :lua vim.lsp.buf.hover()<CR>"
-      vim.cmd "nnoremap <silent> <C-p> :lua vim.lsp.diagnostic.goto_prev({popup_opts = {border = lvim.lsp.popup_border}})<CR>"
-      vim.cmd "nnoremap <silent> <C-n> :lua vim.lsp.diagnostic.goto_next({popup_opts = {border = lvim.lsp.popup_border}})<CR>"
-      -- vim.cmd "nnoremap <silent> <tab> <cmd>lua vim.lsp.buf.signature_help()<CR>"
-      -- scroll down hover doc or scroll in definition preview
-      -- scroll up hover doc
-      -- vim.cmd 'command! -nargs=0 LspVirtualTextToggle lua require("lsp/virtual_text").toggle()'
-    end
+    vim.cmd "nnoremap <silent> gp <cmd>lua require'lsp.utils'.PeekDefinition()<CR>"
+    vim.cmd "nnoremap <silent> K :lua vim.lsp.buf.hover()<CR>"
+    vim.cmd "nnoremap <silent> <C-p> :lua vim.lsp.diagnostic.goto_prev({popup_opts = {border = lvim.lsp.popup_border}})<CR>"
+    vim.cmd "nnoremap <silent> <C-n> :lua vim.lsp.diagnostic.goto_next({popup_opts = {border = lvim.lsp.popup_border}})<CR>"
+    -- vim.cmd "nnoremap <silent> gs <cmd>lua vim.lsp.buf.signature_help()<CR>"
+    -- scroll down hover doc or scroll in definition preview
+    -- scroll up hover doc
+    -- vim.cmd 'command! -nargs=0 LspVirtualTextToggle lua require("lsp/virtual_text").toggle()'
   end
 end