diff options
| -rw-r--r-- | lua/lsp/init.lua | 8 | ||||
| -rw-r--r-- | lua/lv-which-key/init.lua | 17 | ||||
| -rw-r--r-- | lua/plugins.lua | 1 |
3 files changed, 8 insertions, 18 deletions
diff --git a/lua/lsp/init.lua b/lua/lsp/init.lua index 7c78d054..ad8985d8 100644 --- a/lua/lsp/init.lua +++ b/lua/lsp/init.lua @@ -20,14 +20,12 @@ 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.cmd("nnoremap <silent> K :Lspsaga hover_doc<CR>") +vim.cmd("nnoremap <silent> K :lua vim.lsp.buf.hover()<CR>") -- vim.cmd('nnoremap <silent> <C-k> <cmd>lua vim.lsp.buf.signature_help()<CR>') -vim.cmd("nnoremap <silent> <C-p> :Lspsaga diagnostic_jump_prev<CR>") -vim.cmd("nnoremap <silent> <C-n> :Lspsaga diagnostic_jump_next<CR>") +vim.cmd("nnoremap <silent> <C-p> :lua vim.lsp.diagnostic.goto_prev()<CR>") +vim.cmd("nnoremap <silent> <C-n> :lua vim.lsp.diagnostic.goto_next()<CR>") -- scroll down hover doc or scroll in definition preview -vim.cmd("nnoremap <silent> <C-f> <cmd>lua require('lspsaga.action').smart_scroll_with_saga(1)<CR>") -- scroll up hover doc -vim.cmd("nnoremap <silent> <C-b> <cmd>lua require('lspsaga.action').smart_scroll_with_saga(-1)<CR>") vim.cmd('command! -nargs=0 LspVirtualTextToggle lua require("lsp/virtual_text").toggle()') -- Set Default Prefix. diff --git a/lua/lv-which-key/init.lua b/lua/lv-which-key/init.lua index f78c0a5e..31ecf94c 100644 --- a/lua/lv-which-key/init.lua +++ b/lua/lv-which-key/init.lua @@ -189,28 +189,21 @@ local mappings = { }, l = { name = "LSP", - a = { "<cmd>Lspsaga code_action<cr>", "Code Action" }, - A = { "<cmd>Lspsaga range_code_action<cr>", "Selected Action" }, + a = { "<cmd>lua vim.lsp.buf.code_action()<cr>", "Code Action" }, d = { "<cmd>Telescope lsp_document_diagnostics<cr>", "Document Diagnostics", }, - D = { + w = { "<cmd>Telescope lsp_workspace_diagnostics<cr>", "Workspace Diagnostics", }, f = { "<cmd>lua vim.lsp.buf.formatting()<cr>", "Format" }, - h = { "<cmd>Lspsaga hover_doc<cr>", "Hover Doc" }, i = { "<cmd>LspInfo<cr>", "Info" }, - j = { "<cmd>Lspsaga diagnostic_jump_prev<cr>", "Prev Diagnostic" }, - k = { "<cmd>Lspsaga diagnostic_jump_next<cr>", "Next Diagnostic" }, - l = { "<cmd>Lspsaga lsp_finder<cr>", "LSP Finder" }, - L = { "<cmd>Lspsaga show_line_diagnostics<cr>", "Line Diagnostics" }, - p = { "<cmd>Lspsaga preview_definition<cr>", "Preview Definition" }, + j = { "<cmd>lua vim.lsp.diagnostic.goto_next()<cr>", "Next Diagnostic" }, + k = { "<cmd>lua vim.lsp.diagnostic.goto_prev()<cr>", "Prev Diagnostic" }, q = { "<cmd>Telescope quickfix<cr>", "Quickfix" }, - r = { "<cmd>Lspsaga rename<cr>", "Rename" }, - t = { "<cmd>LspTypeDefinition<cr>", "Type Definition" }, - x = { "<cmd>cclose<cr>", "Close Quickfix" }, + r = { "<cmd>lua vim.lsp.buf.rename()<cr>", "Rename" }, s = { O.plugin.symbol_outline.active and "<cmd>SymbolsOutline<cr>" or "<cmd> Telescope lsp_document_symbols<cr>", "Document Symbols", diff --git a/lua/plugins.lua b/lua/plugins.lua index e03f5037..a6f0d646 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -32,7 +32,6 @@ return require("packer").startup(function(use) -- TODO refactor all of this (for now it works, but yes I know it could be wrapped in a simpler function) use { "neovim/nvim-lspconfig" } - use { "glepnir/lspsaga.nvim", cmd = "Lspsaga" } use { "kabouzeid/nvim-lspinstall", cmd = "LspInstall" } -- Telescope use { "nvim-lua/popup.nvim" } |