sandbox - lift configuration export helper to electron-sandbox

src/vs/workbench/contrib/configExporter/electron-browser/configurationExportHelper.contribution.ts → src/vs/workbench/contrib/configExporter/electron-sandbox/configurationExportHelper.contribution.ts

@@ -9,7 +9,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
-import { DefaultConfigurationExportHelper } from 'vs/workbench/contrib/configExporter/electron-browser/configurationExportHelper';
+import { DefaultConfigurationExportHelper } from 'vs/workbench/contrib/configExporter/electron-sandbox/configurationExportHelper';
 
 export class ExtensionPoints implements IWorkbenchContribution {
 

src/vs/workbench/contrib/configExporter/electron-browser/configurationExportHelper.ts → src/vs/workbench/contrib/configExporter/electron-sandbox/configurationExportHelper.ts

@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { writeFile } from 'vs/base/node/pfs';
 import product from 'vs/platform/product/common/product';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
@@ -11,6 +10,9 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { IConfigurationNode, IConfigurationRegistry, Extensions, IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { ICommandService } from 'vs/platform/commands/common/commands';
+import { IFileService } from 'vs/platform/files/common/files';
+import { VSBuffer } from 'vs/base/common/buffer';
+import { URI } from 'vs/base/common/uri';
 
 interface IExportedConfigurationNode {
 	name: string;
@@ -33,24 +35,29 @@ export class DefaultConfigurationExportHelper {
 	constructor(
 		@IWorkbenchEnvironmentService environmentService: INativeWorkbenchEnvironmentService,
 		@IExtensionService private readonly extensionService: IExtensionService,
-		@ICommandService private readonly commandService: ICommandService) {
-		if (environmentService.args['export-default-configuration']) {
-			this.writeConfigModelAndQuit(environmentService.args['export-default-configuration']);
+		@ICommandService private readonly commandService: ICommandService,
+		@IFileService private readonly fileService: IFileService
+	) {
+		const exportDefaultConfigurationPath = environmentService.args['export-default-configuration'];
+		if (exportDefaultConfigurationPath) {
+			this.writeConfigModelAndQuit(URI.file(exportDefaultConfigurationPath));
 		}
 	}
 
-	private writeConfigModelAndQuit(targetPath: string): Promise<void> {
-		return Promise.resolve(this.extensionService.whenInstalledExtensionsRegistered())
-			.then(() => this.writeConfigModel(targetPath))
-			.finally(() => this.commandService.executeCommand('workbench.action.quit'))
-			.then(() => { });
+	private async writeConfigModelAndQuit(target: URI): Promise<void> {
+		try {
+			await this.extensionService.whenInstalledExtensionsRegistered();
+			await this.writeConfigModel(target);
+		} finally {
+			this.commandService.executeCommand('workbench.action.quit');
+		}
 	}
 
-	private writeConfigModel(targetPath: string): Promise<void> {
+	private async writeConfigModel(target: URI): Promise<void> {
 		const config = this.getConfigModel();
 
 		const resultString = JSON.stringify(config, undefined, '  ');
-		return writeFile(targetPath, resultString);
+		await this.fileService.writeFile(target, VSBuffer.fromString(resultString));
 	}
 
 	private getConfigModel(): IConfigurationExport {

src/vs/workbench/workbench.desktop.main.ts

@@ -117,7 +117,4 @@ import 'vs/workbench/contrib/tasks/electron-browser/taskService';
 // User Data Sync
 import 'vs/workbench/contrib/userDataSync/electron-browser/userDataSync.contribution';
 
-// Configuration Exporter
-import 'vs/workbench/contrib/configExporter/electron-browser/configurationExportHelper.contribution';
-
 //#endregion

src/vs/workbench/workbench.sandbox.main.ts

@@ -77,4 +77,7 @@ import 'vs/workbench/contrib/issue/electron-sandbox/issue.contribution';
 // Remote
 import 'vs/workbench/contrib/remote/electron-sandbox/remote.contribution';
 
+// Configuration Exporter
+import 'vs/workbench/contrib/configExporter/electron-sandbox/configurationExportHelper.contribution';
+
 //#endregion