mirror of
https://github.com/LazyVim/LazyVim.git
synced 2025-06-24 09:48:59 +02:00
fix(lsp): dont use expr=true for lsp rename. Fixes #220
This commit is contained in:
parent
b796b6e5a8
commit
d61e4bd553
1 changed files with 39 additions and 31 deletions
|
@ -6,9 +6,10 @@ M._keys = nil
|
||||||
---@return (LazyKeys|{has?:string})[]
|
---@return (LazyKeys|{has?:string})[]
|
||||||
function M.get()
|
function M.get()
|
||||||
local format = require("lazyvim.plugins.lsp.format").format
|
local format = require("lazyvim.plugins.lsp.format").format
|
||||||
|
if not M._keys then
|
||||||
---@class PluginLspKeys
|
---@class PluginLspKeys
|
||||||
-- stylua: ignore
|
-- stylua: ignore
|
||||||
M._keys = M._keys or {
|
M._keys = {
|
||||||
{ "<leader>cd", vim.diagnostic.open_float, desc = "Line Diagnostics" },
|
{ "<leader>cd", vim.diagnostic.open_float, desc = "Line Diagnostics" },
|
||||||
{ "<leader>cl", "<cmd>LspInfo<cr>", desc = "Lsp Info" },
|
{ "<leader>cl", "<cmd>LspInfo<cr>", desc = "Lsp Info" },
|
||||||
{ "gd", "<cmd>Telescope lsp_definitions<cr>", desc = "Goto Definition" },
|
{ "gd", "<cmd>Telescope lsp_definitions<cr>", desc = "Goto Definition" },
|
||||||
|
@ -28,8 +29,23 @@ function M.get()
|
||||||
{ "<leader>ca", vim.lsp.buf.code_action, desc = "Code Action", mode = { "n", "v" }, has = "codeAction" },
|
{ "<leader>ca", vim.lsp.buf.code_action, desc = "Code Action", mode = { "n", "v" }, has = "codeAction" },
|
||||||
{ "<leader>cf", format, desc = "Format Document", has = "documentFormatting" },
|
{ "<leader>cf", format, desc = "Format Document", has = "documentFormatting" },
|
||||||
{ "<leader>cf", format, desc = "Format Range", mode = "v", has = "documentRangeFormatting" },
|
{ "<leader>cf", format, desc = "Format Range", mode = "v", has = "documentRangeFormatting" },
|
||||||
{ "<leader>cr", M.rename, expr = true, desc = "Rename", has = "rename" },
|
|
||||||
}
|
}
|
||||||
|
if require("lazyvim.util").has("inc-rename.nvim") then
|
||||||
|
M._keys[#M._keys + 1] = {
|
||||||
|
"<leader>cr",
|
||||||
|
function()
|
||||||
|
require("inc_rename")
|
||||||
|
return ":IncRename " .. vim.fn.expand("<cword>")
|
||||||
|
end,
|
||||||
|
expr = true,
|
||||||
|
desc = "Rename",
|
||||||
|
has = "rename",
|
||||||
|
}
|
||||||
|
else
|
||||||
|
M._keys[#M._keys + 1] = { "<leader>cr", vim.lsp.buf.rename, desc = "Rename", has = "rename" }
|
||||||
|
end
|
||||||
|
dd(M._keys)
|
||||||
|
end
|
||||||
return M._keys
|
return M._keys
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -58,14 +74,6 @@ function M.on_attach(client, buffer)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function M.rename()
|
|
||||||
if pcall(require, "inc_rename") then
|
|
||||||
return ":IncRename " .. vim.fn.expand("<cword>")
|
|
||||||
else
|
|
||||||
vim.lsp.buf.rename()
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
function M.diagnostic_goto(next, severity)
|
function M.diagnostic_goto(next, severity)
|
||||||
local go = next and vim.diagnostic.goto_next or vim.diagnostic.goto_prev
|
local go = next and vim.diagnostic.goto_next or vim.diagnostic.goto_prev
|
||||||
severity = severity and vim.diagnostic.severity[severity] or nil
|
severity = severity and vim.diagnostic.severity[severity] or nil
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue