From 8ee15aeb6c1539722c892b6d6ff1ed478fbe0707 Mon Sep 17 00:00:00 2001 From: DarkWiiPlayer Date: Wed, 25 Oct 2023 14:52:37 +0200 Subject: [PATCH] Move telescope reference picker to lsp attach handler --- vim/lua/on_lsp_attach.lua | 10 ++++++---- vim/plugin/shame.vim | 2 -- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/vim/lua/on_lsp_attach.lua b/vim/lua/on_lsp_attach.lua index ae1512a..4be404a 100644 --- a/vim/lua/on_lsp_attach.lua +++ b/vim/lua/on_lsp_attach.lua @@ -1,5 +1,3 @@ -local opts = { noremap=true, silent=true } - return function(_, bufnr) -- Enable completion triggered by vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') @@ -20,7 +18,7 @@ return function(_, bufnr) end, bufopts) vim.api.nvim_buf_create_user_command(bufnr, "LspSetWorkspace", function() - for i, workspace in ipairs(vim.lsp.buf.list_workspace_folders()) do + for _, workspace in ipairs(vim.lsp.buf.list_workspace_folders()) do vim.lsp.buf.remove_workspace_folder(workspace) end vim.lsp.buf.add_workspace_folder(vim.cmd("pwd")) @@ -29,7 +27,11 @@ return function(_, bufnr) vim.keymap.set('n', 'D', vim.lsp.buf.type_definition, bufopts) vim.keymap.set('n', 'r', vim.lsp.buf.rename, bufopts) vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, bufopts) - vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts) + if require("telescope") then + vim.keymap.set('n', 'gr', function() vim.cmd("Telescope lsp_references") end, bufopts) + else + vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts) + end --vim.keymap.set('n', 'f', vim.lsp.buf.formatting, bufopts) vim.api.nvim_buf_create_user_command(bufnr, "Format", vim.lsp.buf.format, {}) diff --git a/vim/plugin/shame.vim b/vim/plugin/shame.vim index 35ee54d..c41cd2b 100644 --- a/vim/plugin/shame.vim +++ b/vim/plugin/shame.vim @@ -506,8 +506,6 @@ nnoremap ! :Telescope diagnostics nnoremap ? :Telescope keymaps nnoremap f :Telescope find_files nnoremap b :Telescope buffers -nnoremap ld :Telescope lsp_definitions -nnoremap lr :Telescope lsp_references nnoremap ls :Telescope lsp_document_symbols nnoremap lS :Telescope lsp_workspace_symbols nnoremap ll :Telescope lsp_