Skip to content

fix(actions): preserve count1 across async actions (Fixes #668) #677

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
DragonXexe wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −9
Open

fix(actions): preserve count1 across async actions (Fixes #668) #677

Show file tree
Hide file tree
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
24 changes: 15 additions & 9 deletions lua/trouble/config/actions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
local Util = require("trouble.util")

---@alias trouble.Action.ctx {item?: trouble.Item, node?: trouble.Node, opts?: table}
---@alias trouble.Action.ctx {item?: trouble.Item, node?: trouble.Node, opts?: table, count1?: integer}
---@alias trouble.ActionFn fun(view:trouble.View, ctx:trouble.Action.ctx)
---@alias trouble.Action {action: trouble.ActionFn, desc?: string, mode?: string}
---@alias trouble.Action.spec string|trouble.ActionFn|trouble.Action|{action: string}
Expand Down Expand Up @@ -73,19 +73,23 @@ local M = {
end,
-- Go to the next item
next = function(self, ctx)
self:move({ down = vim.v.count1, jump = ctx.opts.jump })
local count = ctx.count1 or vim.v.count1;
self:move({ down = count, jump = ctx.opts.jump })
end,
-- Go to the previous item
prev = function(self, ctx)
self:move({ up = vim.v.count1, jump = ctx.opts.jump })
local count = ctx.count1 or vim.v.count1;
self:move({ up = count, jump = ctx.opts.jump })
end,
-- Go to the first item
first = function(self, ctx)
self:move({ idx = vim.v.count1, jump = ctx.opts.jump })
local count = ctx.count1 or vim.v.count1;
self:move({ idx = count, jump = ctx.opts.jump })
end,
-- Go to the last item
last = function(self, ctx)
self:move({ idx = -vim.v.count1, jump = ctx.opts.jump })
local count = ctx.count1 or vim.v.count1;
self:move({ idx = -count, jump = ctx.opts.jump })
end,
-- Jump to the item if on an item, otherwise do nothing
jump_only = function(self, ctx)
Expand Down Expand Up @@ -138,14 +142,16 @@ local M = {
inspect = function(_, ctx)
vim.print(ctx.item or (ctx.node and ctx.node.item))
end,
fold_reduce = function(self)
self:fold_level({ add = vim.v.count1 })
fold_reduce = function(self, ctx)
local count = ctx.count1 or vim.v.count1;
self:fold_level({ add = count })
end,
fold_open_all = function(self)
self:fold_level({ level = 1000 })
end,
fold_more = function(self)
self:fold_level({ add = -vim.v.count1 })
fold_more = function(self, ctx)
local count = ctx.count1 or vim.v.count1;
self:fold_level({ add = -count })
end,
fold_close_all = function(self)
self:fold_level({ level = 0 })
Expand Down
2 changes: 2 additions & 0 deletions lua/trouble/view/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,12 +409,14 @@ end
---@param opts? table
function M:action(action, opts)
action = Spec.action(action)
local count1 = vim.v.count1;
self:wait(function()
local at = self:at() or {}
action.action(self, {
item = at.item,
node = at.node,
opts = type(opts) == "table" and opts or {},
count1 = count1,
})
end)
end
Expand Down
Loading