IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove UTF to byte col conversion

Browse Source
This commit is contained in:
Gregory Anders 2021-09-16 11:26:45 -06:00
parent 4fa3865588
commit 0c86bf563c
1 changed files with 14 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
runtime/lua/vim/diagnostic.lua
View File

@ -624,44 +624,14 @@ local next_diagnostic = function(position, search_forward, bufnr, opts, namespac
end end
---@private ---@private
local function diagnostic_pos(opts, diagnostic) local function diagnostic_move_pos(opts, pos)
opts = opts or {}
local win_id = opts.win_id or vim.api.nvim_get_current_win()
local bufnr = vim.api.nvim_win_get_buf(win_id)
if not diagnostic then
return false
end
local lnum, col = diagnostic.lnum, diagnostic.col
if col > 0 then
if not vim.api.nvim_buf_is_loaded(bufnr) then
vim.fn.bufload(bufnr)
end
local line = vim.api.nvim_buf_get_lines(bufnr, lnum, lnum + 1, true)[1]
if line then
local ok, result = pcall(vim.str_byteindex, line, col)
if ok then
col = result
end
end
end
return {lnum, col}
end
---@private
local function diagnostic_move_pos(name, opts, pos)
opts = opts or {} opts = opts or {}
local enable_popup = vim.F.if_nil(opts.enable_popup, true) local enable_popup = vim.F.if_nil(opts.enable_popup, true)
local win_id = opts.win_id or vim.api.nvim_get_current_win() local win_id = opts.win_id or vim.api.nvim_get_current_win()
if not pos then if not pos then
print(string.format("%s: No more valid diagnostics to move to.", name)) vim.api.nvim_echo({"No more valid diagnostics to move to", "WarningMsg"})
return return
end end
@ -694,17 +664,18 @@ end
---@param opts table See |vim.diagnostic.goto_next()| ---@param opts table See |vim.diagnostic.goto_next()|
---@return table Previous diagnostic position as a (row, col) tuple. ---@return table Previous diagnostic position as a (row, col) tuple.
function M.get_prev_pos(opts) function M.get_prev_pos(opts)
return diagnostic_pos( local prev = M.get_prev(opts)
opts, if not prev then
M.get_prev(opts) return false
) end
return {prev.lnum, prev.col}
end end
--- Move to the previous diagnostic in the current buffer. --- Move to the previous diagnostic in the current buffer.
---@param opts table See |vim.diagnostic.goto_next()| ---@param opts table See |vim.diagnostic.goto_next()|
function M.goto_prev(opts) function M.goto_prev(opts)
return diagnostic_move_pos( return diagnostic_move_pos(
"DiagnosticPrevious",
opts, opts,
M.get_prev_pos(opts) M.get_prev_pos(opts)
) )
@ -729,10 +700,12 @@ end
---@param opts table See |vim.diagnostic.goto_next()| ---@param opts table See |vim.diagnostic.goto_next()|
---@return table Next diagnostic position as a (row, col) tuple. ---@return table Next diagnostic position as a (row, col) tuple.
function M.get_next_pos(opts) function M.get_next_pos(opts)
return diagnostic_pos( local next = M.get_next(opts)
opts, if not next then
M.get_next(opts) return false
) end
return {next.lnum, next.col}
end end
--- Move to the next diagnostic. --- Move to the next diagnostic.
@ -750,7 +723,6 @@ end
--- - win_id: (number, default 0) Window ID --- - win_id: (number, default 0) Window ID
function M.goto_next(opts) function M.goto_next(opts)
return diagnostic_move_pos( return diagnostic_move_pos(
"DiagnosticNext",
opts, opts,
M.get_next_pos(opts) M.get_next_pos(opts)
) )