IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14366 from mfussenegger/text-document-version-zero

Browse Source 
lsp: Accept text document edits with version zero
This commit is contained in:
Michael Lingelbach 2021-04-14 13:01:08 -07:00 committed by GitHub
commit 9471b15936
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
runtime/lua/vim/lsp/util.lua
View File

@ -470,6 +470,7 @@ function M.apply_text_document_edit(text_document_edit, index)
-- `VersionedTextDocumentIdentifier`s version may be null -- `VersionedTextDocumentIdentifier`s version may be null
-- https://microsoft.github.io/language-server-protocol/specification#versionedTextDocumentIdentifier -- https://microsoft.github.io/language-server-protocol/specification#versionedTextDocumentIdentifier
if should_check_version and (text_document.version if should_check_version and (text_document.version
and text_document.version > 0
and M.buf_versions[bufnr] and M.buf_versions[bufnr]
and M.buf_versions[bufnr] > text_document.version) then and M.buf_versions[bufnr] > text_document.version) then
print("Buffer ", text_document.uri, " newer than edits.") print("Buffer ", text_document.uri, " newer than edits.")

16
test/functional/plugin/lsp_spec.lua
View File

@ -1124,14 +1124,14 @@ describe('LSP', function()
'2nd line of 语text'; '2nd line of 语text';
}, buf_lines(target_bufnr)) }, buf_lines(target_bufnr))
end) end)
it('correctly goes ahead with the edit if the version is vim.NIL', function() it('always accepts edit with version = 0', function()
-- we get vim.NIL when we decode json null value. exec_lua([[
local json = exec_lua[[ local args = {...}
return vim.fn.json_decode("{ \"a\": 1, \"b\": null }") local bufnr = select(1, ...)
]] local text_edit = select(2, ...)
eq(json.b, exec_lua("return vim.NIL")) vim.lsp.util.buf_versions[bufnr] = 10
vim.lsp.util.apply_text_document_edit(text_edit)
exec_lua('vim.lsp.util.apply_text_document_edit(...)', text_document_edit(exec_lua("return vim.NIL"))) ]], target_bufnr, text_document_edit(0))
eq({ eq({
'First ↥ 🤦 🦄 line of text'; 'First ↥ 🤦 🦄 line of text';
'2nd line of 语text'; '2nd line of 语text';