From 81559967f27ac5f5494317ffdf1eb05c205705d7 Mon Sep 17 00:00:00 2001 From: Alf Eaton Date: Thu, 16 May 2024 09:31:31 +0100 Subject: [PATCH] Ensure that onTimeoutHandler is called when there are unacknowledged edits (#18340) GitOrigin-RevId: aa6430d7e32f6e27b67f92b187dbb13349fc6a40 --- .../ide-react/connection/editor-watchdog-manager.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/web/frontend/js/features/ide-react/connection/editor-watchdog-manager.ts b/services/web/frontend/js/features/ide-react/connection/editor-watchdog-manager.ts index d6e5a2bd50..f87473aebc 100644 --- a/services/web/frontend/js/features/ide-react/connection/editor-watchdog-manager.ts +++ b/services/web/frontend/js/features/ide-react/connection/editor-watchdog-manager.ts @@ -126,7 +126,9 @@ class Reporter { // Another handler processed the 'meta' entry already if (!this.queue.length) return - const maybeLocalMeta = this.getMetaPreferLocal() + // There is always an item on the queue at this point, + // so getMetaPreferLocal will always return a Meta object + const maybeLocalMeta = this.getMetaPreferLocal() as Meta // Discard other, newly arrived 'meta's this.queue.length = 0 @@ -135,7 +137,7 @@ class Reporter { // Do not flood the server with losing-edits events const reportedRecently = this.lastReport !== null && now - this.lastReport < REPORT_EVERY - if (!reportedRecently && maybeLocalMeta) { + if (!reportedRecently) { this.lastReport = now this.onTimeoutHandler(maybeLocalMeta) }