Merge branch 'main' into fix/compiler-longrunning-open

This commit is contained in:
Barrett Ruth 2026-03-04 00:17:17 -05:00 committed by GitHub
commit 88dc47b643
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -91,14 +91,17 @@ function M.compile(bufnr, name, provider, ctx)
table.concat(reload_cmd, ' ') table.concat(reload_cmd, ' ')
) )
local obj = vim.system( local obj
obj = vim.system(
reload_cmd, reload_cmd,
{ {
cwd = cwd, cwd = cwd,
env = provider.env, env = provider.env,
}, },
vim.schedule_wrap(function(result) vim.schedule_wrap(function(result)
active[bufnr] = nil if active[bufnr] and active[bufnr].obj == obj then
active[bufnr] = nil
end
if not vim.api.nvim_buf_is_valid(bufnr) then if not vim.api.nvim_buf_is_valid(bufnr) then
return return
end end
@ -180,14 +183,17 @@ function M.compile(bufnr, name, provider, ctx)
log.dbg('compiling buffer %d with provider "%s": %s', bufnr, name, table.concat(cmd, ' ')) log.dbg('compiling buffer %d with provider "%s": %s', bufnr, name, table.concat(cmd, ' '))
local obj = vim.system( local obj
obj = vim.system(
cmd, cmd,
{ {
cwd = cwd, cwd = cwd,
env = provider.env, env = provider.env,
}, },
vim.schedule_wrap(function(result) vim.schedule_wrap(function(result)
active[bufnr] = nil if active[bufnr] and active[bufnr].obj == obj then
active[bufnr] = nil
end
if not vim.api.nvim_buf_is_valid(bufnr) then if not vim.api.nvim_buf_is_valid(bufnr) then
return return
end end