aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/nvim/buffer.c38
-rw-r--r--src/nvim/indent_c.c5
-rw-r--r--src/nvim/mbyte.c6
-rw-r--r--src/nvim/os/fs.c1
-rw-r--r--src/nvim/version.c2
-rw-r--r--test/functional/api/server_requests_spec.lua8
-rw-r--r--test/functional/core/job_partial_spec.lua30
-rw-r--r--test/functional/core/job_spec.lua158
-rw-r--r--test/functional/eval/timer_spec.lua2
-rw-r--r--test/functional/ex_cmds/ctrl_c_spec.lua6
-rw-r--r--test/functional/helpers.lua6
-rw-r--r--test/functional/ui/output_spec.lua2
-rw-r--r--test/functional/ui/screen.lua107
-rw-r--r--test/functional/ui/screen_basic_spec.lua16
-rw-r--r--test/helpers.lua1
15 files changed, 222 insertions, 166 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 600cf575fc..26dbbe8bb5 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -282,6 +282,27 @@ bool buf_valid(buf_T *buf)
return false;
}
+// Map used to quickly lookup a buffer by its number.
+static PMap(handle_T) *buf_map = NULL;
+
+static void buf_hashtab_add(buf_T *buf)
+ FUNC_ATTR_NONNULL_ALL
+{
+ if (pmap_has(handle_T)(buf_map, buf->handle)) {
+ EMSG(_("E931: Buffer cannot be registered"));
+ } else {
+ pmap_put(handle_T)(buf_map, buf->handle, buf);
+ }
+}
+
+static void buf_hashtab_remove(buf_T *buf)
+ FUNC_ATTR_NONNULL_ALL
+{
+ if (pmap_has(handle_T)(buf_map, buf->handle)) {
+ pmap_del(handle_T)(buf_map, buf->handle);
+ }
+}
+
/// Close the link to a buffer.
///
/// @param win If not NULL, set b_last_cursor.
@@ -585,6 +606,7 @@ static void free_buffer(buf_T *buf)
free_buffer_stuff(buf, TRUE);
unref_var_dict(buf->b_vars);
aubuflocal_remove(buf);
+ buf_hashtab_remove(buf);
dict_unref(buf->additional_data);
clear_fmark(&buf->b_last_cursor);
clear_fmark(&buf->b_last_insert);
@@ -1369,7 +1391,10 @@ buf_T * buflist_new(char_u *ffname, char_u *sfname, linenr_T lnum, int flags)
{
buf_T *buf;
- fname_expand(curbuf, &ffname, &sfname); /* will allocate ffname */
+ if (top_file_num == 1) {
+ buf_map = pmap_new(handle_T)();
+ }
+ fname_expand(curbuf, &ffname, &sfname); // will allocate ffname
/*
* If file name already exists in the list, update the entry.
@@ -1493,6 +1518,7 @@ buf_T * buflist_new(char_u *ffname, char_u *sfname, linenr_T lnum, int flags)
}
top_file_num = 1;
}
+ buf_hashtab_add(buf);
/*
* Always copy the options from the current buffer.
@@ -2002,19 +2028,15 @@ static char_u *fname_match(regmatch_T *rmp, char_u *name, bool ignore_case)
return match;
}
-/*
- * find file in buffer list by number
- */
+/// Find a file in the buffer list by buffer number.
buf_T *buflist_findnr(int nr)
{
if (nr == 0) {
nr = curwin->w_alt_fnum;
}
- FOR_ALL_BUFFERS(buf) {
- if (buf->b_fnum == nr) {
- return buf;
- }
+ if (pmap_has(handle_T)(buf_map, (handle_T)nr)) {
+ return pmap_get(handle_T)(buf_map, (handle_T)nr);
}
return NULL;
}
diff --git a/src/nvim/indent_c.c b/src/nvim/indent_c.c
index 6f03cf6037..7b758b4dac 100644
--- a/src/nvim/indent_c.c
+++ b/src/nvim/indent_c.c
@@ -173,9 +173,8 @@ static char_u *skip_string(char_u *p)
char_u *delim = p + 2;
char_u *paren = vim_strchr(delim, '(');
- if (paren != NULL)
- {
- long delim_len = paren - delim;
+ if (paren != NULL) {
+ ptrdiff_t delim_len = paren - delim;
for (p += 3; *p; ++p)
if (p[0] == ')' && STRNCMP(p + 1, delim, delim_len) == 0
diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c
index ec4969d4f6..c855d68605 100644
--- a/src/nvim/mbyte.c
+++ b/src/nvim/mbyte.c
@@ -1484,6 +1484,9 @@ int utf8_to_utf16(const char *str, WCHAR **strw)
(WCHAR *)pos,
wchar_len);
assert(r == wchar_len);
+ if (r != wchar_len) {
+ EMSG2("MultiByteToWideChar failed: %d", r);
+ }
*strw = (WCHAR *)pos;
return 0;
@@ -1519,6 +1522,9 @@ int utf16_to_utf8(const WCHAR *strw, char **str)
NULL,
NULL);
assert(r == utf8_len);
+ if (r != utf8_len) {
+ EMSG2("WideCharToMultiByte failed: %d", r);
+ }
*str = pos;
return 0;
diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c
index 4aa727733e..30e08ac129 100644
--- a/src/nvim/os/fs.c
+++ b/src/nvim/os/fs.c
@@ -939,7 +939,6 @@ char_u * os_resolve_shortcut(char_u *fname)
OLECHAR wsz[MAX_PATH];
char_u *rfname = NULL;
int len;
- int conversion_result;
IShellLinkW *pslw = NULL;
WIN32_FIND_DATAW ffdw;
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 3bf87da376..3d81788a7e 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -404,7 +404,7 @@ static int included_patches[] = {
// 2039 NA
// 2038 NA
// 2037 NA
- // 2036,
+ 2036,
// 2035 NA
// 2034 NA
2033,
diff --git a/test/functional/api/server_requests_spec.lua b/test/functional/api/server_requests_spec.lua
index aa91cd1396..76a335a8f4 100644
--- a/test/functional/api/server_requests_spec.lua
+++ b/test/functional/api/server_requests_spec.lua
@@ -1,11 +1,11 @@
--- Tests for some server->client RPC scenarios. Note that unlike with
--- `rpcnotify`, to evaluate `rpcrequest` calls we need the client event loop to
--- be running.
+-- Test server -> client RPC scenarios. Note: unlike `rpcnotify`, to evaluate
+-- `rpcrequest` calls we need the client event loop to be running.
local helpers = require('test.functional.helpers')(after_each)
local clear, nvim, eval = helpers.clear, helpers.nvim, helpers.eval
local eq, neq, run, stop = helpers.eq, helpers.neq, helpers.run, helpers.stop
local nvim_prog, command, funcs = helpers.nvim_prog, helpers.command, helpers.funcs
local source, next_message = helpers.source, helpers.next_message
+local ok = helpers.ok
local meths = helpers.meths
describe('server -> client', function()
@@ -180,7 +180,7 @@ describe('server -> client', function()
it('returns an error if the request failed', function()
local status, err = pcall(eval, "rpcrequest(vim, 'does-not-exist')")
eq(false, status)
- eq(true, string.match(err, ': (.*)') == 'Failed to evaluate expression')
+ ok(nil ~= string.match(err, 'Failed to evaluate expression'))
end)
end)
diff --git a/test/functional/core/job_partial_spec.lua b/test/functional/core/job_partial_spec.lua
deleted file mode 100644
index 7643b283c4..0000000000
--- a/test/functional/core/job_partial_spec.lua
+++ /dev/null
@@ -1,30 +0,0 @@
-local helpers = require('test.functional.helpers')(after_each)
-local clear, eq, next_msg, nvim, source = helpers.clear, helpers.eq,
- helpers.next_message, helpers.nvim, helpers.source
-
-describe('jobs with partials', function()
- local channel
-
- before_each(function()
- clear()
- if helpers.os_name() == 'windows' then
- helpers.set_shell_powershell()
- end
- channel = nvim('get_api_info')[1]
- nvim('set_var', 'channel', channel)
- end)
-
- it('works correctly', function()
- source([[
- function PrintArgs(a1, a2, id, data, event)
- " Windows: Remove ^M char.
- let normalized = map(a:data, 'substitute(v:val, "\r", "", "g")')
- call rpcnotify(g:channel, '1', a:a1, a:a2, normalized, a:event)
- endfunction
- let Callback = function('PrintArgs', ["foo", "bar"])
- let g:job_opts = {'on_stdout': Callback}
- call jobstart('echo "some text"', g:job_opts)
- ]])
- eq({'notification', '1', {'foo', 'bar', {'some text', ''}, 'stdout'}}, next_msg())
- end)
-end)
diff --git a/test/functional/core/job_spec.lua b/test/functional/core/job_spec.lua
index 48a4689545..38c2d4e9cc 100644
--- a/test/functional/core/job_spec.lua
+++ b/test/functional/core/job_spec.lua
@@ -7,21 +7,30 @@ local clear, eq, eval, execute, feed, insert, neq, next_msg, nvim,
helpers.write_file, helpers.mkdir, helpers.rmdir
local command = helpers.command
local wait = helpers.wait
+local iswin = helpers.iswin
local Screen = require('test.functional.ui.screen')
-if helpers.pending_win32(pending) then return end
-
describe('jobs', function()
local channel
before_each(function()
clear()
+ if iswin() then
+ helpers.set_shell_powershell()
+ end
channel = nvim('get_api_info')[1]
nvim('set_var', 'channel', channel)
source([[
+ function! Normalize(data) abort
+ " Windows: remove ^M
+ return type([]) == type(a:data)
+ \ ? map(a:data, 'substitute(v:val, "\r", "", "g")')
+ \ : a:data
+ endfunction
function! s:OnEvent(id, data, event) dict
let userdata = get(self, 'user')
- call rpcnotify(g:channel, a:event, userdata, a:data)
+ let data = Normalize(a:data)
+ call rpcnotify(g:channel, a:event, userdata, data)
endfunction
let g:job_opts = {
\ 'on_stdout': function('s:OnEvent'),
@@ -33,6 +42,8 @@ describe('jobs', function()
end)
it('uses &shell and &shellcmdflag if passed a string', function()
+ -- TODO: Windows: jobstart() does not inherit $VAR
+ if helpers.pending_win32(pending) then return end
nvim('command', "let $VAR = 'abc'")
nvim('command', "let j = jobstart('echo $VAR', g:job_opts)")
eq({'notification', 'stdout', {0, {'abc', ''}}}, next_msg())
@@ -41,8 +52,13 @@ describe('jobs', function()
it('changes to given / directory', function()
nvim('command', "let g:job_opts.cwd = '/'")
- nvim('command', "let j = jobstart('pwd', g:job_opts)")
- eq({'notification', 'stdout', {0, {'/', ''}}}, next_msg())
+ if iswin() then
+ nvim('command', "let j = jobstart('pwd|%{$_.Path}', g:job_opts)")
+ else
+ nvim('command', "let j = jobstart('pwd', g:job_opts)")
+ end
+ eq({'notification', 'stdout',
+ {0, {(iswin() and [[C:\]] or '/'), ''}}}, next_msg())
eq({'notification', 'exit', {0, 0}}, next_msg())
end)
@@ -50,7 +66,11 @@ describe('jobs', function()
local dir = eval('resolve(tempname())')
mkdir(dir)
nvim('command', "let g:job_opts.cwd = '" .. dir .. "'")
- nvim('command', "let j = jobstart('pwd', g:job_opts)")
+ if iswin() then
+ nvim('command', "let j = jobstart('pwd|%{$_.Path}', g:job_opts)")
+ else
+ nvim('command', "let j = jobstart('pwd', g:job_opts)")
+ end
eq({'notification', 'stdout', {0, {dir, ''}}}, next_msg())
eq({'notification', 'exit', {0, 0}}, next_msg())
rmdir(dir)
@@ -60,7 +80,11 @@ describe('jobs', function()
local dir = eval('resolve(tempname())."-bogus"')
local _, err = pcall(function()
nvim('command', "let g:job_opts.cwd = '" .. dir .. "'")
- nvim('command', "let j = jobstart('pwd', g:job_opts)")
+ if iswin() then
+ nvim('command', "let j = jobstart('pwd|%{$_.Path}', g:job_opts)")
+ else
+ nvim('command', "let j = jobstart('pwd', g:job_opts)")
+ end
end)
ok(string.find(err, "E475: Invalid argument: expected valid directory$") ~= nil)
end)
@@ -73,7 +97,10 @@ describe('jobs', function()
end)
it('returns -1 when target is not executable #5465', function()
- local function new_job() return eval([[jobstart(['echo', 'foo'])]]) end
+ if helpers.pending_win32(pending) then return end
+ local function new_job()
+ return eval([[jobstart('')]])
+ end
local executable_jobid = new_job()
local nonexecutable_jobid = eval(
"jobstart(['./test/functional/fixtures/non_executable.txt'])")
@@ -85,12 +112,15 @@ describe('jobs', function()
end)
it('invokes callbacks when the job writes and exits', function()
- nvim('command', "call jobstart(['echo'], g:job_opts)")
+ -- TODO: hangs on Windows
+ if helpers.pending_win32(pending) then return end
+ nvim('command', "call jobstart('echo', g:job_opts)")
eq({'notification', 'stdout', {0, {'', ''}}}, next_msg())
eq({'notification', 'exit', {0, 0}}, next_msg())
end)
it('allows interactive commands', function()
+ if helpers.pending_win32(pending) then return end -- TODO: Need `cat`.
nvim('command', "let j = jobstart(['cat', '-'], g:job_opts)")
neq(0, eval('j'))
nvim('command', 'call jobsend(j, "abc\\n")')
@@ -104,6 +134,7 @@ describe('jobs', function()
end)
it('preserves NULs', function()
+ if helpers.pending_win32(pending) then return end -- TODO: Need `cat`.
-- Make a file with NULs in it.
local filename = helpers.tmpname()
write_file(filename, "abc\0def\n")
@@ -121,6 +152,7 @@ describe('jobs', function()
end)
it("will not buffer data if it doesn't end in newlines", function()
+ if helpers.pending_win32(pending) then return end -- TODO: Need `cat`.
if os.getenv("TRAVIS") and os.getenv("CC") == "gcc-4.9"
and helpers.os_name() == "osx" then
-- XXX: Hangs Travis macOS since e9061117a5b8f195c3f26a5cb94e18ddd7752d86.
@@ -136,6 +168,7 @@ describe('jobs', function()
end)
it('preserves newlines', function()
+ if helpers.pending_win32(pending) then return end -- TODO: Need `cat`.
nvim('command', "let j = jobstart(['cat', '-'], g:job_opts)")
nvim('command', 'call jobsend(j, "a\\n\\nc\\n\\n\\n\\nb\\n\\n")')
eq({'notification', 'stdout',
@@ -143,6 +176,7 @@ describe('jobs', function()
end)
it('preserves NULs', function()
+ if helpers.pending_win32(pending) then return end -- TODO: Need `cat`.
nvim('command', "let j = jobstart(['cat', '-'], g:job_opts)")
nvim('command', 'call jobsend(j, ["\n123\n", "abc\\nxyz\n", ""])')
eq({'notification', 'stdout', {0, {'\n123\n', 'abc\nxyz\n', ''}}},
@@ -152,6 +186,7 @@ describe('jobs', function()
end)
it('avoids sending final newline', function()
+ if helpers.pending_win32(pending) then return end -- TODO: Need `cat`.
nvim('command', "let j = jobstart(['cat', '-'], g:job_opts)")
nvim('command', 'call jobsend(j, ["some data", "without\nfinal nl"])')
eq({'notification', 'stdout', {0, {'some data', 'without\nfinal nl'}}},
@@ -161,12 +196,14 @@ describe('jobs', function()
end)
it('closes the job streams with jobclose', function()
+ if helpers.pending_win32(pending) then return end -- TODO: Need `cat`.
nvim('command', "let j = jobstart(['cat', '-'], g:job_opts)")
nvim('command', 'call jobclose(j, "stdin")')
eq({'notification', 'exit', {0, 0}}, next_msg())
end)
it("disallows jobsend on a job that closed stdin", function()
+ if helpers.pending_win32(pending) then return end -- TODO: Need `cat`.
nvim('command', "let j = jobstart(['cat', '-'], g:job_opts)")
nvim('command', 'call jobclose(j, "stdin")')
eq(false, pcall(function()
@@ -180,17 +217,20 @@ describe('jobs', function()
end)
it('disallows jobstop twice on the same job', function()
+ if helpers.pending_win32(pending) then return end -- TODO: Need `cat`.
nvim('command', "let j = jobstart(['cat', '-'], g:job_opts)")
neq(0, eval('j'))
eq(true, pcall(eval, "jobstop(j)"))
eq(false, pcall(eval, "jobstop(j)"))
end)
- it('will not cause a memory leak if we leave a job running', function()
+ it('will not leak memory if we leave a job running', function()
+ if helpers.pending_win32(pending) then return end -- TODO: Need `cat`.
nvim('command', "call jobstart(['cat', '-'], g:job_opts)")
end)
it('can get the pid value using getpid', function()
+ if helpers.pending_win32(pending) then return end -- TODO: Need `cat`.
nvim('command', "let j = jobstart(['cat', '-'], g:job_opts)")
local pid = eval('jobpid(j)')
eq(0,os.execute('ps -p '..pid..' > /dev/null'))
@@ -199,19 +239,21 @@ describe('jobs', function()
neq(0,os.execute('ps -p '..pid..' > /dev/null'))
end)
- it("doesn't survive the exit of nvim", function()
+ it("do not survive the exit of nvim", function()
+ if helpers.pending_win32(pending) then return end
-- use sleep, which doesn't die on stdin close
- nvim('command', "let j = jobstart(['sleep', '1000'], g:job_opts)")
- local pid = eval('jobpid(j)')
+ nvim('command', "let g:j = jobstart(['sleep', '1000'], g:job_opts)")
+ local pid = eval('jobpid(g:j)')
eq(0,os.execute('ps -p '..pid..' > /dev/null'))
clear()
neq(0,os.execute('ps -p '..pid..' > /dev/null'))
end)
it('can survive the exit of nvim with "detach"', function()
+ if helpers.pending_win32(pending) then return end
nvim('command', 'let g:job_opts.detach = 1')
- nvim('command', "let j = jobstart(['sleep', '1000'], g:job_opts)")
- local pid = eval('jobpid(j)')
+ nvim('command', "let g:j = jobstart(['sleep', '1000'], g:job_opts)")
+ local pid = eval('jobpid(g:j)')
eq(0,os.execute('ps -p '..pid..' > /dev/null'))
clear()
eq(0,os.execute('ps -p '..pid..' > /dev/null'))
@@ -221,13 +263,14 @@ describe('jobs', function()
it('can pass user data to the callback', function()
nvim('command', 'let g:job_opts.user = {"n": 5, "s": "str", "l": [1]}')
- nvim('command', "call jobstart(['echo'], g:job_opts)")
+ nvim('command', [[call jobstart('echo "foo"', g:job_opts)]])
local data = {n = 5, s = 'str', l = {1}}
- eq({'notification', 'stdout', {data, {'', ''}}}, next_msg())
+ eq({'notification', 'stdout', {data, {'foo', ''}}}, next_msg())
eq({'notification', 'exit', {data, 0}}, next_msg())
end)
it('can omit options', function()
+ if helpers.pending_win32(pending) then return end
neq(0, nvim('eval', 'delete(".Xtestjob")'))
nvim('command', "call jobstart(['touch', '.Xtestjob'])")
nvim('command', "sleep 100m")
@@ -238,20 +281,20 @@ describe('jobs', function()
nvim('command', 'unlet g:job_opts.on_stdout')
nvim('command', 'unlet g:job_opts.on_stderr')
nvim('command', 'let g:job_opts.user = 5')
- nvim('command', "call jobstart(['echo'], g:job_opts)")
+ nvim('command', [[call jobstart('echo "foo"', g:job_opts)]])
eq({'notification', 'exit', {5, 0}}, next_msg())
end)
it('can omit exit callback', function()
nvim('command', 'unlet g:job_opts.on_exit')
nvim('command', 'let g:job_opts.user = 5')
- nvim('command', "call jobstart(['echo'], g:job_opts)")
- eq({'notification', 'stdout', {5, {'', ''}}}, next_msg())
+ nvim('command', [[call jobstart('echo "foo"', g:job_opts)]])
+ eq({'notification', 'stdout', {5, {'foo', ''}}}, next_msg())
end)
it('will pass return code with the exit event', function()
nvim('command', 'let g:job_opts.user = 5')
- nvim('command', "call jobstart([&sh, '-c', 'exit 55'], g:job_opts)")
+ nvim('command', "call jobstart('exit 55', g:job_opts)")
eq({'notification', 'exit', {5, 55}}, next_msg())
end)
@@ -261,12 +304,13 @@ describe('jobs', function()
function g:dict.on_exit(id, code, event)
call rpcnotify(g:channel, a:event, a:code, self.id)
endfunction
- call jobstart([&sh, '-c', 'exit 45'], g:dict)
+ call jobstart('exit 45', g:dict)
]])
eq({'notification', 'exit', {45, 10}}, next_msg())
end)
it('can redefine callbacks being used by a job', function()
+ if helpers.pending_win32(pending) then return end -- TODO: Need `cat`.
local screen = Screen.new()
screen:attach()
screen:set_default_attr_ids({
@@ -298,7 +342,7 @@ describe('jobs', function()
function! s:OnEvent(id, data, event) dict
let g:job_result = get(self, 'user')
endfunction
- let s:job = jobstart(['echo'], {
+ let s:job = jobstart('echo "foo"', {
\ 'on_stdout': 's:OnEvent',
\ 'on_stderr': 's:OnEvent',
\ 'on_exit': 's:OnEvent',
@@ -313,6 +357,7 @@ describe('jobs', function()
end)
it('does not repeat output with slow output handlers', function()
+ if helpers.pending_win32(pending) then return end
source([[
let d = {'data': []}
function! d.on_stdout(job, data, event) dict
@@ -330,14 +375,28 @@ describe('jobs', function()
eq({'notification', 'data', {{{'1', ''}, {'2', ''}, {'3', ''}, {'4', ''}, {'5', ''}}}}, next_msg())
end)
+ it('jobstart() works with partial functions', function()
+ source([[
+ function PrintArgs(a1, a2, id, data, event)
+ " Windows: remove ^M
+ let normalized = map(a:data, 'substitute(v:val, "\r", "", "g")')
+ call rpcnotify(g:channel, '1', a:a1, a:a2, normalized, a:event)
+ endfunction
+ let Callback = function('PrintArgs', ["foo", "bar"])
+ let g:job_opts = {'on_stdout': Callback}
+ call jobstart('echo "some text"', g:job_opts)
+ ]])
+ eq({'notification', '1', {'foo', 'bar', {'some text', ''}, 'stdout'}}, next_msg())
+ end)
+
describe('jobwait', function()
it('returns a list of status codes', function()
source([[
call rpcnotify(g:channel, 'wait', jobwait([
- \ jobstart([&sh, '-c', 'sleep 0.10; exit 4']),
- \ jobstart([&sh, '-c', 'sleep 0.110; exit 5']),
- \ jobstart([&sh, '-c', 'sleep 0.210; exit 6']),
- \ jobstart([&sh, '-c', 'sleep 0.310; exit 7'])
+ \ jobstart('sleep 0.10; exit 4'),
+ \ jobstart('sleep 0.110; exit 5'),
+ \ jobstart('sleep 0.210; exit 6'),
+ \ jobstart('sleep 0.310; exit 7')
\ ]))
]])
eq({'notification', 'wait', {{4, 5, 6, 7}}}, next_msg())
@@ -354,10 +413,10 @@ describe('jobs', function()
let g:exits += 1
endfunction
call jobwait([
- \ jobstart([&sh, '-c', 'sleep 0.010; exit 5'], g:dict),
- \ jobstart([&sh, '-c', 'sleep 0.030; exit 5'], g:dict),
- \ jobstart([&sh, '-c', 'sleep 0.050; exit 5'], g:dict),
- \ jobstart([&sh, '-c', 'sleep 0.070; exit 5'], g:dict)
+ \ jobstart('sleep 0.010; exit 5', g:dict),
+ \ jobstart('sleep 0.030; exit 5', g:dict),
+ \ jobstart('sleep 0.050; exit 5', g:dict),
+ \ jobstart('sleep 0.070; exit 5', g:dict)
\ ])
call rpcnotify(g:channel, 'wait', g:exits)
]])
@@ -367,10 +426,10 @@ describe('jobs', function()
it('will return status codes in the order of passed ids', function()
source([[
call rpcnotify(g:channel, 'wait', jobwait([
- \ jobstart([&sh, '-c', 'sleep 0.070; exit 4']),
- \ jobstart([&sh, '-c', 'sleep 0.050; exit 5']),
- \ jobstart([&sh, '-c', 'sleep 0.030; exit 6']),
- \ jobstart([&sh, '-c', 'sleep 0.010; exit 7'])
+ \ jobstart('sleep 0.070; exit 4'),
+ \ jobstart('sleep 0.050; exit 5'),
+ \ jobstart('sleep 0.030; exit 6'),
+ \ jobstart('sleep 0.010; exit 7')
\ ]))
]])
eq({'notification', 'wait', {{4, 5, 6, 7}}}, next_msg())
@@ -380,7 +439,7 @@ describe('jobs', function()
source([[
call rpcnotify(g:channel, 'wait', jobwait([
\ -10,
- \ jobstart([&sh, '-c', 'sleep 0.01; exit 5']),
+ \ jobstart('sleep 0.01; exit 5'),
\ ]))
]])
eq({'notification', 'wait', {{-3, 5}}}, next_msg())
@@ -389,13 +448,14 @@ describe('jobs', function()
it('will return -2 when interrupted', function()
execute('call rpcnotify(g:channel, "ready") | '..
'call rpcnotify(g:channel, "wait", '..
- 'jobwait([jobstart([&sh, "-c", "sleep 10; exit 55"])]))')
+ 'jobwait([jobstart("sleep 10; exit 55")]))')
eq({'notification', 'ready', {}}, next_msg())
feed('<c-c>')
eq({'notification', 'wait', {{-2}}}, next_msg())
end)
it('can be called recursively', function()
+ if helpers.pending_win32(pending) then return end -- TODO: Need `cat`.
source([[
let g:opts = {}
let g:counter = 0
@@ -426,7 +486,7 @@ describe('jobs', function()
let j.state = 0
let j.counter = g:counter
call jobwait([
- \ jobstart([&sh, '-c', 'echo ready; cat -'], j),
+ \ jobstart('echo ready; cat -', j),
\ ])
endfunction
]])
@@ -442,11 +502,12 @@ describe('jobs', function()
end)
describe('with timeout argument', function()
+ if helpers.pending_win32(pending) then return end
it('will return -1 if the wait timed out', function()
source([[
call rpcnotify(g:channel, 'wait', jobwait([
- \ jobstart([&sh, '-c', 'exit 4']),
- \ jobstart([&sh, '-c', 'sleep 10; exit 5']),
+ \ jobstart('exit 4'),
+ \ jobstart('sleep 10; exit 5'),
\ ], 100))
]])
eq({'notification', 'wait', {{4, -1}}}, next_msg())
@@ -455,8 +516,8 @@ describe('jobs', function()
it('can pass 0 to check if a job exists', function()
source([[
call rpcnotify(g:channel, 'wait', jobwait([
- \ jobstart([&sh, '-c', 'sleep 0.05; exit 4']),
- \ jobstart([&sh, '-c', 'sleep 0.3; exit 5']),
+ \ jobstart('sleep 0.05; exit 4'),
+ \ jobstart('sleep 0.3; exit 5'),
\ ], 0))
]])
eq({'notification', 'wait', {{-1, -1}}}, next_msg())
@@ -475,6 +536,7 @@ describe('jobs', function()
end)
it('cannot have both rpc and pty options', function()
+ if helpers.pending_win32(pending) then return end -- TODO: Need `cat`.
command("let g:job_opts.pty = v:true")
command("let g:job_opts.rpc = v:true")
local _, err = pcall(command, "let j = jobstart(['cat', '-'], g:job_opts)")
@@ -482,6 +544,7 @@ describe('jobs', function()
end)
describe('running tty-test program', function()
+ if helpers.pending_win32(pending) then return end
local function next_chunk()
local rv
while true do
@@ -504,8 +567,14 @@ describe('jobs', function()
end
before_each(function()
- -- the full path to tty-test seems to be required when running on travis.
- insert(nvim_dir .. '/tty-test')
+ -- Redefine Normalize() so that TTY data is not munged.
+ source([[
+ function! Normalize(data) abort
+ return a:data
+ endfunction
+ ]])
+ local ext = iswin() and '.exe' or ''
+ insert(nvim_dir..'/tty-test'..ext) -- Full path to tty-test.
nvim('command', 'let g:job_opts.pty = 1')
nvim('command', 'let exec = [expand("<cfile>:p")]')
nvim('command', "let j = jobstart(exec, g:job_opts)")
@@ -553,6 +622,7 @@ describe("pty process teardown", function()
end)
it("does not prevent/delay exit. #4798 #4900", function()
+ if helpers.pending_win32(pending) then return end
-- Use a nested nvim (in :term) to test without --headless.
execute(":terminal '"..helpers.nvim_prog
-- Use :term again in the _nested_ nvim to get a PTY process.
diff --git a/test/functional/eval/timer_spec.lua b/test/functional/eval/timer_spec.lua
index fba9466b78..4353619ff0 100644
--- a/test/functional/eval/timer_spec.lua
+++ b/test/functional/eval/timer_spec.lua
@@ -81,7 +81,7 @@ describe('timers', function()
run(nil, nil, nil, 300)
feed("c")
local count = eval("g:val")
- ok(count >= 5)
+ ok(count >= 4)
eq(99, eval("g:c"))
end)
diff --git a/test/functional/ex_cmds/ctrl_c_spec.lua b/test/functional/ex_cmds/ctrl_c_spec.lua
index b0acb02000..072fd2ad10 100644
--- a/test/functional/ex_cmds/ctrl_c_spec.lua
+++ b/test/functional/ex_cmds/ctrl_c_spec.lua
@@ -3,17 +3,15 @@ local Screen = require('test.functional.ui.screen')
local clear, feed, source = helpers.clear, helpers.feed, helpers.source
local execute = helpers.execute
-if helpers.pending_win32(pending) then return end
-
describe("CTRL-C (mapped)", function()
before_each(function()
clear()
end)
it("interrupts :global", function()
+ -- Crashes luajit.
if helpers.skip_fragile(pending,
- (os.getenv("TRAVIS") and os.getenv("CLANG_SANITIZER") == "ASAN_UBSAN"))
- then
+ os.getenv("TRAVIS") or os.getenv("APPVEYOR")) then
return
end
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index 2939184d2c..d9c85c03f8 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -169,6 +169,10 @@ local os_name = (function()
end)
end)()
+local function iswin()
+ return os_name() == 'windows'
+end
+
-- Executes a VimL function.
-- Fails on VimL error, but does not update v:errmsg.
local function nvim_call(name, ...)
@@ -502,7 +506,6 @@ end
-- Helper to skip tests. Returns true in Windows systems.
-- pending_fn is pending() from busted
local function pending_win32(pending_fn)
- clear()
if uname() == 'Windows' then
if pending_fn ~= nil then
pending_fn('FIXME: Windows', function() end)
@@ -553,6 +556,7 @@ return function(after_each)
source = source,
rawfeed = rawfeed,
insert = insert,
+ iswin = iswin,
feed = feed,
execute = execute,
eval = nvim_eval,
diff --git a/test/functional/ui/output_spec.lua b/test/functional/ui/output_spec.lua
index d6d8f1c4e5..47b2516188 100644
--- a/test/functional/ui/output_spec.lua
+++ b/test/functional/ui/output_spec.lua
@@ -25,7 +25,7 @@ describe("shell command :!", function()
screen:detach()
end)
- it("displays output even without LF/EOF. #4646 #4569 #3772", function()
+ it("displays output without LF/EOF. #4646 #4569 #3772", function()
-- NOTE: We use a child nvim (within a :term buffer)
-- to avoid triggering a UI flush.
child_session.feed_data(":!printf foo; sleep 200\n")
diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua
index 2581b36711..ef1f0783e7 100644
--- a/test/functional/ui/screen.lua
+++ b/test/functional/ui/screen.lua
@@ -1,31 +1,17 @@
--- This module contains the Screen class, a complete Nvim screen implementation
--- designed for functional testing. The goal is to provide a simple and
--- intuitive API for verifying screen state after a set of actions.
+-- This module contains the Screen class, a complete Nvim UI implementation
+-- designed for functional testing (verifying screen state, in particular).
--
--- The screen class exposes a single assertion method, "Screen:expect". This
--- method takes a string representing the expected screen state and an optional
--- set of attribute identifiers for checking highlighted characters(more on
--- this later).
---
--- The string passed to "expect" will be processed according to these rules:
---
--- - Each line of the string represents and is matched individually against
--- a screen row.
--- - The entire string is stripped of common indentation
--- - Expected screen rows are stripped of the last character. The last
--- character should be used to write pipes(|) that make clear where the
--- screen ends
--- - The last line is stripped, so the string must have (row count + 1)
--- lines.
+-- Screen:expect() takes a string representing the expected screen state and an
+-- optional set of attribute identifiers for checking highlighted characters.
--
-- Example usage:
--
-- local screen = Screen.new(25, 10)
--- -- attach the screen to the current Nvim instance
+-- -- Attach the screen to the current Nvim instance.
-- screen:attach()
--- --enter insert mode and type some text
+-- -- Enter insert-mode and type some text.
-- feed('ihello screen')
--- -- declare an expectation for the eventual screen state
+-- -- Assert the expected screen state.
-- screen:expect([[
-- hello screen |
-- ~ |
@@ -39,31 +25,19 @@
-- -- INSERT -- |
-- ]]) -- <- Last line is stripped
--
--- Since screen updates are received asynchronously, "expect" is actually
--- specifying the eventual screen state. This is how "expect" works: It will
--- start the event loop with a timeout of 5 seconds. Each time it receives an
--- update the expected state will be checked against the updated state.
---
--- If the expected state matches the current state, the event loop will be
--- stopped and "expect" will return. If the timeout expires, the last match
--- error will be reported and the test will fail.
+-- Since screen updates are received asynchronously, expect() actually specifies
+-- the _eventual_ screen state.
--
--- If the second argument is passed to "expect", the screen rows will be
--- transformed before being matched against the string lines. The
--- transformation rule is simple: Each substring "S" composed with characters
--- having the exact same set of attributes will be substituted by "{K:S}",
--- where K is a key associated the attribute set via the second argument of
--- "expect".
--- If a transformation table is present, unexpected attribute sets in the final
--- state is considered an error. To make testing simpler, a list of attribute
--- sets that should be ignored can be passed as a third argument. Alternatively,
--- this third argument can be "true" to indicate that all unexpected attribute
--- sets should be ignored.
+-- This is how expect() works:
+-- * It starts the event loop with a timeout.
+-- * Each time it receives an update it checks that against the expected state.
+-- * If the expected state matches the current state, the event loop will be
+-- stopped and expect() will return.
+-- * If the timeout expires, the last match error will be reported and the
+-- test will fail.
--
--- To illustrate how this works, let's say that in the above example we wanted
--- to assert that the "-- INSERT --" string is highlighted with the bold
--- attribute(which normally is), here's how the call to "expect" should look
--- like:
+-- Continuing the above example, say we want to assert that "-- INSERT --" is
+-- highlighted with the bold attribute. The expect() call should look like this:
--
-- NonText = Screen.colors.Blue
-- screen:expect([[
@@ -81,29 +55,20 @@
--
-- In this case "b" is a string associated with the set composed of one
-- attribute: bold. Note that since the {b:} markup is not a real part of the
--- screen, the delimiter(|) had to be moved right. Also, the highlighting of the
--- NonText markers (~) is ignored in this test.
+-- screen, the delimiter "|" moved to the right. Also, the highlighting of the
+-- NonText markers "~" is ignored in this test.
+--
+-- Tests will often share a group of attribute sets to expect(). Those can be
+-- defined at the beginning of a test:
--
--- Multiple expect:s will likely share a group of attribute sets to test.
--- Therefore these could be specified at the beginning of a test like this:
-- NonText = Screen.colors.Blue
-- screen:set_default_attr_ids( {
-- [1] = {reverse = true, bold = true},
-- [2] = {reverse = true}
-- })
-- screen:set_default_attr_ignore( {{}, {bold=true, foreground=NonText}} )
--- These can be overridden for a specific expect expression, by passing
--- different sets as parameters.
--
--- To help writing screen tests, there is a utility function
--- "screen:snapshot_util()", that can be placed in a test file at any point an
--- "expect(...)" should be. It will wait a short amount of time and then dump
--- the current state of the screen, in the form of an "expect(..)" expression
--- that would match it exactly. "snapshot_util" optionally also take the
--- transformation and ignore set as parameters, like expect, or uses the default
--- set. It will generate a larger attribute transformation set, if needed.
--- To generate a text-only test without highlight checks,
--- use `screen:snapshot_util({},true)`
+-- To help write screen tests, see screen:snapshot_util().
local helpers = require('test.functional.helpers')(nil)
local request, run, uimeths = helpers.request, helpers.run, helpers.uimeths
@@ -205,13 +170,22 @@ end
function Screen:try_resize(columns, rows)
uimeths.try_resize(columns, rows)
+ -- Give ourselves a chance to _handle_resize, which requires using
+ -- self.sleep() (for the resize notification) rather than run()
+ self:sleep(0.1)
end
-- Asserts that `expected` eventually matches the screen state.
--
--- expected: Expected screen state (string).
--- attr_ids: Text attribute definitions.
--- attr_ignore: Ignored text attributes.
+-- expected: Expected screen state (string). Each line represents a screen
+-- row. Last character of each row (typically "|") is stripped.
+-- Common indentation is stripped.
+-- attr_ids: Expected text attributes. Screen rows are transformed according
+-- to this table, as follows: each substring S composed of
+-- characters having the same attributes will be substituted by
+-- "{K:S}", where K is a key in `attr_ids`. Any unexpected
+-- attributes in the final state are an error.
+-- attr_ignore: Ignored text attributes, or `true` to ignore all.
-- condition: Function asserting some arbitrary condition.
-- any: true: Succeed if `expected` matches ANY screen line(s).
-- false (default): `expected` must match screen exactly.
@@ -224,6 +198,11 @@ function Screen:expect(expected, attr_ids, attr_ignore, condition, any)
row = row:sub(1, #row - 1)
table.insert(expected_rows, row)
end
+ if not any then
+ assert(self._height == #expected_rows,
+ "Expected screen state's row count(" .. #expected_rows
+ .. ') differs from configured height(' .. self._height .. ') of Screen.')
+ end
local ids = attr_ids or self._default_attr_ids
local ignore = attr_ignore or self._default_attr_ignore
self:wait(function()
@@ -541,8 +520,10 @@ function Screen:_current_screen()
return table.concat(rv, '\n')
end
+-- Utility to generate/debug tests. Call it where screen:expect() would be.
+-- Waits briefly, then dumps the current screen state in the form of
+-- screen:expect(). Use snapshot_util({},true) to generate a text-only test.
function Screen:snapshot_util(attrs, ignore)
- -- util to generate screen test
self:sleep(250)
self:print_snapshot(attrs, ignore)
end
diff --git a/test/functional/ui/screen_basic_spec.lua b/test/functional/ui/screen_basic_spec.lua
index d03f98c26f..0824585717 100644
--- a/test/functional/ui/screen_basic_spec.lua
+++ b/test/functional/ui/screen_basic_spec.lua
@@ -4,8 +4,7 @@ local spawn, set_session, clear = helpers.spawn, helpers.set_session, helpers.cl
local feed, execute = helpers.feed, helpers.execute
local insert = helpers.insert
local eq = helpers.eq
-
-if helpers.pending_win32(pending) then return end
+local eval = helpers.eval
describe('Initial screen', function()
local screen
@@ -563,11 +562,10 @@ describe('Screen', function()
]])
end)
- -- FIXME this has some race conditions that cause it to fail periodically
- pending('has minimum width/height values', function()
+ it('has minimum width/height values', function()
screen:try_resize(1, 1)
screen:expect([[
- -- INS^ERT --|
+ {2:-- INS^ERT --}|
|
]])
feed('<esc>:ls')
@@ -690,4 +688,12 @@ describe('Screen', function()
end)
end)
end)
+
+ it('nvim_ui_attach() handles very large width/height #2180', function()
+ screen:detach()
+ screen = Screen.new(999, 999)
+ screen:attach()
+ eq(999, eval('&lines'))
+ eq(999, eval('&columns'))
+ end)
end)
diff --git a/test/helpers.lua b/test/helpers.lua
index 0bc62da5d7..def0740f85 100644
--- a/test/helpers.lua
+++ b/test/helpers.lua
@@ -68,6 +68,7 @@ local uname = (function()
local status, f = pcall(io.popen, "uname -s")
if status then
platform = f:read("*l")
+ f:close()
else
platform = 'Windows'
end
generated by cgit (git 2.34.1) at 2025-05-28 12:13:08 +0000