mirror of
https://github.com/neovim/neovim.git
synced 2026-03-31 04:42:03 +00:00
fix(lua): don't leak timer when vim._watch.watch() fails (#35768)
This fixes the following warning in tests with ASAN or TSAN:
-------- Running tests from test/functional/lua/watch_spec.lua
RUN T4253 vim._watch watch() ignores nonexistent paths: 29.00 ms OK
nvim took 2006 milliseconds to exit after last test
This indicates a likely problem with the test even if it passed!
This commit is contained in:
@@ -102,6 +102,7 @@ function M.watch(path, opts, callback)
|
||||
-- This is mostly a placeholder until we have `nvim_log` API.
|
||||
vim.notify_once(('watch.watch: %s'):format(start_err), vim.log.levels.INFO)
|
||||
end
|
||||
handle:close()
|
||||
-- TODO(justinmk): log important errors once we have `nvim_log` API.
|
||||
return function() end
|
||||
end
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
// forkpty is not in POSIX, so headers are platform-specific
|
||||
#if defined(__FreeBSD__) || defined(__DragonFly__)
|
||||
# include <libutil.h>
|
||||
// TODO(bfredl): this is avaliable on darwin, but there is an issue with cross-compile headers
|
||||
// TODO(bfredl): this is available on darwin, but there is an issue with cross-compile headers
|
||||
#elif defined(__APPLE__) && !defined(HAVE_FORKPTY)
|
||||
int forkpty(int *, char *, const struct termios *, const struct winsize *);
|
||||
#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__)
|
||||
|
||||
@@ -3539,7 +3539,7 @@ describe('extmark decorations', function()
|
||||
]])
|
||||
end)
|
||||
|
||||
it('redraws extmark that starts and ends outisde the screen', function()
|
||||
it('redraws extmark that starts and ends outside the screen', function()
|
||||
local lines = vim.split(('1'):rep(20), '', { plain = true })
|
||||
api.nvim_buf_set_lines(0, 0, -1, true, lines)
|
||||
api.nvim_buf_set_extmark(0, ns, 0, 0, { hl_group = 'ErrorMsg', end_row = 19, end_col = 0 })
|
||||
|
||||
Reference in New Issue
Block a user