diff --git a/.config/nvim/lua/plugins/extras/lsp/actions-preview.lua b/.config/nvim/lua/plugins/extras/lsp/actions-preview.lua index b2134427..c2c4bf88 100644 --- a/.config/nvim/lua/plugins/extras/lsp/actions-preview.lua +++ b/.config/nvim/lua/plugins/extras/lsp/actions-preview.lua @@ -1,34 +1,39 @@ return { - "aznhe21/actions-preview.nvim", - init = function() - local keys = require("lazyvim.plugins.lsp.keymaps").get() + { + "neovim/nvim-lspconfig", + opts = function() + local keys = require("lazyvim.plugins.lsp.keymaps").get() - keys[#keys + 1] = { "ca", false } - end, - event = "LspAttach", - opts = { - telescope = { - sorting_strategy = "ascending", - layout_strategy = "vertical", - layout_config = { - width = 0.6, - height = 0.7, - prompt_position = "top", - preview_cutoff = 20, - preview_height = function(_, _, max_lines) - return max_lines - 15 + keys[#keys + 1] = { + "ca", + function() + require("actions-preview").code_actions() end, + mode = { "n", "v" }, + desc = "Code Action Preview", + } + keys[#keys + 1] = { "gr", "Glance references", desc = "Goto References" } + keys[#keys + 1] = { "gy", "Glance type_definitions", desc = "Goto T[y]pe Definitions" } + keys[#keys + 1] = { "gI", "Glance implementations", desc = "Goto Implementations" } + end, + }, + { + "aznhe21/actions-preview.nvim", + event = "LspAttach", + opts = { + telescope = { + sorting_strategy = "ascending", + layout_strategy = "vertical", + layout_config = { + width = 0.6, + height = 0.7, + prompt_position = "top", + preview_cutoff = 20, + preview_height = function(_, _, max_lines) + return max_lines - 15 + end, + }, }, }, }, - keys = { - { - "ca", - function() - require("actions-preview").code_actions() - end, - mode = { "n", "v" }, - desc = "Code Action Preview", - }, - }, } diff --git a/.config/nvim/lua/plugins/extras/lsp/glance.lua b/.config/nvim/lua/plugins/extras/lsp/glance.lua index 9016f572..baca801b 100644 --- a/.config/nvim/lua/plugins/extras/lsp/glance.lua +++ b/.config/nvim/lua/plugins/extras/lsp/glance.lua @@ -1,40 +1,40 @@ return { - "dnlhc/glance.nvim", - init = function() - local keys = require("lazyvim.plugins.lsp.keymaps").get() + { + "neovim/nvim-lspconfig", + opts = function() + local keys = require("lazyvim.plugins.lsp.keymaps").get() - keys[#keys + 1] = { "gd", false } - keys[#keys + 1] = { "gr", false } - keys[#keys + 1] = { "gy", false } - keys[#keys + 1] = { "gI", false } - end, - cmd = { "Glance" }, - opts = { - border = { - enable = true, - }, - use_trouble_qf = true, - hooks = { - before_open = function(results, open, jump, method) - local uri = vim.uri_from_bufnr(0) - if #results == 1 then - local target_uri = results[1].uri or results[1].targetUri + keys[#keys + 1] = { "gd", "Glance definitions", desc = "Goto Definitions" } + keys[#keys + 1] = { "gr", "Glance references", desc = "Goto References" } + keys[#keys + 1] = { "gy", "Glance type_definitions", desc = "Goto T[y]pe Definitions" } + keys[#keys + 1] = { "gI", "Glance implementations", desc = "Goto Implementations" } + end, + }, + { + "dnlhc/glance.nvim", + cmd = { "Glance" }, + event = "LspAttach", + opts = { + border = { + enable = true, + }, + use_trouble_qf = true, + hooks = { + before_open = function(results, open, jump, method) + local uri = vim.uri_from_bufnr(0) + if #results == 1 then + local target_uri = results[1].uri or results[1].targetUri - if target_uri == uri then - jump(results[1]) + if target_uri == uri then + jump(results[1]) + else + open(results) + end else open(results) end - else - open(results) - end - end, + end, + }, }, }, - keys = { - { "gd", "Glance definitions", desc = "Goto Definition" }, - { "gr", "Glance references", desc = "References" }, - { "gy", "Glance type_definitions", desc = "Goto t[y]pe definitions" }, - { "gI", "Glance implementations", desc = "Goto implementations" }, - }, }