aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2020-02-09 00:05:48 -0800
committerJustin M. Keyes <justinkz@gmail.com>2020-02-16 22:09:28 -0800
commita446fbc8fa278d9c1e4144dc9767c9dc0b184583 (patch)
tree5f3f09587306f2caf50effab0aa001716ea8a2bb /test
parent4cf48dc329e3e3f451ecf902af9af6317d44bb40 (diff)
downloadrneovim-a446fbc8fa278d9c1e4144dc9767c9dc0b184583.tar.gz
rneovim-a446fbc8fa278d9c1e4144dc9767c9dc0b184583.tar.bz2
rneovim-a446fbc8fa278d9c1e4144dc9767c9dc0b184583.zip
lsp/rpc.lua: fix `env` application function
Env vars must be merged with the current env.
Diffstat (limited to 'test')
-rw-r--r--test/functional/fixtures/fake-lsp-server.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/functional/fixtures/fake-lsp-server.lua b/test/functional/fixtures/fake-lsp-server.lua
index 44117bea30..cac590fd14 100644
--- a/test/functional/fixtures/fake-lsp-server.lua
+++ b/test/functional/fixtures/fake-lsp-server.lua
@@ -369,7 +369,7 @@ function tests.basic_check_buffer_open_and_change_incremental()
}
end
-function tests.basic_check_buffer_open_and_change_incremental_editting()
+function tests.basic_check_buffer_open_and_change_incremental_editing()
skeleton {
on_init = function(params)
local expected_capabilities = protocol.make_client_capabilities()
@@ -422,6 +422,7 @@ local kill_timer = vim.loop.new_timer()
kill_timer:start(_G.TIMEOUT or 1e3, 0, function()
kill_timer:stop()
kill_timer:close()
+ -- TODO: log('TIMEOUT')
io.stderr:write("TIMEOUT")
os.exit(100)
end)
@@ -432,6 +433,7 @@ local status, err = pcall(assert(tests[test_name], "Test not found"))
kill_timer:stop()
kill_timer:close()
if not status then
+ -- TODO: log(err)
io.stderr:write(err)
os.exit(101)
end