From 5e81f42460d28689bc2d08d9ce4d2c07b139aa3d Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 13 May 2022 13:25:24 +0100 Subject: [PATCH] fix(nvim): fix LSP code reference mapping --- roles/neovim/files/lua/opdavies/lsp/init.lua | 2 +- roles/neovim/files/lua/opdavies/plugins.lua | 1 + roles/neovim/files/lua/opdavies/telescope/setup.lua | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/roles/neovim/files/lua/opdavies/lsp/init.lua b/roles/neovim/files/lua/opdavies/lsp/init.lua index 6e2180a5..2009b31b 100644 --- a/roles/neovim/files/lua/opdavies/lsp/init.lua +++ b/roles/neovim/files/lua/opdavies/lsp/init.lua @@ -36,6 +36,7 @@ local custom_attach = function(client) -- Keymaps buf_inoremap { "", vim.lsp.buf.signature_help } + buf_nnoremap { "ca", vim.lsp.buf.code_action } buf_nnoremap { "dn", vim.diagnostic.goto_next } buf_nnoremap { "dp", vim.diagnostic.goto_prev } buf_nnoremap { "gD", vim.lsp.buf.declaration } @@ -50,7 +51,6 @@ local custom_attach = function(client) buf_nnoremap { "K", vim.lsp.buf.hover } end - telescope_mapper("ca", "lsp_code_actions", nil, true) telescope_mapper("dl", "diagnostics", nil, true) -- Set autocommands conditional on server_capabilities diff --git a/roles/neovim/files/lua/opdavies/plugins.lua b/roles/neovim/files/lua/opdavies/plugins.lua index 35ff2639..82384116 100644 --- a/roles/neovim/files/lua/opdavies/plugins.lua +++ b/roles/neovim/files/lua/opdavies/plugins.lua @@ -104,6 +104,7 @@ return packer.startup(function() use "nvim-telescope/telescope.nvim" use "nvim-telescope/telescope-file-browser.nvim" use { "nvim-telescope/telescope-fzf-native.nvim", run = "make" } + use { "nvim-telescope/telescope-ui-select.nvim" } -- Git use 'TimUntersberger/neogit' diff --git a/roles/neovim/files/lua/opdavies/telescope/setup.lua b/roles/neovim/files/lua/opdavies/telescope/setup.lua index ae4a7ebc..d45e00ae 100644 --- a/roles/neovim/files/lua/opdavies/telescope/setup.lua +++ b/roles/neovim/files/lua/opdavies/telescope/setup.lua @@ -46,13 +46,19 @@ telescope.setup { no_ignore = true, prompt_prefix = "$ ", }, + extensions = { file_browser = { theme = "ivy", }, + + ["ui-select"] = { + require("telescope.themes").get_dropdown {}, + }, }, } telescope.load_extension "file_browser" telescope.load_extension "fzf" telescope.load_extension "refactoring" +telescope.load_extension "ui-select"