2 files changed, 68 insertions, 0 deletions
diff --git a/test/functional/plugin/lsp/diagnostic_spec.lua b/test/functional/plugin/lsp/diagnostic_spec.lua
index 353de667ea..243ad6bdb8 100644
--- a/test/functional/plugin/lsp/diagnostic_spec.lua
+++ b/test/functional/plugin/lsp/diagnostic_spec.lua
@@ -428,6 +428,32 @@ describe('vim.lsp.diagnostic', function()
         end)
       end)
     end)
+
+    it('maintains LSP information when translating diagnostics', function()
+      local result = exec_lua [[
+        local diagnostics = {
+          make_error("Error 1", 1, 1, 1, 5),
+        }
+
+        diagnostics[1].code = 42
+        diagnostics[1].tags = {"foo", "bar"}
+        diagnostics[1].data = "Hello world"
+
+        vim.lsp.diagnostic.on_publish_diagnostics(nil, {
+          uri = fake_uri,
+          diagnostics = diagnostics,
+        }, {client_id=1})
+
+        return {
+          vim.diagnostic.get(diagnostic_bufnr, {lnum=1})[1],
+          vim.lsp.diagnostic.get_line_diagnostics(diagnostic_bufnr, 1)[1],
+        }
+      ]]
+      eq({code = 42, tags = {"foo", "bar"}, data = "Hello world"}, result[1].user_data.lsp)
+      eq(42, result[2].code)
+      eq({"foo", "bar"}, result[2].tags)
+      eq("Hello world", result[2].data)
+    end)
   end)
 
   describe("vim.lsp.diagnostic.get_line_diagnostics", function()
diff --git a/test/functional/plugin/lsp_spec.lua b/test/functional/plugin/lsp_spec.lua
index 6ad37110c7..27f2d2536f 100644
--- a/test/functional/plugin/lsp_spec.lua
+++ b/test/functional/plugin/lsp_spec.lua
@@ -2353,6 +2353,10 @@ describe('LSP', function()
           eq(0, signal, "exit signal", fake_lsp_logfile)
         end;
         on_handler = function(err, result, ctx)
+          -- Don't compare & assert params, they're not relevant for the testcase
+          -- This allows us to be lazy and avoid declaring them
+          ctx.params = nil
+
           eq(table.remove(test.expected_handlers), {err, result, ctx}, "expected handler")
           if ctx.method == 'start' then
             exec_lua("vim.lsp.buf.rename()")
@@ -2370,4 +2374,42 @@ describe('LSP', function()
     end
   end)
 
+  describe('vim.lsp.buf.code_action', function()
+    it('Calls client side command if available', function()
+      eq(1, exec_lua [[
+        local dummy_calls = 0
+        vim.lsp.commands.dummy = function()
+          dummy_calls = dummy_calls + 1
+        end
+        local actions = {
+          {
+            title = 'Dummy command',
+            command = 'dummy',
+          },
+        }
+        -- inputlist would require input and block the test;
+        vim.fn.inputlist = function()
+          return 1
+        end
+        local params = {}
+        local handler = require'vim.lsp.handlers'['textDocument/codeAction']
+        handler(nil, actions, { method = 'textDocument/codeAction', params = params }, nil)
+        return dummy_calls
+      ]])
+    end)
+  end)
+  describe('vim.lsp.commands', function()
+    it('Accepts only string keys', function()
+      matches(
+        '.*The key for commands in `vim.lsp.commands` must be a string',
+        pcall_err(exec_lua, 'vim.lsp.commands[1] = function() end')
+      )
+    end)
+    it('Accepts only function values', function()
+      matches(
+        '.*Command added to `vim.lsp.commands` must be a function',
+        pcall_err(exec_lua, 'vim.lsp.commands.dummy = 10')
+      )
+    end)
+  end)
 end)