Merge pull request #34113 from Microsoft/roblou/settingsForBing

Make settings for each version of VS Code available for download

build/gulpfile.vscode.js

@@ -7,6 +7,8 @@
 
 const gulp = require('gulp');
 const fs = require('fs');
+const os = require('os');
+const cp = require('child_process');
 const path = require('path');
 const es = require('event-stream');
 const azure = require('gulp-azure-storage');
@@ -443,3 +445,52 @@ gulp.task('upload-vscode-sourcemaps', ['minify-vscode'], () => {
 			prefix: commit + '/'
 		}));
 });
+
+const allConfigDetailsPath = path.join(os.tmpdir(), 'configuration.json');
+gulp.task('upload-vscode-configuration', ['generate-vscode-configuration'], () => {
+	if (!fs.existsSync(allConfigDetailsPath)) {
+		console.error(`configuration file at ${allConfigDetailsPath} does not exist`);
+		return;
+	}
+
+	return gulp.src(allConfigDetailsPath)
+		.pipe(azure.upload({
+			account: process.env.AZURE_STORAGE_ACCOUNT,
+			key: process.env.AZURE_STORAGE_ACCESS_KEY,
+			container: 'configuration',
+			prefix: `${packageJson.version}/${commit}/`
+		}));
+});
+
+gulp.task('generate-vscode-configuration', () => {
+	return new Promise((resolve, reject) => {
+		const buildDir = process.env['AGENT_BUILDDIRECTORY'];
+		if (!buildDir) {
+			return reject(new Error('$AGENT_BUILDDIRECTORY not set'));
+		}
+
+		const appPath = path.join(buildDir, 'VSCode-darwin/Visual\\ Studio\\ Code\\ -\\ Insiders.app/Contents/Resources/app/bin/code');
+		const codeProc = cp.exec(`${appPath} --export-default-configuration='${allConfigDetailsPath}' --wait`);
+
+		const timer = setTimeout(() => {
+			codeProc.kill();
+			reject(new Error('export-default-configuration process timed out'));
+		}, 10 * 1000);
+
+		codeProc.stdout.on('data', d => console.log(d.toString()));
+		codeProc.stderr.on('data', d => console.log(d.toString()));
+
+		codeProc.on('exit', () => {
+			clearTimeout(timer);
+			resolve();
+		});
+
+		codeProc.on('error', err => {
+			clearTimeout(timer);
+			reject(err);
+		});
+	}).catch(e => {
+		// Don't fail the build
+		console.error(e.toString());
+	});
+});

build/tfs/darwin/build.sh

@@ -39,3 +39,6 @@ step "Run integration tests" \
 
 step "Publish release" \
 	./build/tfs/darwin/release.sh
+
+step "Generate and upload configuration.json" \
+	npm run gulp -- upload-vscode-configuration

src/vs/platform/environment/common/environment.ts

@@ -41,6 +41,7 @@ export interface ParsedArgs {
 	'open-url'?: string | string[];
 	'skip-getting-started'?: boolean;
 	'sticky-quickopen'?: boolean;
+	'export-default-configuration'?: string;
 }
 
 export const IEnvironmentService = createDecorator<IEnvironmentService>('environmentService');

src/vs/platform/environment/node/argv.ts

@@ -26,7 +26,8 @@ const options: minimist.Opts = {
 		'debugSearch',
 		'debugBrkSearch',
 		'open-url',
-		'enable-proposed-api'
+		'enable-proposed-api',
+		'export-default-configuration'
 	],
 	boolean: [
 		'help',

src/vs/workbench/electron-browser/workbench.ts

@@ -46,7 +46,7 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag
 import { ContextMenuService } from 'vs/workbench/services/contextview/electron-browser/contextmenuService';
 import { WorkbenchKeybindingService } from 'vs/workbench/services/keybinding/electron-browser/keybindingService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { WorkspaceService } from 'vs/workbench/services/configuration/node/configuration';
+import { WorkspaceService, DefaultConfigurationExportHelper } from 'vs/workbench/services/configuration/node/configuration';
 import { IConfigurationEditingService } from 'vs/workbench/services/configuration/common/configurationEditing';
 import { ConfigurationEditingService } from 'vs/workbench/services/configuration/node/configurationEditingService';
 import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
@@ -622,6 +622,8 @@ export class Workbench implements IPartService {
 		Registry.as<IActionBarRegistry>(ActionBarExtensions.Actionbar).setInstantiationService(this.instantiationService);
 		Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).setInstantiationService(this.instantiationService);
 		Registry.as<IEditorRegistry>(EditorExtensions.Editors).setInstantiationService(this.instantiationService);
+
+		this.instantiationService.createInstance(DefaultConfigurationExportHelper);
 	}
 
 	private initSettings(): void {

src/vs/workbench/services/configuration/node/configuration.ts

@@ -15,7 +15,7 @@ import * as errors from 'vs/base/common/errors';
 import * as collections from 'vs/base/common/collections';
 import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { RunOnceScheduler } from 'vs/base/common/async';
-import { readFile, stat } from 'vs/base/node/pfs';
+import { readFile, stat, writeFile } from 'vs/base/node/pfs';
 import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
 import * as extfs from 'vs/base/node/extfs';
 import { IWorkspaceContextService, IWorkspace, Workspace, WorkbenchState, WorkspaceFolder, toWorkspaceFolders } from 'vs/platform/workspace/common/workspace';
@@ -36,6 +36,10 @@ import { createHash } from 'crypto';
 import { getWorkspaceLabel, IWorkspacesService, IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { IWindowConfiguration } from 'vs/platform/windows/common/windows';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
+import { IExtensionService } from 'vs/platform/extensions/common/extensions';
+import { ICommandService } from 'vs/platform/commands/common/commands';
+import product from 'vs/platform/node/product';
+import pkg from 'vs/platform/node/package';
 
 interface IStat {
 	resource: URI;
@@ -870,3 +874,88 @@ export class Configuration<T> extends BaseConfiguration<T> {
 		return true;
 	}
 }
+
+interface IExportedConfigurationNode {
+	name: string;
+	description: string;
+	default: any;
+	type: string | string[];
+	enum?: any[];
+	enumDescriptions?: string[];
+}
+
+interface IConfigurationExport {
+	settings: IExportedConfigurationNode[];
+	buildTime: number;
+	commit: string;
+	version: string;
+}
+
+export class DefaultConfigurationExportHelper {
+
+	constructor(
+		@IEnvironmentService environmentService: IEnvironmentService,
+		@IExtensionService private extensionService: IExtensionService,
+		@ICommandService private commandService: ICommandService) {
+		if (environmentService.args['export-default-configuration']) {
+			this.writeConfigModelAndQuit(environmentService.args['export-default-configuration']);
+		}
+	}
+
+	private writeConfigModelAndQuit(targetPath: string): TPromise<void> {
+		return this.extensionService.onReady()
+			.then(() => this.writeConfigModel(targetPath))
+			.then(() => this.commandService.executeCommand('workbench.action.quit'))
+			.then(() => { });
+	}
+
+	private writeConfigModel(targetPath: string): TPromise<void> {
+		const config = this.getConfigModel();
+
+		const resultString = JSON.stringify(config, undefined, '  ');
+		return writeFile(targetPath, resultString);
+	}
+
+	private getConfigModel(): IConfigurationExport {
+		const configurations = Registry.as<IConfigurationRegistry>(Extensions.Configuration).getConfigurations().slice();
+		const settings: IExportedConfigurationNode[] = [];
+		const processConfig = (config: IConfigurationNode) => {
+			if (config.properties) {
+				for (let name in config.properties) {
+					const prop = config.properties[name];
+					const propDetails: IExportedConfigurationNode = {
+						name,
+						description: prop.description,
+						default: prop.default,
+						type: prop.type
+					};
+
+					if (prop.enum) {
+						propDetails.enum = prop.enum;
+					}
+
+					if (prop.enumDescriptions) {
+						propDetails.enumDescriptions = prop.enumDescriptions;
+					}
+
+					settings.push(propDetails);
+				}
+			}
+
+			if (config.allOf) {
+				config.allOf.forEach(processConfig);
+			}
+		};
+
+		configurations.forEach(processConfig);
+
+		const result: IConfigurationExport = {
+			settings: settings.sort((a, b) => a.name.localeCompare(b.name)),
+			buildTime: Date.now(),
+			commit: product.commit,
+			version: pkg.version
+		};
+
+		return result;
+	}
+}