mirrors/snacks.nvim
1
0
Fork 0
mirror of https://github.com/folke/snacks.nvim synced 2025-08-05 11:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix(scroll): handle buffer changes while animating

Browse source
This commit is contained in:
Folke Lemaitre 2025-01-23 20:43:01 +01:00
parent a4f3507cd4
commit 3da0b0ec11
No known key found for this signature in database
GPG key ID: 41F8B1FBACAE2040
1 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

41
lua/snacks/scroll.lua
View file

@ -52,6 +52,18 @@ local stats = { targets = 0, animating = 0, reset = 0, skipped = 0, mousescroll
local config = Snacks.config.get("scroll", defaults) local config = Snacks.config.get("scroll", defaults)
local debug_timer = assert((vim.uv or vim.loop).new_timer()) local debug_timer = assert((vim.uv or vim.loop).new_timer())
---@param state snacks.scroll.State
---@param value? string
local function virtualedit(state, value)
if value then
state.virtualedit = state.virtualedit or vim.wo[state.win].virtualedit
vim.wo[state.win].virtualedit = value
elseif state.virtualedit then
vim.wo[state.win].virtualedit = state.virtualedit
state.virtualedit = nil
end
end
-- get the state for a window. -- get the state for a window.
-- when the state doesn't exist, its target is the current view -- when the state doesn't exist, its target is the current view
local function get_state(win) local function get_state(win)
@ -71,6 +83,15 @@ local function get_state(win)
local changedtick = vim.api.nvim_buf_get_changedtick(buf) local changedtick = vim.api.nvim_buf_get_changedtick(buf)
local view = vim.api.nvim_win_call(win, vim.fn.winsaveview) ---@type vim.fn.winsaveview.ret local view = vim.api.nvim_win_call(win, vim.fn.winsaveview) ---@type vim.fn.winsaveview.ret
if not (states[win] and states[win].buf == buf and states[win].changedtick == changedtick) then if not (states[win] and states[win].buf == buf and states[win].changedtick == changedtick) then
-- go to target if we're still animating and resetting due to a change
if states[win] and states[win].anim and not states[win].anim.done and states[win].buf == buf then
states[win].anim:stop()
states[win].anim = nil
vim.api.nvim_win_call(win, function()
vim.fn.winrestview(states[win].target)
end)
virtualedit(states[win]) -- restore virtualedit
end
---@diagnostic disable-next-line: missing-fields ---@diagnostic disable-next-line: missing-fields
states[win] = { states[win] = {
win = win, win = win,
@ -137,9 +158,11 @@ function M.enable()
callback = vim.schedule_wrap(function(ev) callback = vim.schedule_wrap(function(ev)
for _, win in ipairs(vim.fn.win_findbuf(ev.buf)) do for _, win in ipairs(vim.fn.win_findbuf(ev.buf)) do
if states[win] then if states[win] then
local cursor = vim.api.nvim_win_get_cursor(win) local view = vim.api.nvim_win_call(win, vim.fn.winsaveview)
states[win].current.lnum = cursor[1] -- local cursor = vim.api.nvim_win_get_cursor(win)
states[win].current.col = cursor[2] states[win].current.lnum = view.lnum
states[win].current.col = view.col
states[win].current.topline = view.topline
end end
end end
end), end),
@ -200,18 +223,6 @@ local function visible_lines(from, to)
return ret return ret
end end
---@param state snacks.scroll.State
---@param value? string
local function virtualedit(state, value)
if value then
state.virtualedit = state.virtualedit or vim.wo[state.win].virtualedit
vim.wo[state.win].virtualedit = value
elseif state.virtualedit then
vim.wo[state.win].virtualedit = state.virtualedit
state.virtualedit = nil
end
end
--- Check if we need to animate the scroll --- Check if we need to animate the scroll
---@param win number ---@param win number
---@private ---@private