warg/nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: address emmylua diagnostics

Browse Source
This commit is contained in:
Oscar Wallberg
2026-04-20 22:11:18 +02:00
parent 516b9ea749
commit c7dd083083
29 changed files with 542 additions and 532 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lua/lsp/completion/popup.lua
+77 -53
View File
@@ -81,15 +81,24 @@ function Popup:resolved_for(word)
return nil
end
---@return integer?
function Popup:active_win()
if self.winid and vim.api.nvim_win_is_valid(self.winid) then
return self.winid
end
return nil
end
---@return boolean
function Popup:is_visible()
return self.winid ~= nil and vim.api.nvim_win_is_valid(self.winid)
return self:active_win() ~= nil
end
function Popup:close()
self:cancel_pending()
if self:is_visible() then
vim.api.nvim_win_close(self.winid, true)
local winid = self:active_win()
if winid then
vim.api.nvim_win_close(winid, true)
end
self.winid = nil
end
@@ -115,28 +124,35 @@ end
function Popup:dispatch_resolve(client, item, ft, pum, word, buf)
self:cancel_pending()
self.resolved = nil
local method = vim.lsp.protocol.Methods.completionItem_resolve
local _, request_id = client:request(method, item.raw, function(err, result)
if err then
log.warning(
"client %d: %s failed: %s",
client.id,
method,
err.message
)
end
self.pending = nil
if err or not result then
return
end
local cur = vim.fn.complete_info({ "completed" })
if (vim.tbl_get(cur, "completed", "word") or "") ~= word then
return
end
item:apply_resolved(result)
self.resolved = { word = word, item = item }
self:show(item, ft, pum)
end, buf)
local _, request_id = client:request(
"completionItem/resolve",
item.raw,
---@param err lsp.ResponseError?
---@param result lsp.CompletionItem?
---@param ctx lsp.HandlerContext
function(err, result, ctx)
if err then
log.warning(
"client %d: %s failed: %s",
client.id,
ctx.method,
err.message
)
end
self.pending = nil
if err or not result then
return
end
local cur = vim.fn.complete_info({ "completed" })
if (vim.tbl_get(cur, "completed", "word") or "") ~= word then
return
end
item:apply_resolved(result)
self.resolved = { word = word, item = item }
self:show(item, ft, pum)
end,
buf
)
if request_id then
self.pending = { client = client, id = request_id }
end
@@ -148,14 +164,14 @@ Popup.HALF_PAGE = HALF_HEIGHT
---@param pum ow.lsp.completion.Pum
---@param width integer
function Popup:render(content, pum, width)
self:ensure_buffer()
local bufnr = self:ensure_buffer()
local lines = vim.split(content, "\n", { plain = true })
vim.api.nvim_buf_set_lines(self.bufnr, 0, -1, false, lines)
vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, lines)
vim.api.nvim_buf_clear_namespace(self.bufnr, NS, 0, -1)
vim.api.nvim_buf_clear_namespace(bufnr, NS, 0, -1)
for i, line in ipairs(lines) do
if line ~= "" and line:gsub("─", "") == "" then
vim.api.nvim_buf_set_extmark(self.bufnr, NS, i - 1, 0, {
vim.api.nvim_buf_set_extmark(bufnr, NS, i - 1, 0, {
end_row = i - 1,
end_col = #line,
hl_group = "FloatBorder",
@@ -187,22 +203,24 @@ function Popup:render(content, pum, width)
style = "minimal",
}
if self:is_visible() then
vim.api.nvim_win_set_config(self.winid, cfg)
local winid = self:active_win()
if winid then
vim.api.nvim_win_set_config(winid, cfg)
else
cfg.noautocmd = true
self.winid = vim.api.nvim_open_win(self.bufnr, false, cfg)
vim.wo[self.winid].wrap = true
vim.wo[self.winid].linebreak = true
vim.wo[self.winid].conceallevel = 2
winid = vim.api.nvim_open_win(bufnr, false, cfg)
self.winid = winid
vim.wo[winid].wrap = true
vim.wo[winid].linebreak = true
vim.wo[winid].conceallevel = 2
end
vim.api.nvim_win_set_cursor(self.winid, { 1, 0 })
vim.api.nvim_win_set_cursor(winid, { 1, 0 })
local actual = vim.api.nvim_win_text_height(self.winid, {
local actual = vim.api.nvim_win_text_height(winid, {
max_height = MAX_HEIGHT,
}).all
if actual ~= height then
vim.api.nvim_win_set_height(self.winid, actual)
vim.api.nvim_win_set_height(winid, actual)
end
self:update_indicators()
@@ -211,12 +229,13 @@ end
---@param direction "up" | "down"
---@param count integer
function Popup:scroll(direction, count)
if not self:is_visible() then
local winid = self:active_win()
if not winid then
return
end
local key = direction == "down" and vim.keycode("<C-e>")
or vim.keycode("<C-y>")
vim.api.nvim_win_call(self.winid, function()
vim.api.nvim_win_call(winid, function()
vim.cmd.normal({ args = { count .. key }, bang = true })
end)
self:update_indicators()
@@ -229,46 +248,51 @@ function Popup:cancel_pending()
end
end
---@return integer
function Popup:ensure_buffer()
if self.bufnr and vim.api.nvim_buf_is_valid(self.bufnr) then
return
return self.bufnr
end
self.bufnr = vim.api.nvim_create_buf(false, true)
vim.bo[self.bufnr].buftype = "nofile"
vim.bo[self.bufnr].bufhidden = "hide"
vim.bo[self.bufnr].swapfile = false
local bufnr = vim.api.nvim_create_buf(false, true)
vim.bo[bufnr].buftype = "nofile"
vim.bo[bufnr].bufhidden = "hide"
vim.bo[bufnr].swapfile = false
-- Markdown parser may not be installed; fall back to no highlighting.
pcall(vim.treesitter.start, self.bufnr, "markdown")
pcall(vim.treesitter.start, bufnr, "markdown")
self.bufnr = bufnr
return bufnr
end
function Popup:update_indicators()
if not self:is_visible() then
local winid = self:active_win()
if not winid then
return
end
local visible = vim.api.nvim_win_get_height(self.winid)
local topline, botline = unpack(vim.api.nvim_win_call(self.winid, function()
local visible = vim.api.nvim_win_get_height(winid)
---@type integer, integer
local topline, botline = unpack(vim.api.nvim_win_call(winid, function()
return { vim.fn.line("w0"), vim.fn.line("w$") }
end))
local display_topline = 1
if topline > 1 then
display_topline = vim.api.nvim_win_text_height(self.winid, {
display_topline = vim.api.nvim_win_text_height(winid, {
end_row = topline - 2,
}).all + 1
end
local display_bot = display_topline + visible - 1
local total = vim.api.nvim_win_text_height(self.winid, {
local total = vim.api.nvim_win_text_height(winid, {
max_height = display_bot + 1,
}).all
local has_above = display_topline > 1
local has_below = display_bot < total
and botline
< vim.api.nvim_buf_line_count(vim.api.nvim_win_get_buf(self.winid))
< vim.api.nvim_buf_line_count(vim.api.nvim_win_get_buf(winid))
vim.api.nvim_win_set_config(self.winid, {
vim.api.nvim_win_set_config(winid, {
title = has_above and { { "▲ ", "FloatBorder" } } or "",
title_pos = has_above and "right" or nil,
footer = has_below and { { "▼ ", "FloatBorder" } } or "",