diff options
| author | Josh Rahm <joshuarahm@gmail.com> | 2024-05-24 19:18:11 +0000 |
|---|---|---|
| committer | Josh Rahm <joshuarahm@gmail.com> | 2024-05-24 19:18:11 +0000 |
| commit | ff7ed8f586589d620a806c3758fac4a47a8e7e15 (patch) | |
| tree | 729bbcb92231538fa61dab6c3d890b025484b7f5 /test/functional/fixtures | |
| parent | 376914f419eb08fdf4c1a63a77e1f035898a0f10 (diff) | |
| parent | 28c04948a1c887a1cc0cb64de79fa32631700466 (diff) | |
| download | rneovim-ff7ed8f586589d620a806c3758fac4a47a8e7e15.tar.gz rneovim-ff7ed8f586589d620a806c3758fac4a47a8e7e15.tar.bz2 rneovim-ff7ed8f586589d620a806c3758fac4a47a8e7e15.zip | |
Merge remote-tracking branch 'upstream/master' into mix_20240309
Diffstat (limited to 'test/functional/fixtures')
| -rw-r--r-- | test/functional/fixtures/api_level_12.mpack | bin | 0 -> 32012 bytes | |||
| -rw-r--r-- | test/functional/fixtures/fake-lsp-server.lua | 5 | ||||
| -rw-r--r-- | test/functional/fixtures/shell-test.c | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/test/functional/fixtures/api_level_12.mpack b/test/functional/fixtures/api_level_12.mpack Binary files differnew file mode 100644 index 0000000000..bab1b5111c --- /dev/null +++ b/test/functional/fixtures/api_level_12.mpack diff --git a/test/functional/fixtures/fake-lsp-server.lua b/test/functional/fixtures/fake-lsp-server.lua index d9f44da0b4..f806869b40 100644 --- a/test/functional/fixtures/fake-lsp-server.lua +++ b/test/functional/fixtures/fake-lsp-server.lua @@ -110,7 +110,8 @@ local tests = {} function tests.basic_init() skeleton { - on_init = function(_) + on_init = function(params) + assert_eq(params.workDoneToken, '1') return { capabilities = { textDocumentSync = protocol.TextDocumentSyncKind.None, @@ -983,7 +984,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 = vim.uv.new_timer() +local kill_timer = assert(vim.uv.new_timer()) kill_timer:start(timeout or 1e3, 0, function() kill_timer:stop() kill_timer:close() diff --git a/test/functional/fixtures/shell-test.c b/test/functional/fixtures/shell-test.c index ef9f23e3f9..bd71e7d11b 100644 --- a/test/functional/fixtures/shell-test.c +++ b/test/functional/fixtures/shell-test.c @@ -49,6 +49,10 @@ int main(int argc, char **argv) help(); } +#ifdef _MSC_VER + SetConsoleOutputCP(CP_UTF8); +#endif + if (argc >= 2) { if (strcmp(argv[1], "-t") == 0) { if (argc < 3) { |