From 1fe01b36de72a937ac7be430077df918a659345d Mon Sep 17 00:00:00 2001
From: Jesse Bakker <j.bakker@scisports.com>
Date: Fri, 24 Jan 2020 12:31:52 +0100
Subject: Use buffer version instead of changedtick for edits

---
 runtime/lua/vim/lsp.lua      | 2 ++
 runtime/lua/vim/lsp/util.lua | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'runtime/lua/vim')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index bc0da25ae5..8190542955 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -613,6 +613,8 @@ do
     if tbl_isempty(all_buffer_active_clients[bufnr] or {}) then
       return
     end
+
+    util.buf_versions[bufnr] = changedtick
     -- Lazy initialize these because clients may not even need them.
     local incremental_changes = once(function(client)
       local size_index = encoding_index[client.offset_encoding]
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index b7c7b7f75d..3dfe4d7d02 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -135,7 +135,7 @@ function M.apply_text_document_edit(text_document_edit)
   local text_document = text_document_edit.textDocument
   local bufnr = vim.uri_to_bufnr(text_document.uri)
   -- TODO(ashkan) check this is correct.
-  if api.nvim_buf_get_changedtick(bufnr) > text_document.version then
+  if (M.buf_versions[bufnr] or 0) > text_document.version then
     print("Buffer ", text_document.uri, " newer than edits.")
     return
   end
@@ -868,5 +868,7 @@ function M.character_offset(buf, row, col)
   return str_utfindex(line, col)
 end
 
+M.buf_versions = {}
+
 return M
 -- vim:sw=2 ts=2 et
-- 
cgit