mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-04 01:34:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(lsp): ensure pending changes are flushed on skipped debounce (#17015)

Browse Source 
Follow up to https://github.com/neovim/neovim/pull/16881

Document changes could get sent out of order to the server:

    1. on_lines: debounce > 0; add to pending changes; setup timer
    2. on_lines: debounce = 0; send new changes immediately
    3. timer triggers, sending changes from 1.
This commit is contained in:
Mathias Fußenegger
2022-01-10 17:33:36 +01:00
committed by GitHub
parent 69f1f906a0
commit 3f2fbb824e
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runtime/lua/vim/lsp.lua
View File

@@ -413,8 +413,12 @@ do
return return
end end
local state = state_by_client[client.id] local state = state_by_client[client.id]
changetracking._reset_timer(state)
local debounce = next_debounce(client.config.flags.debounce_text_changes or 150, state, bufnr) local debounce = next_debounce(client.config.flags.debounce_text_changes or 150, state, bufnr)
if debounce == 0 then if debounce == 0 then
if state.pending_change then
state.pending_change()
end
local changes = state.use_incremental_sync and incremental_changes(client) or full_changes() local changes = state.use_incremental_sync and incremental_changes(client) or full_changes()
client.notify("textDocument/didChange", { client.notify("textDocument/didChange", {
textDocument = { textDocument = {
@@ -425,7 +429,6 @@ do
}) })
return return
end end
changetracking._reset_timer(state)
if state.use_incremental_sync then if state.use_incremental_sync then
-- This must be done immediately and cannot be delayed -- This must be done immediately and cannot be delayed
-- The contents would further change and startline/endline may no longer fit -- The contents would further change and startline/endline may no longer fit