debt - move more things out of services

Benjamin Pasero · Benjamin Pasero · commit 17b559c2e0a1 · 2019-02-22T18:18:27.000+01:00
diff --git a/src/vs/platform/lifecycle/electron-browser/lifecycleService.ts b/src/vs/platform/lifecycle/electron-browser/lifecycleService.ts
@@ -52,6 +52,8 @@ export class LifecycleService extends Disposable implements ILifecycleService {
 		this._startupKind = this.resolveStartupKind();
 
 		this.registerListeners();
+
+		this._phase = LifecyclePhase.Ready;
 	}
 
 	private resolveStartupKind(): StartupKind {
diff --git a/src/vs/workbench/electron-browser/main.ts b/src/vs/workbench/electron-browser/main.ts
@@ -14,7 +14,7 @@ import { domContentLoaded, addDisposableListener, EventType, scheduleAtNextAnima
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
 import { URI as uri } from 'vs/base/common/uri';
-import { WorkspaceService } from 'vs/workbench/services/configuration/node/configurationService';
+import { WorkspaceService, DefaultConfigurationExportHelper } from 'vs/workbench/services/configuration/node/configurationService';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { stat } from 'vs/base/node/pfs';
@@ -136,6 +136,11 @@ class CodeRendererMain extends Disposable {
 				if (this.configuration.driverHandle) {
 					registerWindowDriver(electronMainClient, this.configuration.windowId, instantiationService).then(disposable => this._register(disposable));
 				}
+
+				// Config Exporter
+				if (this.configuration.args['export-default-configuration']) {
+					instantiationService.createInstance(DefaultConfigurationExportHelper);
+				}
 			});
 		});
 	}
diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts
@@ -142,7 +142,7 @@ import { WorkbenchContextKeysHandler } from 'vs/workbench/browser/contextkeys';
 
 // import@node
 import { BackupFileService, InMemoryBackupFileService } from 'vs/workbench/services/backup/node/backupFileService';
-import { WorkspaceService, DefaultConfigurationExportHelper } from 'vs/workbench/services/configuration/node/configurationService';
+import { WorkspaceService } from 'vs/workbench/services/configuration/node/configurationService';
 import { JSONEditingService } from 'vs/workbench/services/configuration/node/jsonEditingService';
 import { WorkspaceEditingService } from 'vs/workbench/services/workspace/node/workspaceEditingService';
 import { getDelayedChannel } from 'vs/base/parts/ipc/node/ipc';
@@ -524,8 +524,6 @@ export class Workbench extends Disposable implements IPartService {
 
 		// Lifecycle
 		this.lifecycleService = this.instantiationService.createInstance(LifecycleService);
-		this.lifecycleService.phase = LifecyclePhase.Ready; // Set lifecycle phase to `Ready`
-
 		serviceCollection.set(ILifecycleService, this.lifecycleService);
 
 		this._register(this.lifecycleService.onWillShutdown(event => this._onWillShutdown.fire(event)));
@@ -753,8 +751,6 @@ export class Workbench extends Disposable implements IPartService {
 		Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).start(this.instantiationService, this.lifecycleService);
 		Registry.as<IEditorInputFactoryRegistry>(EditorExtensions.EditorInputFactories).setInstantiationService(this.instantiationService);
 
-		this.instantiationService.createInstance(DefaultConfigurationExportHelper);
-
 		this.configurationService.acquireInstantiationService(this.instantiationService);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,8 @@ export class LifecycleService extends Disposable implements ILifecycleService {`
`52`	`52`	`this._startupKind = this.resolveStartupKind();`
`53`	`53`
`54`	`54`	`this.registerListeners();`
	`55`	`+`
	`56`	`+ this._phase = LifecyclePhase.Ready;`
`55`	`57`	`}`
`56`	`58`
`57`	`59`	`private resolveStartupKind(): StartupKind {`