Refresh master with initial release/0.24 snapshot (#332)

* Initial port of release/0.24 source code

* Fix additional headers

* Fix a typo in launch.json

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

@@ -0,0 +1,13 @@
+/*---------------------------------------------------------------------------------------------
+ *  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/contrib/nodeCachedDataCleaner';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+
+export function createSharedProcessContributions(service: IInstantiationService): void {
+	service.createInstance(NodeCachedDataCleaner);
+}

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

@@ -0,0 +1,88 @@
+/*---------------------------------------------------------------------------------------------
+ *  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';
+
+declare type OnNodeCachedDataArgs = [{ errorCode: string, path: string, detail?: string }, { path: string, length: number }];
+declare const MonacoEnvironment: { onNodeCachedData: OnNodeCachedDataArgs[] };
+
+export class NodeCachedDataCleaner {
+
+	private static _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); }
+		});
+	}
+}

src/vs/code/electron-browser/sharedProcessMain.ts

@@ -35,6 +35,7 @@ import { WindowsChannelClient } from 'vs/platform/windows/common/windowsIpc';
 import { ipcRenderer } from 'electron';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { StorageService, inMemoryLocalStorageInstance } from 'vs/platform/storage/common/storageService';
+import { createSharedProcessContributions } from 'vs/code/electron-browser/contrib/contributions';
 
 interface ISharedProcessInitData {
 	sharedIPCHandle: string;
@@ -98,16 +99,18 @@ function main(server: Server, initData: ISharedProcessInitData): void {
 		server.registerChannel('telemetryAppender', new TelemetryAppenderChannel(appender));
 
 		const services = new ServiceCollection();
-		const { appRoot, extensionsPath, extensionDevelopmentPath, isBuilt, extensionTestsPath } = accessor.get(IEnvironmentService);
+		const environmentService = accessor.get(IEnvironmentService);
+		const { appRoot, extensionsPath, extensionDevelopmentPath, isBuilt, extensionTestsPath, installSource } = environmentService;
 
-		if (isBuilt && !extensionDevelopmentPath && product.enableTelemetry) {
+		if (isBuilt && !extensionDevelopmentPath && !environmentService.args['disable-telemetry'] && product.enableTelemetry) {
 			const disableStorage = !!extensionTestsPath; // never keep any state when running extension tests!
 			const storage = disableStorage ? inMemoryLocalStorageInstance : window.localStorage;
 			const storageService = new StorageService(storage, storage);
 
 			const config: ITelemetryServiceConfig = {
 				appender,
-				commonProperties: resolveCommonProperties(product.commit, pkg.version)
+				commonProperties: resolveCommonProperties(product.commit, pkg.version, installSource)
+					// __GDPR__COMMON__ "common.machineId" : { "classification": "EndUserPseudonymizedInformation", "purpose": "FeatureInsight" }
 					.then(result => Object.defineProperty(result, 'common.machineId', {
 						get: () => storageService.get(machineIdStorageKey),
 						enumerable: true
@@ -132,6 +135,8 @@ function main(server: Server, initData: ISharedProcessInitData): void {
 
 			// clean up deprecated extensions
 			(extensionManagementService as ExtensionManagementService).removeDeprecatedExtensions();
+
+			createSharedProcessContributions(instantiationService2);
 		});
 	});
 }