barrett/canola.nvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

fix: pass bufnr to constrain_cursor (#574)

Browse source 
* pass bufnr to the constrain_cursor

* return early if the oil buffer is not the current buffer

---------

Co-authored-by: Steven Arcangeli <506791+stevearc@users.noreply.github.com>
This commit is contained in:
skshetry 2025-03-05 06:29:26 +05:45 • committed by GitHub
parent d7c61c7084
commit 54fe7dca36
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lua/oil/view.lua
View file

@ -258,20 +258,24 @@ local function get_first_mutable_column_col(adapter, ranges)
end end
---Force cursor to be after hidden/immutable columns ---Force cursor to be after hidden/immutable columns
---@param bufnr integer
---@param mode false|"name"|"editable" ---@param mode false|"name"|"editable"
local function constrain_cursor(mode) local function constrain_cursor(bufnr, mode)
if not mode then if not mode then
return return
end end
if bufnr ~= vim.api.nvim_get_current_buf() then
return
end
local parser = require("oil.mutator.parser") local parser = require("oil.mutator.parser")
local adapter = util.get_adapter(0, true) local adapter = util.get_adapter(bufnr, true)
if not adapter then if not adapter then
return return
end end
local cur = vim.api.nvim_win_get_cursor(0) local cur = vim.api.nvim_win_get_cursor(0)
local line = vim.api.nvim_buf_get_lines(0, cur[1] - 1, cur[1], true)[1] local line = vim.api.nvim_buf_get_lines(bufnr, cur[1] - 1, cur[1], true)[1]
local column_defs = columns.get_supported_columns(adapter) local column_defs = columns.get_supported_columns(adapter)
local result = parser.parse_line(adapter, line, column_defs) local result = parser.parse_line(adapter, line, column_defs)
if result and result.ranges then if result and result.ranges then
@ -406,7 +410,7 @@ M.initialize = function(bufnr)
callback = function() callback = function()
-- For some reason the cursor bounces back to its original position, -- For some reason the cursor bounces back to its original position,
-- so we have to defer the call -- so we have to defer the call
vim.schedule_wrap(constrain_cursor)(config.constrain_cursor) vim.schedule_wrap(constrain_cursor)(bufnr, config.constrain_cursor)
end, end,
}) })
vim.api.nvim_create_autocmd({ "CursorMoved", "ModeChanged" }, { vim.api.nvim_create_autocmd({ "CursorMoved", "ModeChanged" }, {
@ -419,7 +423,7 @@ M.initialize = function(bufnr)
return return
end end
constrain_cursor(config.constrain_cursor) constrain_cursor(bufnr, config.constrain_cursor)
if config.preview_win.update_on_cursor_moved then if config.preview_win.update_on_cursor_moved then
-- Debounce and update the preview window -- Debounce and update the preview window
@ -690,7 +694,7 @@ local function render_buffer(bufnr, opts)
end end
end end
constrain_cursor("name") constrain_cursor(bufnr, "name")
end end
end end
end) end)