From 673c758ecbb09085f387cd0464b825496546a26d Mon Sep 17 00:00:00 2001 From: Solomon Laing Date: Mon, 28 Nov 2022 08:48:12 +1030 Subject: [PATCH] Updated code action menu provider for nvim and some keybinds --- .config/nvim/lua/user/plugins.lua | 12 ++++++++---- .config/nvim/lua/user/whichkey.lua | 13 +++++++------ 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.config/nvim/lua/user/plugins.lua b/.config/nvim/lua/user/plugins.lua index b0219a4..522f6bf 100644 --- a/.config/nvim/lua/user/plugins.lua +++ b/.config/nvim/lua/user/plugins.lua @@ -63,10 +63,14 @@ return packer.startup(function(use) use("folke/trouble.nvim") -- view lsp diagnostics -- use "OmniSharp/omnisharp-vim" use("https://git.sr.ht/~whynothugo/lsp_lines.nvim") - use({ - "weilbith/nvim-code-action-menu", - cmd = "CodeActionMenu", - }) + use({ -- I'm currently just using this for a functional code action menu for omnisharp, I want to look further into its functions though. + "glepnir/lspsaga.nvim", + branch = "main", + config = function () + local saga = require"lspsaga" + saga.init_lsp_saga({}) + end, + }) use("jose-elias-alvarez/null-ls.nvim") -- Completion diff --git a/.config/nvim/lua/user/whichkey.lua b/.config/nvim/lua/user/whichkey.lua index 3f64044..7eca21b 100644 --- a/.config/nvim/lua/user/whichkey.lua +++ b/.config/nvim/lua/user/whichkey.lua @@ -88,15 +88,16 @@ local m_mappings = { } local mappings = { - a = { "CodeActionMenu", "Action" }, + a = { "Lspsaga code_action", "Action" }, c = { "Bdelete", "Close Buffer" }, C = { "w! | !compiler %", "Compile File" }, - h = { "split", "split" }, + H = { "split", "split" }, + h = { "lua vim.lsp.buf.hover()", "Hover" }, n = { "NvimTreeToggle", "Explorer" }, O = { "setlocal spell! spelllang=en_us", "Toggle Spelling" }, P = { "!opout %", "Preview Document" }, q = { 'lua require("user.functions").smart_quit()', "Quit" }, - v = { "vsplit", "vsplit" }, + V = { "vsplit", "vsplit" }, w = { "w", "Write" }, z = { "ZenMode", "Zen" }, ["/"] = { 'lua require("Comment.api").toggle.linewise.current()', "Comment" }, @@ -193,8 +194,8 @@ local mappings = { l = { name = "LSP", - a = { "CodeActionMenu", "Code Action" }, - D = { "TroubleToggle document_diagnostics", "Diagnostics" }, + a = { "Lspsaga code_action", "Code Action" }, + t = { "TroubleToggle document_diagnostics", "Diagnostics" }, d = { "lua vim.lsp.buf.definition()", "Definition" }, w = { "TroubleToggle workspace_diagnostics", @@ -223,7 +224,7 @@ local mappings = { "Telescope lsp_dynamic_workspace_symbols", "Workspace Symbols", }, - t = { 'lua require("user.functions").toggle_diagnostics()', "Toggle Diagnostics" }, + T = { 'lua require("user.functions").toggle_diagnostics()', "Toggle Diagnostics" }, u = { "LuaSnipUnlinkCurrent", "Unlink Snippet" }, M = { "Mason", "Open Mason UI" }, },