introduce and use LifecyclePhase.RunningForABit (for microsoft#38080)

Benjamin Pasero · Benjamin Pasero · commit fa592ef424a3 · 2017-11-13T19:51:50.000+01:00
diff --git a/src/vs/platform/lifecycle/common/lifecycle.ts b/src/vs/platform/lifecycle/common/lifecycle.ts
@@ -49,7 +49,8 @@ export enum LifecyclePhase {
 	Starting = 1,
 	Restoring = 2,
 	Running = 3,
-	ShuttingDown = 4
+	RunningForABit = 4,
+	ShuttingDown = 5
 }
 
 /**
diff --git a/src/vs/workbench/common/contributions.ts b/src/vs/workbench/common/contributions.ts
@@ -72,7 +72,7 @@ export class WorkbenchContributionsRegistry implements IWorkbenchContributionsRe
 		this.instantiationService = instantiationService;
 		this.lifecycleService = lifecycleService;
 
-		[LifecyclePhase.Starting, LifecyclePhase.Restoring, LifecyclePhase.Running, LifecyclePhase.ShuttingDown].forEach(phase => {
+		[LifecyclePhase.Starting, LifecyclePhase.Restoring, LifecyclePhase.Running, LifecyclePhase.RunningForABit, LifecyclePhase.ShuttingDown].forEach(phase => {
 			this.instantiateByPhase(instantiationService, lifecycleService, phase);
 		});
 	}
diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts
@@ -191,7 +191,32 @@ export class WorkbenchShell {
 
 	private onWorkbenchStarted(info: IWorkbenchStartedInfo, instantiationService: IInstantiationService): void {
 
-		// Telemetry: workspace info
+		// Startup Telemetry
+		this.logStartupTelemetry(info);
+
+		// Root Warning
+		if ((platform.isLinux || platform.isMacintosh) && process.getuid() === 0) {
+			this.messageService.show(Severity.Warning, nls.localize('runningAsRoot', "It is recommended not to run Code as 'root'."));
+		}
+
+		// Set lifecycle phase to `Runnning` so that other contributions can now do something
+		this.lifecycleService.phase = LifecyclePhase.Running;
+
+		// Set lifecycle phase to `Runnning For A Bit` after a short delay
+		let timeoutHandle = setTimeout(() => {
+			timeoutHandle = void 0;
+			this.lifecycleService.phase = LifecyclePhase.RunningForABit;
+		}, 3000);
+		this.toUnbind.push({
+			dispose: () => {
+				if (timeoutHandle) {
+					clearTimeout(timeoutHandle);
+				}
+			}
+		});
+	}
+
+	private logStartupTelemetry(info: IWorkbenchStartedInfo): void {
 		const { filesToOpen, filesToCreate, filesToDiff } = this.configuration;
 		/* __GDPR__
 			"workspaceLoad" : {
@@ -246,14 +271,6 @@ export class WorkbenchShell {
 			*/
 			this.telemetryService.publicLog('startupTime', this.timerService.startupMetrics);
 		});
-
-		// Root Warning
-		if ((platform.isLinux || platform.isMacintosh) && process.getuid() === 0) {
-			this.messageService.show(Severity.Warning, nls.localize('runningAsRoot', "It is recommended not to run Code as 'root'."));
-		}
-
-		// Set lifecycle phase to `Runnning` so that other contributions can now do something
-		this.lifecycleService.phase = LifecyclePhase.Running;
 	}
 
 	private initServiceCollection(container: HTMLElement): [IInstantiationService, ServiceCollection] {
diff --git a/src/vs/workbench/parts/stats/node/stats.contribution.ts b/src/vs/workbench/parts/stats/node/stats.contribution.ts
@@ -11,4 +11,4 @@ import { WorkspaceStats } from 'vs/workbench/parts/stats/node/workspaceStats';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 
 // Register Workspace Stats Contribution
-Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(WorkspaceStats, LifecyclePhase.Running);
+Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(WorkspaceStats, LifecyclePhase.RunningForABit);

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,8 @@ export enum LifecyclePhase {`
`49`	`49`	`Starting = 1,`
`50`	`50`	`Restoring = 2,`
`51`	`51`	`Running = 3,`
`52`		`- ShuttingDown = 4`
	`52`	`+ RunningForABit = 4,`
	`53`	`+ ShuttingDown = 5`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ export class WorkbenchContributionsRegistry implements IWorkbenchContributionsRe`
`72`	`72`	`this.instantiationService = instantiationService;`
`73`	`73`	`this.lifecycleService = lifecycleService;`
`74`	`74`
`75`		`- [LifecyclePhase.Starting, LifecyclePhase.Restoring, LifecyclePhase.Running, LifecyclePhase.ShuttingDown].forEach(phase => {`
	`75`	`+ [LifecyclePhase.Starting, LifecyclePhase.Restoring, LifecyclePhase.Running, LifecyclePhase.RunningForABit, LifecyclePhase.ShuttingDown].forEach(phase => {`
`76`	`76`	`this.instantiateByPhase(instantiationService, lifecycleService, phase);`
`77`	`77`	`});`
`78`	`78`	`}`