diff options
author | Mathias Fussenegger <f.mathias@zignar.net> | 2021-04-14 21:42:03 +0200 |
---|---|---|
committer | Mathias Fussenegger <f.mathias@zignar.net> | 2021-04-14 21:42:03 +0200 |
commit | 046991e4d5c6bc25ee11bbe28f0b685f00cf1d3d (patch) | |
tree | 4be3e72e7c455aeb94ec0eaa0f663d14387f2a6d | |
parent | b67f689e4cb08ac3f33432038ae9aec81383a9f3 (diff) | |
download | rneovim-046991e4d5c6bc25ee11bbe28f0b685f00cf1d3d.tar.gz rneovim-046991e4d5c6bc25ee11bbe28f0b685f00cf1d3d.tar.bz2 rneovim-046991e4d5c6bc25ee11bbe28f0b685f00cf1d3d.zip |
lsp: Remove vim.NIL handling from apply_text_document_edit
The rpc layer normalizes `vim.NIL` to `nil`, so the scenario tested
should never happen.
-rw-r--r-- | runtime/lua/vim/lsp/util.lua | 1 | ||||
-rw-r--r-- | test/functional/plugin/lsp_spec.lua | 13 |
2 files changed, 0 insertions, 14 deletions
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua index 783a35a774..71ec85381b 100644 --- a/runtime/lua/vim/lsp/util.lua +++ b/runtime/lua/vim/lsp/util.lua @@ -470,7 +470,6 @@ function M.apply_text_document_edit(text_document_edit, index) -- `VersionedTextDocumentIdentifier`s version may be null -- https://microsoft.github.io/language-server-protocol/specification#versionedTextDocumentIdentifier if should_check_version and (text_document.version - and text_document.version ~= vim.NIL and text_document.version > 0 and M.buf_versions[bufnr] and M.buf_versions[bufnr] > text_document.version) then diff --git a/test/functional/plugin/lsp_spec.lua b/test/functional/plugin/lsp_spec.lua index 49e443d56c..557f8a206f 100644 --- a/test/functional/plugin/lsp_spec.lua +++ b/test/functional/plugin/lsp_spec.lua @@ -1137,19 +1137,6 @@ describe('LSP', function() '2nd line of 语text'; }, buf_lines(target_bufnr)) end) - it('correctly goes ahead with the edit if the version is vim.NIL', function() - -- we get vim.NIL when we decode json null value. - local json = exec_lua[[ - return vim.fn.json_decode("{ \"a\": 1, \"b\": null }") - ]] - eq(json.b, exec_lua("return vim.NIL")) - - exec_lua('vim.lsp.util.apply_text_document_edit(...)', text_document_edit(exec_lua("return vim.NIL"))) - eq({ - 'First ↥ 🤦 🦄 line of text'; - '2nd line of 语text'; - }, buf_lines(target_bufnr)) - end) it('skips the edit if the version of the edit is behind the local buffer ', function() local apply_edit_mocking_current_version = function(edit, versionedBuf) exec_lua([[ |