From 4f4dbfe81c27eab661ca9bb83d1c559c213d77f4 Mon Sep 17 00:00:00 2001 From: Michael Lingelbach Date: Fri, 8 Oct 2021 14:01:55 -0700 Subject: fix(lsp): update tests using 0.5.0 handler calls (#15969) Fixes test regression introduced in https://github.com/neovim/neovim/pull/15262 --- test/functional/plugin/lsp_spec.lua | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'test/functional/plugin/lsp_spec.lua') diff --git a/test/functional/plugin/lsp_spec.lua b/test/functional/plugin/lsp_spec.lua index f5c02afeaa..026e6815dc 100644 --- a/test/functional/plugin/lsp_spec.lua +++ b/test/functional/plugin/lsp_spec.lua @@ -482,7 +482,7 @@ describe('LSP', function() it('should not forward RequestCancelled to callback', function() local expected_handlers = { - {NIL, "finish", {}, 1}; + {NIL, {}, {method="finish", client_id=1}}; } local client test_rpc_server { @@ -496,17 +496,17 @@ describe('LSP', function() eq(0, signal, "exit signal", fake_lsp_logfile) eq(0, #expected_handlers, "did not call expected handler") end; - on_handler = function(err, method, ...) - eq(table.remove(expected_handlers), {err, method, ...}, "expected handler") - if method == 'finish' then client.stop() end + on_handler = function(err, _, ctx) + eq(table.remove(expected_handlers), {err, {}, ctx}, "expected handler") + if ctx.method == 'finish' then client.stop() end end; } end) it('should forward ContentModified to callback', function() local expected_handlers = { - {NIL, "finish", {}, 1}; - {{code = -32801}, "error_code_test", NIL, 1, NIL}; + {NIL, {}, {method="finish", client_id=1}}; + {{code = -32801}, NIL, {method = "error_code_test", client_id=1}}; } local client test_rpc_server { @@ -520,10 +520,11 @@ describe('LSP', function() eq(0, signal, "exit signal", fake_lsp_logfile) eq(0, #expected_handlers, "did not call expected handler") end; - on_handler = function(err, method, ...) - eq(table.remove(expected_handlers), {err, method, ...}, "expected handler") - if method == 'error_code_test' then client.notify("finish") end - if method == 'finish' then client.stop() end + on_handler = function(err, _, ctx) + eq(table.remove(expected_handlers), {err, _, ctx}, "expected handler") + -- if ctx.method == 'error_code_test' then client.notify("finish") end + if ctx.method ~= 'finish' then client.notify('finish') end + if ctx.method == 'finish' then client.stop() end end; } end) -- cgit