bryan
/
nvim-genghis
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: lsp-renaming support check on nvim stable

remotes/origin/HEAD
pseudometa 2023-10-07 12:54:05 +02:00
parent 86ef89d3c7
commit 9f83085431
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lua/genghis.lua
View File

@ -26,10 +26,7 @@ local function onRename(fromName, toName)
if client:supports_method(LSP_METHOD_WILL_RENAME_FILES) then if client:supports_method(LSP_METHOD_WILL_RENAME_FILES) then
local resp = client.request_sync(LSP_METHOD_WILL_RENAME_FILES, { local resp = client.request_sync(LSP_METHOD_WILL_RENAME_FILES, {
files = { files = {
{ { oldUri = vim.uri_from_fname(fromName), newUri = vim.uri_from_fname(toName) },
oldUri = vim.uri_from_fname(fromName),
newUri = vim.uri_from_fname(toName),
},
}, },
}, 1000) }, 1000)
if resp and resp.result ~= nil then if resp and resp.result ~= nil then
@ -42,8 +39,15 @@ end
---@param method string ---@param method string
---@return boolean ---@return boolean
local function anyLspSupports(method) local function anyLspSupports(method)
local clients = vim.lsp.get_active_clients() local clients = vim.lsp.get_active_clients { bufnr = 0 }
return vim.iter(clients):any(function(client) return client:supports_method(method) end) local supports = false
for _, client in ipairs(clients) do
if client:supports_method(method) then
supports = true
break
end
end
return supports
end end
-- https://github.com/neovim/neovim/issues/17735#issuecomment-1068525617 -- https://github.com/neovim/neovim/issues/17735#issuecomment-1068525617
@ -113,8 +117,7 @@ local function fileOp(op)
prefill = oldNameNoExt prefill = oldNameNoExt
elseif op == "move-rename" then elseif op == "move-rename" then
local lspWillRename = anyLspSupports(LSP_METHOD_WILL_RENAME_FILES) local lspWillRename = anyLspSupports(LSP_METHOD_WILL_RENAME_FILES)
promptStr = lspWillRename and "Move-Rename File & notify LSP:" promptStr = lspWillRename and "Move-Rename File & notify LSP:" or "Move & Rename File to:"
or "Move & Rename File to:"
prefill = dir .. "/" prefill = dir .. "/"
elseif op == "new" or op == "newFromSel" then elseif op == "new" or op == "newFromSel" then
promptStr = "Name for New File: " promptStr = "Name for New File: "