Merge from vscode 52dcb723a39ae75bee1bd56b3312d7fcdc87aeed (#6719)

This commit is contained in:
Anthony Dresser
2019-08-12 21:31:51 -07:00
committed by GitHub
parent 00250839fc
commit 7eba8c4c03
616 changed files with 9472 additions and 7087 deletions

View File

@@ -11,7 +11,7 @@ import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiatio
export class BrowserLifecycleService extends AbstractLifecycleService {
_serviceBrand: ServiceIdentifier<ILifecycleService>;
_serviceBrand!: ServiceIdentifier<ILifecycleService>;
constructor(
@ILogService readonly logService: ILogService
@@ -56,4 +56,4 @@ export class BrowserLifecycleService extends AbstractLifecycleService {
return null;
}
}
}

View File

@@ -13,7 +13,7 @@ import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiatio
export abstract class AbstractLifecycleService extends Disposable implements ILifecycleService {
_serviceBrand: ServiceIdentifier<ILifecycleService>;
_serviceBrand!: ServiceIdentifier<ILifecycleService>;
protected readonly _onBeforeShutdown = this._register(new Emitter<BeforeShutdownEvent>());
readonly onBeforeShutdown: Event<BeforeShutdownEvent> = this._onBeforeShutdown.event;

View File

@@ -18,7 +18,7 @@ export class LifecycleService extends AbstractLifecycleService {
private static readonly LAST_SHUTDOWN_REASON_KEY = 'lifecyle.lastShutdownReason';
_serviceBrand: ServiceIdentifier<ILifecycleService>;
_serviceBrand!: ServiceIdentifier<ILifecycleService>;
private shutdownReason: ShutdownReason;

View File

@@ -131,7 +131,7 @@ export const enum LifecycleMainPhase {
export class LifecycleService extends Disposable implements ILifecycleService {
_serviceBrand: ServiceIdentifier<ILifecycleService>;
_serviceBrand!: ServiceIdentifier<ILifecycleService>;
private static readonly QUIT_FROM_RESTART_MARKER = 'quit.from.restart'; // use a marker to find out if the session was restarted