1 files changed, 44 insertions, 13 deletions

diff --git a/test/functional/plugin/lsp_spec.lua b/test/functional/plugin/lsp_spec.lua
index ae436360c3..1ab81a0ef8 100644
--- a/test/functional/plugin/lsp_spec.lua
+++ b/test/functional/plugin/lsp_spec.lua
@@ -811,10 +811,33 @@ 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, {"", "12"});
         make_edit(0, 0, 0, 0, {"3", "foo"});
+        make_edit(0, 0, 0, 0, {"", "12"});
         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"});
@@ -1232,7 +1255,7 @@ describe('LSP', function()
         ]])
       end)
     end)
-    describe('convert SymbolInformation[] to items', function()
+    it('convert SymbolInformation[] to items', function()
         local expected = {
           {
             col = 1,
@@ -1296,11 +1319,11 @@ describe('LSP', function()
   end)
 
   describe('lsp.util._get_completion_item_kind_name', function()
-    describe('returns the name specified by protocol', function()
+    it('returns the name specified by protocol', function()
       eq("Text", exec_lua("return vim.lsp.util._get_completion_item_kind_name(1)"))
       eq("TypeParameter", exec_lua("return vim.lsp.util._get_completion_item_kind_name(25)"))
     end)
-    describe('returns the name not specified by protocol', function()
+    it('returns the name not specified by protocol', function()
       eq("Unknown", exec_lua("return vim.lsp.util._get_completion_item_kind_name(nil)"))
       eq("Unknown", exec_lua("return vim.lsp.util._get_completion_item_kind_name(vim.NIL)"))
       eq("Unknown", exec_lua("return vim.lsp.util._get_completion_item_kind_name(1000)"))
@@ -1308,11 +1331,11 @@ describe('LSP', function()
   end)
 
   describe('lsp.util._get_symbol_kind_name', function()
-    describe('returns the name specified by protocol', function()
+    it('returns the name specified by protocol', function()
       eq("File", exec_lua("return vim.lsp.util._get_symbol_kind_name(1)"))
       eq("TypeParameter", exec_lua("return vim.lsp.util._get_symbol_kind_name(26)"))
     end)
-    describe('returns the name not specified by protocol', function()
+    it('returns the name not specified by protocol', function()
       eq("Unknown", exec_lua("return vim.lsp.util._get_symbol_kind_name(nil)"))
       eq("Unknown", exec_lua("return vim.lsp.util._get_symbol_kind_name(vim.NIL)"))
       eq("Unknown", exec_lua("return vim.lsp.util._get_symbol_kind_name(1000)"))
@@ -1381,12 +1404,20 @@ describe('LSP', function()
   end)
 
   describe('lsp.util._make_floating_popup_size', function()
-    exec_lua [[ contents =
-    {"text tαxt txtα tex",
-    "text tααt tααt text",
-    "text tαxt tαxt"}
-    ]]
-    eq({19,3}, exec_lua[[ return {vim.lsp.util._make_floating_popup_size(contents)} ]])
-    eq({15,5}, exec_lua[[ return {vim.lsp.util._make_floating_popup_size(contents,{width = 15, wrap_at = 14})} ]])
+    before_each(function()
+      exec_lua [[ contents =
+      {"text tαxt txtα tex",
+      "text tααt tααt text",
+      "text tαxt tαxt"}
+      ]]
+    end)
+
+    it('calculates size correctly', function()
+      eq({19,3}, exec_lua[[ return {vim.lsp.util._make_floating_popup_size(contents)} ]])
+    end)
+
+    it('calculates size correctly with wrapping', function()
+      eq({15,5}, exec_lua[[ return {vim.lsp.util._make_floating_popup_size(contents,{width = 15, wrap_at = 14})} ]])
+    end)
   end)
 end)