From 58d85cd03dc8067253aa525c38ea8c6c13d8cc2a Mon Sep 17 00:00:00 2001 From: notomo <18519692+notomo@users.noreply.github.com> Date: Mon, 9 Jun 2025 08:44:40 +0900 Subject: [PATCH] fix(treesitter): ensure window is valid in async parsing #34385 Problem: Error occurs if window is invalid in the middle of parsing. Solution: Check if window is valid in parsing. - Error ``` vim.schedule callback: ...im/share/nvim/runtime/lua/vim/treesitter/highlighter.lua:485: Invalid window id: 1037 stack traceback: [C]: in function 'nvim__redraw' ...im/share/nvim/runtime/lua/vim/treesitter/highlighter.lua:485: in function 'cb' ...m/share/nvim/runtime/lua/vim/treesitter/languagetree.lua:494: in function '_run_async_callbacks' ...m/share/nvim/runtime/lua/vim/treesitter/languagetree.lua:550: in function <...m/share/nvim/runtime/lua/vim/treesitter/languagetree.lua:529> ``` - Reproduce script ```lua local bufnr = vim.api.nvim_create_buf(false, true) local many_lines = vim.fn["repeat"]({ "local test = 'a'" }, 100000) vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, many_lines) local window = vim.api.nvim_open_win(bufnr, true, { relative = "editor", row = 0, col = 0, width = 10, height = 10, }) vim.bo.filetype = "lua" vim.schedule(function() vim.api.nvim_win_close(window, true) end) ``` --- runtime/lua/vim/treesitter/highlighter.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/runtime/lua/vim/treesitter/highlighter.lua b/runtime/lua/vim/treesitter/highlighter.lua index 0ae9ac26c3..89964ded02 100644 --- a/runtime/lua/vim/treesitter/highlighter.lua +++ b/runtime/lua/vim/treesitter/highlighter.lua @@ -482,7 +482,9 @@ function TSHighlighter._on_win(_, win, buf, topline, botline) == self.tree:parse({ topline, botline + 1 }, function(_, trees) if trees and self.parsing[win] then self.parsing[win] = false - api.nvim__redraw({ win = win, valid = false, flush = false }) + if api.nvim_win_is_valid(win) then + api.nvim__redraw({ win = win, valid = false, flush = false }) + end end end) if not self.parsing[win] then