kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-23 20:55:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(api): update "range" windows in nvim__redraw #31042

Browse Source 
Problem:  nvim__redraw's "range" marks a buffer range for redraw, and subsequently
          flushes the UI without updating the windows containing that buffer.
Solution: Implicitly update the screen, unless specified otherwise.
          Only update the screen with the last call of the treesitter
          on_changedtree() callback.
This commit is contained in:
luukvbaal 2024-11-17 20:43:36 +01:00 committed by GitHub
parent e025f5a5b3
commit 235cb5bc5f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/lua/vim/treesitter/highlighter.lua
View File

@ -219,8 +219,8 @@ end
---@package ---@package
---@param changes Range6[] ---@param changes Range6[]
function TSHighlighter:on_changedtree(changes) function TSHighlighter:on_changedtree(changes)
for _, ch in ipairs(changes) do for i, ch in ipairs(changes) do
api.nvim__redraw({ buf = self.bufnr, range = { ch[1], ch[4] + 1 } }) api.nvim__redraw({ buf = self.bufnr, range = { ch[1], ch[4] + 1 }, flush = i == #changes })
end end
end end

12
src/nvim/api/vim.c
View File

@ -2396,13 +2396,13 @@ void nvim__redraw(Dict(redraw) *opts, Error *err)
last = rbuf->b_ml.ml_line_count; last = rbuf->b_ml.ml_line_count;
} }
redraw_buf_range_later(rbuf, first, last); redraw_buf_range_later(rbuf, first, last);
opts->flush = HAS_KEY(opts, redraw, flush) ? opts->flush : true;
} }
bool flush = opts->flush;
if (opts->tabline) { if (opts->tabline) {
// Flush later in case tabline was just hidden or shown for the first time. // Flush later in case tabline was just hidden or shown for the first time.
if (redraw_tabline && firstwin->w_lines_valid == 0) { if (redraw_tabline && firstwin->w_lines_valid == 0) {
flush = true; opts->flush = true;
} else { } else {
draw_tabline(); draw_tabline();
} }
@ -2416,23 +2416,23 @@ void nvim__redraw(Dict(redraw) *opts, Error *err)
if (win == NULL) { if (win == NULL) {
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) { FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
if (buf == NULL || wp->w_buffer == buf) { if (buf == NULL || wp->w_buffer == buf) {
redraw_status(wp, opts, &flush); redraw_status(wp, opts, &opts->flush);
} }
} }
} else { } else {
redraw_status(win, opts, &flush); redraw_status(win, opts, &opts->flush);
} }
} }
win_T *cwin = win ? win : curwin; win_T *cwin = win ? win : curwin;
// Allow moving cursor to recently opened window and make sure it is drawn #28868. // Allow moving cursor to recently opened window and make sure it is drawn #28868.
if (opts->cursor && (!cwin->w_grid.target || !cwin->w_grid.target->valid)) { if (opts->cursor && (!cwin->w_grid.target || !cwin->w_grid.target->valid)) {
flush = true; opts->flush = true;
} }
// Redraw pending screen updates when explicitly requested or when determined // Redraw pending screen updates when explicitly requested or when determined
// that it is necessary to properly draw other requested components. // that it is necessary to properly draw other requested components.
if (flush && !cmdpreview) { if (opts->flush && !cmdpreview) {
update_screen(); update_screen();
} }