Merge VS Code 1.21 source code (#1067)

* Initial VS Code 1.21 file copy with patches

* A few more merges

* Post npm install

* Fix batch of build breaks

* Fix more build breaks

* Fix more build errors

* Fix more build breaks

* Runtime fixes 1

* Get connection dialog working with some todos

* Fix a few packaging issues

* Copy several node_modules to package build to fix loader issues

* Fix breaks from master

* A few more fixes

* Make tests pass

* First pass of license header updates

* Second pass of license header updates

* Fix restore dialog issues

* Remove add additional themes menu items

* fix select box issues where the list doesn't show up

* formatting

* Fix editor dispose issue

* Copy over node modules to correct location on all platforms

src/vs/code/electron-browser/sharedProcess/contrib/contributions.ts

@@ -0,0 +1,17 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import { NodeCachedDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/nodeCachedDataCleaner';
+import { LanguagePackCachedDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/languagePackCachedDataCleaner';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
+
+export function createSharedProcessContributions(service: IInstantiationService): IDisposable {
+	return combinedDisposable([
+		service.createInstance(NodeCachedDataCleaner),
+		service.createInstance(LanguagePackCachedDataCleaner)
+	]);
+}

src/vs/code/electron-browser/sharedProcess/contrib/languagePackCachedDataCleaner.ts

@@ -0,0 +1,109 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import * as path from 'path';
+import * as pfs from 'vs/base/node/pfs';
+
+import { IStringDictionary } from 'vs/base/common/collections';
+import product from 'vs/platform/node/product';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { onUnexpectedError } from 'vs/base/common/errors';
+import { ILogService } from 'vs/platform/log/common/log';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+
+interface ExtensionEntry {
+	version: string;
+	extensionIdentifier: {
+		id: string;
+		uuid: string;
+	};
+}
+
+interface LanguagePackEntry {
+	hash: string;
+	extensions: ExtensionEntry[];
+}
+
+interface LanguagePackFile {
+	[locale: string]: LanguagePackEntry;
+}
+
+export class LanguagePackCachedDataCleaner {
+
+	private _disposables: IDisposable[] = [];
+
+	constructor(
+		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
+		@ILogService private readonly _logService: ILogService
+	) {
+		// We have no Language pack support for dev version (run from source)
+		// So only cleanup when we have a build version.
+		if (this._environmentService.isBuilt) {
+			this._manageCachedDataSoon();
+		}
+	}
+
+	dispose(): void {
+		this._disposables = dispose(this._disposables);
+	}
+
+	private _manageCachedDataSoon(): void {
+		let handle = setTimeout(async () => {
+			handle = undefined;
+			this._logService.info('Starting to clean up unused language packs.');
+			const maxAge = product.nameLong.indexOf('Insiders') >= 0
+				? 1000 * 60 * 60 * 24 * 7 // roughly 1 week
+				: 1000 * 60 * 60 * 24 * 30 * 3; // roughly 3 months
+			try {
+				let installed: IStringDictionary<boolean> = Object.create(null);
+				const metaData: LanguagePackFile = JSON.parse(await pfs.readFile(path.join(this._environmentService.userDataPath, 'languagepacks.json'), 'utf8'));
+				for (let locale of Object.keys(metaData)) {
+					let entry = metaData[locale];
+					installed[`${entry.hash}.${locale}`] = true;
+				}
+				// Cleanup entries for language packs that aren't installed anymore
+				const cacheDir = path.join(this._environmentService.userDataPath, 'clp');
+				for (let entry of await pfs.readdir(cacheDir)) {
+					if (installed[entry]) {
+						this._logService.info(`Skipping directory ${entry}. Language pack still in use`);
+						continue;
+					}
+					this._logService.info('Removing unused language pack:', entry);
+					await pfs.rimraf(path.join(cacheDir, entry));
+				}
+
+				const now = Date.now();
+				for (let packEntry of Object.keys(installed)) {
+					const folder = path.join(cacheDir, packEntry);
+					for (let entry of await pfs.readdir(folder)) {
+						if (entry === 'tcf.json') {
+							continue;
+						}
+						const candidate = path.join(folder, entry);
+						const stat = await pfs.stat(candidate);
+						if (stat.isDirectory()) {
+							const diff = now - stat.mtime.getTime();
+							if (diff > maxAge) {
+								this._logService.info('Removing language pack cache entry: ', path.join(packEntry, entry));
+								await pfs.rimraf(candidate);
+							}
+						}
+					}
+				}
+			} catch (error) {
+				onUnexpectedError(error);
+			}
+		}, 40 * 1000);
+
+		this._disposables.push({
+			dispose() {
+				if (handle !== void 0) {
+					clearTimeout(handle);
+				}
+			}
+		});
+	}
+}

src/vs/code/electron-browser/sharedProcess/contrib/nodeCachedDataCleaner.ts

@@ -0,0 +1,85 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { onUnexpectedError } from 'vs/base/common/errors';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { join, basename, dirname } from 'path';
+import { readdir, rimraf, stat } from 'vs/base/node/pfs';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import product from 'vs/platform/node/product';
+
+export class NodeCachedDataCleaner {
+
+	private static readonly _DataMaxAge = product.nameLong.indexOf('Insiders') >= 0
+		? 1000 * 60 * 60 * 24 * 7 // roughly 1 week
+		: 1000 * 60 * 60 * 24 * 30 * 3; // roughly 3 months
+
+	private _disposables: IDisposable[] = [];
+
+	constructor(
+		@IEnvironmentService private readonly _environmentService: IEnvironmentService
+	) {
+		this._manageCachedDataSoon();
+	}
+
+	dispose(): void {
+		this._disposables = dispose(this._disposables);
+	}
+
+	private _manageCachedDataSoon(): void {
+		// Cached data is stored as user data and we run a cleanup task everytime
+		// the editor starts. The strategy is to delete all files that are older than
+		// 3 months (1 week respectively)
+		if (!this._environmentService.nodeCachedDataDir) {
+			return;
+		}
+
+		// The folder which contains folders of cached data. Each of these folder is per
+		// version
+		const nodeCachedDataRootDir = dirname(this._environmentService.nodeCachedDataDir);
+		const nodeCachedDataCurrent = basename(this._environmentService.nodeCachedDataDir);
+
+		let handle = setTimeout(() => {
+			handle = undefined;
+
+			readdir(nodeCachedDataRootDir).then(entries => {
+
+				const now = Date.now();
+				const deletes: TPromise<any>[] = [];
+
+				entries.forEach(entry => {
+					// name check
+					// * not the current cached data folder
+					if (entry !== nodeCachedDataCurrent) {
+
+						const path = join(nodeCachedDataRootDir, entry);
+						deletes.push(stat(path).then(stats => {
+							// stat check
+							// * only directories
+							// * only when old enough
+							if (stats.isDirectory()) {
+								const diff = now - stats.mtime.getTime();
+								if (diff > NodeCachedDataCleaner._DataMaxAge) {
+									return rimraf(path);
+								}
+							}
+							return undefined;
+						}));
+					}
+				});
+
+				return TPromise.join(deletes);
+
+			}).done(undefined, onUnexpectedError);
+
+		}, 30 * 1000);
+
+		this._disposables.push({
+			dispose() { clearTimeout(handle); }
+		});
+	}
+}