mirror of
https://github.com/neovim/neovim.git
synced 2025-09-17 08:48:16 +00:00
fix(exceptions): restore did_throw
(#20000)
`!did_throw` doesn't exactly imply `!current_exception`, as `did_throw = false` is sometimes used to defer exception handling for later (without forgetting the exception). E.g: uncaught exception handling in `do_cmdline()` may be deferred to a different call (e.g: when `try_level > 0`). In #7881, `current_exception = NULL` in `do_cmdline()` is used as an analogue of `did_throw = false`, but also causes the pending exception to be lost, which also leaks as `discard_exception()` wasn't used. It may be possible to fix this by saving/restoring `current_exception`, but handling all of `did_throw`'s edge cases seems messier. Maybe not worth diverging over. This fix also uncovers a `man_spec.lua` bug on Windows: exceptions are thrown due to Windows missing `man`, but they're lost; skip these tests if `man` isn't executable.
This commit is contained in:
@@ -5985,7 +5985,7 @@ void timer_due_cb(TimeWatcher *tw, void *data)
|
||||
// Handle error message
|
||||
if (called_emsg > called_emsg_before && did_emsg) {
|
||||
timer->emsg_count++;
|
||||
if (current_exception != NULL) {
|
||||
if (did_throw) {
|
||||
discard_current_exception();
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user