Skip to content

refactor(diagnostics): replace goto_next/prev with jump #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
huibosa wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor(diagnostics): replace goto_next/prev with jump #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 20 additions & 13 deletions lua/nvim-next/integrations/diagnostic.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,33 @@
local move = require("nvim-next.move")

return function()
local default_forward = { count = 1, float = true }
local default_backward = { count = -1, float = true }

--- Internal helper to merge opts into defaults (keeps existing default keys)
local function merge_opts(defaults, overrides)
return vim.tbl_deep_extend("keep", defaults, overrides or {})
end

return {
goto_next = function(opts)
local forward_opts = merge_opts(default_forward, opts)
local backward_opts = merge_opts(default_backward, opts)

return move.make_forward_repeatable_move(
function()
vim.diagnostic.goto_next(opts)
end,
function()
vim.diagnostic.goto_prev(opts)
end
function() vim.diagnostic.jump(forward_opts) end,
function() vim.diagnostic.jump(backward_opts) end
)
end,

goto_prev = function(opts)
local forward_opts = merge_opts(default_forward, opts)
local backward_opts = merge_opts(default_backward, opts)

return move.make_backward_repeatable_move(
function()
vim.diagnostic.goto_prev(opts)
end,
function()
vim.diagnostic.goto_next(opts)
end
function() vim.diagnostic.jump(backward_opts) end,
function() vim.diagnostic.jump(forward_opts) end
)
end
end,
}
end