From 31e7dc172297d0ff5e730d8ea48a2bf5a0a99ee4 Mon Sep 17 00:00:00 2001 From: isidor Date: Thu, 7 Mar 2019 23:15:49 +0100 Subject: [PATCH] strict null checks: debugToolbar --- src/tsconfig.strictNullChecks.json | 1 + src/vs/workbench/contrib/debug/browser/debugToolbar.ts | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/tsconfig.strictNullChecks.json b/src/tsconfig.strictNullChecks.json index 22bf5e076e9..6b597a79d6b 100644 --- a/src/tsconfig.strictNullChecks.json +++ b/src/tsconfig.strictNullChecks.json @@ -245,6 +245,7 @@ "./vs/workbench/contrib/debug/browser/debugEditorActions.ts", "./vs/workbench/contrib/debug/browser/debugEditorModelManager.ts", "./vs/workbench/contrib/debug/browser/debugQuickOpen.ts", + "./vs/workbench/contrib/debug/browser/debugToolbar.ts", "./vs/workbench/contrib/debug/browser/debugStatus.ts", "./vs/workbench/contrib/debug/browser/exceptionWidget.ts", "./vs/workbench/contrib/debug/browser/linkDetector.ts", diff --git a/src/vs/workbench/contrib/debug/browser/debugToolbar.ts b/src/vs/workbench/contrib/debug/browser/debugToolbar.ts index b7030eeaf4f..12911060ada 100644 --- a/src/vs/workbench/contrib/debug/browser/debugToolbar.ts +++ b/src/vs/workbench/contrib/debug/browser/debugToolbar.ts @@ -184,8 +184,11 @@ export class DebugToolbar extends Themable implements IWorkbenchContribution { } private storePosition(): void { - const position = parseFloat(dom.getComputedStyle(this.$el).left) / window.innerWidth; - this.storageService.store(DEBUG_TOOLBAR_POSITION_KEY, position, StorageScope.GLOBAL); + const left = dom.getComputedStyle(this.$el).left; + if (left) { + const position = parseFloat(left) / window.innerWidth; + this.storageService.store(DEBUG_TOOLBAR_POSITION_KEY, position, StorageScope.GLOBAL); + } } protected updateStyles(): void { @@ -304,7 +307,7 @@ export class DebugToolbar extends Themable implements IWorkbenchContribution { } return true; - }).sort((first, second) => first.weight - second.weight); + }).sort((first, second) => (first.weight || 0) - (second.weight || 0)); fillInActionBarActions(menu, undefined, actions, () => false); if (debugService.getViewModel().isMultiSessionView()) { -- GitLab