diff options
author | Andreas Johansson <ndreas@users.noreply.github.com> | 2020-07-30 19:37:19 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-30 13:37:19 -0400 |
commit | 82bfdbfe5c4eebd98ef59b52045ffd198e7ff389 (patch) | |
tree | 01312fe8c3c9b3ca67d8832e0051ed52757989a6 | |
parent | 54ff1cdd76518d88d5e530afc56a9b8c2b7633be (diff) | |
download | rneovim-82bfdbfe5c4eebd98ef59b52045ffd198e7ff389.tar.gz rneovim-82bfdbfe5c4eebd98ef59b52045ffd198e7ff389.tar.bz2 rneovim-82bfdbfe5c4eebd98ef59b52045ffd198e7ff389.zip |
Revert "lsp: Fix text edits with the same start position (#12434)" (#12564)
This reverts commit 44fe8828f06a22bc9aa3617a6fd8aae447a838de.
-rw-r--r-- | runtime/lua/vim/lsp/util.lua | 2 | ||||
-rw-r--r-- | test/functional/plugin/lsp_spec.lua | 25 |
2 files changed, 2 insertions, 25 deletions
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua index 5a68138f1e..d286f28d0c 100644 --- a/runtime/lua/vim/lsp/util.lua +++ b/runtime/lua/vim/lsp/util.lua @@ -92,7 +92,7 @@ local function sort_by_key(fn) end end local edit_sort_key = sort_by_key(function(e) - return {e.A[1], e.A[2], -e.i} + return {e.A[1], e.A[2], e.i} end) --- Position is a https://microsoft.github.io/language-server-protocol/specifications/specification-current/#position diff --git a/test/functional/plugin/lsp_spec.lua b/test/functional/plugin/lsp_spec.lua index aaa28390ea..1002011999 100644 --- a/test/functional/plugin/lsp_spec.lua +++ b/test/functional/plugin/lsp_spec.lua @@ -815,33 +815,10 @@ describe('LSP', function() 'å å ɧ 汉语 ↥ 🤦 🦄'; }, buf_lines(1)) end) - it('handles edits with the same start position, applying changes in the order in the array', function() - local edits = { - make_edit(0, 6, 0, 10, {""}); - make_edit(0, 6, 0, 6, {"REPLACE"}); - make_edit(1, 0, 1, 3, {""}); - make_edit(1, 0, 1, 0, {"123"}); - make_edit(2, 16, 2, 18, {""}); - make_edit(2, 16, 2, 16, {"XYZ"}); - make_edit(3, 7, 3, 11, {"this"}); - make_edit(3, 7, 3, 11, {"will"}); - make_edit(3, 7, 3, 11, {"not "}); - make_edit(3, 7, 3, 11, {"show"}); - make_edit(3, 7, 3, 11, {"(but this will)"}); - } - exec_lua('vim.lsp.util.apply_text_edits(...)', edits, 1) - eq({ - 'First REPLACE of text'; - '123ond line of text'; - 'Third line of teXYZ'; - 'Fourth (but this will) of text'; - 'å å ɧ 汉语 ↥ 🤦 🦄'; - }, buf_lines(1)) - end) it('applies complex edits', function() local edits = { - make_edit(0, 0, 0, 0, {"3", "foo"}); make_edit(0, 0, 0, 0, {"", "12"}); + make_edit(0, 0, 0, 0, {"3", "foo"}); make_edit(0, 1, 0, 1, {"bar", "123"}); make_edit(0, #"First ", 0, #"First line of text", {"guy"}); make_edit(1, 0, 1, #'Second', {"baz"}); |