From 93ca025f0fa94afe7fa2c60918aa3183bb1967a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Z=C3=BCnd?= Date: Thu, 22 Apr 2021 10:37:07 +0200 Subject: [PATCH] [ts] Fix errors detected by TypeScript 4.3-beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit R=jacktfranklin@chromium.org, tvanderlippe@chromium.org Bug: 1196203 Change-Id: Id04b636db9105d5e84320579b3a6caf426e4c828 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2846326 Reviewed-by: Tim van der Lippe Reviewed-by: Jack Franklin Commit-Queue: Simon Zünd --- front_end/entrypoints/toolbox/toolbox.ts | 1 + front_end/panels/elements/DOMLinkifier.ts | 5 ++++- front_end/panels/layer_viewer/Layers3DView.ts | 2 +- .../linear_memory_inspector/ValueInterpreterDisplayUtils.ts | 2 +- front_end/ui/legacy/ShortcutRegistry.ts | 2 +- .../legacy/components/object_ui/ObjectPropertiesSection.ts | 5 ++++- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/front_end/entrypoints/toolbox/toolbox.ts b/front_end/entrypoints/toolbox/toolbox.ts index ede1887f50..126ce47012 100644 --- a/front_end/entrypoints/toolbox/toolbox.ts +++ b/front_end/entrypoints/toolbox/toolbox.ts @@ -11,6 +11,7 @@ function toolboxLoaded(): void { if (!window.opener) { return; } + // @ts-ignore TypeScript doesn't know about `Emulation` on `Window`. const app = window.opener.Emulation.AdvancedApp._instance(); app.toolboxLoaded(document); } diff --git a/front_end/panels/elements/DOMLinkifier.ts b/front_end/panels/elements/DOMLinkifier.ts index 5662e4eaa9..5ddf8257cb 100644 --- a/front_end/panels/elements/DOMLinkifier.ts +++ b/front_end/panels/elements/DOMLinkifier.ts @@ -88,7 +88,10 @@ export const linkifyNodeReference = function( decorateNodeLabel(node, link, options.tooltip); - link.addEventListener('click', () => Common.Revealer.reveal(node, false) && false, false); + link.addEventListener('click', () => { + Common.Revealer.reveal(node, false); + return false; + }, false); link.addEventListener('mouseover', node.highlight.bind(node, undefined), false); link.addEventListener('mouseleave', () => SDK.OverlayModel.OverlayModel.hideDOMNodeHighlight(), false); diff --git a/front_end/panels/layer_viewer/Layers3DView.ts b/front_end/panels/layer_viewer/Layers3DView.ts index 2adc22348b..329812a4e9 100644 --- a/front_end/panels/layer_viewer/Layers3DView.ts +++ b/front_end/panels/layer_viewer/Layers3DView.ts @@ -233,7 +233,7 @@ export class Layers3DView extends UI.Widget.VBox implements LayerView { } if (selection.layer()) { const promise = selection.layer().snapshots()[0]; - if (promise) { + if (promise !== undefined) { return promise; } } diff --git a/front_end/ui/components/linear_memory_inspector/ValueInterpreterDisplayUtils.ts b/front_end/ui/components/linear_memory_inspector/ValueInterpreterDisplayUtils.ts index 2091bdab39..ab91e735ce 100644 --- a/front_end/ui/components/linear_memory_inspector/ValueInterpreterDisplayUtils.ts +++ b/front_end/ui/components/linear_memory_inspector/ValueInterpreterDisplayUtils.ts @@ -185,7 +185,7 @@ export function isNumber(type: ValueType): boolean { } } -export function getPointerAddress(type: ValueType, buffer: ArrayBuffer, endianness: Endianness): number|BigInt { +export function getPointerAddress(type: ValueType, buffer: ArrayBuffer, endianness: Endianness): number|bigint { if (!isPointer(type)) { console.error(`Requesting address of a non-pointer type: ${type}.\n`); return NaN; diff --git a/front_end/ui/legacy/ShortcutRegistry.ts b/front_end/ui/legacy/ShortcutRegistry.ts index 547c5104a8..5e4d08c34a 100644 --- a/front_end/ui/legacy/ShortcutRegistry.ts +++ b/front_end/ui/legacy/ShortcutRegistry.ts @@ -191,7 +191,7 @@ export class ShortcutRegistry { if (this._activePrefixTimeout) { clearTimeout(this._activePrefixTimeout); - const handled = maybeExecuteActionForKey.call(this); + const handled = await maybeExecuteActionForKey.call(this); this._activePrefixKey = null; this._activePrefixTimeout = null; if (handled) { diff --git a/front_end/ui/legacy/components/object_ui/ObjectPropertiesSection.ts b/front_end/ui/legacy/components/object_ui/ObjectPropertiesSection.ts index e21e235bd1..2315ac2fed 100644 --- a/front_end/ui/legacy/components/object_ui/ObjectPropertiesSection.ts +++ b/front_end/ui/legacy/components/object_ui/ObjectPropertiesSection.ts @@ -488,7 +488,10 @@ export class ObjectPropertiesSection extends UI.TreeOutline.TreeOutlineInShadow function didGetDetails(response: SDK.DebuggerModel.FunctionDetails|null): void { if (linkify && response && response.location) { element.classList.add('linkified'); - element.addEventListener('click', () => Common.Revealer.reveal(response.location) && false); + element.addEventListener('click', () => { + Common.Revealer.reveal(response.location); + return false; + }); } // The includePreview flag is false for formats such as console.dir().