language-servers/deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-09-26 12:19:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix clearTimer bug (#3143)

Browse source
This commit is contained in:
Ry Dahl 2019-10-19 17:09:24 -04:00 • committed by GitHub
parent c876d1adb4
commit 4ae1838a6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cli/js/timers.ts
View file

@ -44,16 +44,19 @@ function clearGlobalTimeout(): void {
sendSync(dispatch.OP_GLOBAL_TIMER_STOP);
}
let pendingEvents = 0;
async function setGlobalTimeout(due: number, now: number): Promise<void> {
// Since JS and Rust don't use the same clock, pass the time to rust as a
// relative time value. On the Rust side we'll turn that into an absolute
// value again.
const timeout = due - now;
assert(timeout >= 0);
// Send message to the backend.
globalTimeoutDue = due;
pendingEvents++;
await sendAsync(dispatch.OP_GLOBAL_TIMER, { timeout });
pendingEvents--;
// eslint-disable-next-line @typescript-eslint/no-use-before-define
fireTimers();
}
@ -139,7 +142,7 @@ function fire(timer: Timer): void {
function fireTimers(): void {
const now = getTime();
// Bail out if we're not expecting the global timer to fire.
if (globalTimeoutDue === null) {
if (globalTimeoutDue === null || pendingEvents > 0) {
return;
}
// After firing the timers that are due now, this will hold the due time of