diff options
| author | Lewis Russell <lewis6991@gmail.com> | 2024-03-25 20:16:42 +0000 |
|---|---|---|
| committer | Lewis Russell <lewis6991@gmail.com> | 2024-03-25 20:16:42 +0000 |
| commit | 934f38682afd5925df675485b96ac9a2d3b8dd57 (patch) | |
| tree | d36a3446fde2399c24e58673d5e4786d2341278f /test | |
| parent | 2bcf88d35462325d1b90b0dacb373685f2d708a5 (diff) | |
| download | rneovim-934f38682afd5925df675485b96ac9a2d3b8dd57.tar.gz rneovim-934f38682afd5925df675485b96ac9a2d3b8dd57.tar.bz2 rneovim-934f38682afd5925df675485b96ac9a2d3b8dd57.zip | |
Revert "refactor(lsp): simplify client tracking"
This reverts commit 3f238b39cfdf27657b2d9452c6ffd28f8209c95f.
Diffstat (limited to 'test')
| -rw-r--r-- | test/functional/fixtures/fake-lsp-server.lua | 2 | ||||
| -rw-r--r-- | test/functional/plugin/lsp_spec.lua | 16 |
2 files changed, 8 insertions, 10 deletions
diff --git a/test/functional/fixtures/fake-lsp-server.lua b/test/functional/fixtures/fake-lsp-server.lua index 42a1248464..d9f44da0b4 100644 --- a/test/functional/fixtures/fake-lsp-server.lua +++ b/test/functional/fixtures/fake-lsp-server.lua @@ -983,7 +983,7 @@ local test_name = arg[1] local timeout = arg[2] assert(type(test_name) == 'string', 'test_name must be specified as first arg.') -local kill_timer = assert(vim.uv.new_timer()) +local kill_timer = vim.uv.new_timer() kill_timer:start(timeout or 1e3, 0, function() kill_timer:stop() kill_timer:close() diff --git a/test/functional/plugin/lsp_spec.lua b/test/functional/plugin/lsp_spec.lua index a8e85bdc37..d130c74aac 100644 --- a/test/functional/plugin/lsp_spec.lua +++ b/test/functional/plugin/lsp_spec.lua @@ -282,7 +282,8 @@ describe('LSP', function() local client test_rpc_server { test_name = 'basic_finish', - on_setup = function() + on_init = function(_client) + client = _client exec_lua [[ BUFFER = vim.api.nvim_create_buf(false, true) ]] @@ -291,9 +292,6 @@ describe('LSP', function() exec_lua [[ vim.api.nvim_command(BUFFER.."bwipeout") ]] - end, - on_init = function(_client) - client = _client client.notify('finish') end, on_exit = function(code, signal) @@ -808,12 +806,14 @@ describe('LSP', function() BUFFER = vim.api.nvim_get_current_buf() lsp.buf_attach_client(BUFFER, TEST_RPC_CLIENT_ID) vim.lsp.handlers['textDocument/typeDefinition'] = function() end - vim.cmd(BUFFER.."bwipeout") ]=]) end, on_init = function(client) client.stop() exec_lua('vim.lsp.buf.type_definition()') + exec_lua [[ + vim.api.nvim_command(BUFFER.."bwipeout") + ]] end, on_exit = function(code, signal) eq(0, code, 'exit code') @@ -1058,7 +1058,8 @@ describe('LSP', function() local client test_rpc_server { test_name = 'basic_finish', - on_setup = function() + on_init = function(_client) + client = _client exec_lua [[ BUFFER = vim.api.nvim_create_buf(false, true) vim.api.nvim_buf_set_lines(BUFFER, 0, -1, false, { @@ -1072,9 +1073,6 @@ describe('LSP', function() exec_lua [[ vim.api.nvim_command(BUFFER.."bwipeout") ]] - end, - on_init = function(_client) - client = _client local full_kind = exec_lua("return require'vim.lsp.protocol'.TextDocumentSyncKind.Full") eq(full_kind, client.server_capabilities().textDocumentSync.change) eq(true, client.server_capabilities().textDocumentSync.openClose) |