Merge from vscode 313ede61cbad8f9dc748907b3384e059ddddb79a (#7436)

* Merge from vscode 313ede61cbad8f9dc748907b3384e059ddddb79a

* fix strict null checks
This commit is contained in:
Anthony Dresser
2019-09-30 23:35:45 -07:00
committed by GitHub
parent 6ab03053a0
commit 084524cd2d
196 changed files with 2927 additions and 2547 deletions

View File

@@ -21,7 +21,6 @@ import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
import { didUseCachedData, ITimerService } from 'vs/workbench/services/timer/electron-browser/timerService';
import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
import { getEntries } from 'vs/base/common/performance';
import { IHostService } from 'vs/workbench/services/host/browser/host';
export class StartupTimings implements IWorkbenchContribution {
@@ -34,8 +33,7 @@ export class StartupTimings implements IWorkbenchContribution {
@ITelemetryService private readonly _telemetryService: ITelemetryService,
@ILifecycleService private readonly _lifecycleService: ILifecycleService,
@IUpdateService private readonly _updateService: IUpdateService,
@IEnvironmentService private readonly _envService: IEnvironmentService,
@IHostService private readonly _hostService: IHostService
@IEnvironmentService private readonly _envService: IEnvironmentService
) {
//
this._report().catch(onUnexpectedError);
@@ -93,7 +91,7 @@ export class StartupTimings implements IWorkbenchContribution {
if (this._lifecycleService.startupKind !== StartupKind.NewWindow) {
return false;
}
if (await this._hostService.windowCount !== 1) {
if (await this._electronService.getWindowCount() !== 1) {
return false;
}
const activeViewlet = this._viewletService.getActiveViewlet();