Merge VS Code 1.31.1 (#4283)

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

@@ -8,11 +8,13 @@ import { LanguagePackCachedDataCleaner } from 'vs/code/electron-browser/sharedPr
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
 import { StorageDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/storageDataCleaner';
+import { LogsDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/logsDataCleaner';
 
 export function createSharedProcessContributions(service: IInstantiationService): IDisposable {
 	return combinedDisposable([
 		service.createInstance(NodeCachedDataCleaner),
 		service.createInstance(LanguagePackCachedDataCleaner),
-		service.createInstance(StorageDataCleaner)
+		service.createInstance(StorageDataCleaner),
+		service.createInstance(LogsDataCleaner)
 	]);
 }

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

@@ -103,7 +103,7 @@ export class LanguagePackCachedDataCleaner {
 
 		this._disposables.push({
 			dispose() {
-				if (handle !== void 0) {
+				if (handle !== undefined) {
 					clearTimeout(handle);
 				}
 			}

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

@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { join, dirname, basename } from 'path';
+import { readdir, rimraf } from 'vs/base/node/pfs';
+import { onUnexpectedError } from 'vs/base/common/errors';
+import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
+
+export class LogsDataCleaner extends Disposable {
+
+	constructor(
+		@IEnvironmentService private readonly environmentService: IEnvironmentService
+	) {
+		super();
+
+		this.cleanUpOldLogsSoon();
+	}
+
+	private cleanUpOldLogsSoon(): void {
+		let handle: any = setTimeout(() => {
+			handle = undefined;
+
+			const currentLog = basename(this.environmentService.logsPath);
+			const logsRoot = dirname(this.environmentService.logsPath);
+
+			readdir(logsRoot).then(children => {
+				const allSessions = children.filter(name => /^\d{8}T\d{6}$/.test(name));
+				const oldSessions = allSessions.sort().filter((d, i) => d !== currentLog);
+				const toDelete = oldSessions.slice(0, Math.max(0, oldSessions.length - 9));
+
+				return Promise.all(toDelete.map(name => rimraf(join(logsRoot, name))));
+			}).then(null, onUnexpectedError);
+		}, 10 * 1000);
+
+		this._register(toDisposable(() => clearTimeout(handle)));
+	}
+}

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

@@ -47,7 +47,7 @@ export class NodeCachedDataCleaner {
 			readdir(nodeCachedDataRootDir).then(entries => {
 
 				const now = Date.now();
-				const deletes: Thenable<any>[] = [];
+				const deletes: Promise<any>[] = [];
 
 				entries.forEach(entry => {
 					// name check

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

@@ -16,7 +16,7 @@ export class StorageDataCleaner extends Disposable {
 	private static NON_EMPTY_WORKSPACE_ID_LENGTH = 128 / 4;
 
 	constructor(
-		@IEnvironmentService private environmentService: IEnvironmentService
+		@IEnvironmentService private readonly environmentService: IEnvironmentService
 	) {
 		super();
 
@@ -25,7 +25,7 @@ export class StorageDataCleaner extends Disposable {
 
 	private cleanUpStorageSoon(): void {
 		let handle: any = setTimeout(() => {
-			handle = void 0;
+			handle = undefined;
 
 			// Leverage the backup workspace file to find out which empty workspace is currently in use to
 			// determine which empty workspace storage can safely be deleted

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

@@ -43,7 +43,6 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { DownloadService } from 'vs/platform/download/node/downloadService';
 import { IDownloadService } from 'vs/platform/download/common/download';
 import { StaticRouter } from 'vs/base/parts/ipc/node/ipc';
-import { DefaultURITransformer } from 'vs/base/common/uriIpc';
 
 export interface ISharedProcessConfiguration {
 	readonly machineId: string;
@@ -124,7 +123,7 @@ function main(server: Server, initData: ISharedProcessInitData, configuration: I
 		}
 		server.registerChannel('telemetryAppender', new TelemetryAppenderChannel(appInsightsAppender));
 
-		services.set(IExtensionManagementService, new SyncDescriptor(ExtensionManagementService));
+		services.set(IExtensionManagementService, new SyncDescriptor(ExtensionManagementService, [false]));
 		services.set(IExtensionGalleryService, new SyncDescriptor(ExtensionGalleryService));
 		services.set(ILocalizationsService, new SyncDescriptor(LocalizationsService));
 
@@ -133,7 +132,7 @@ function main(server: Server, initData: ISharedProcessInitData, configuration: I
 		instantiationService2.invokeFunction(accessor => {
 
 			const extensionManagementService = accessor.get(IExtensionManagementService);
-			const channel = new ExtensionManagementChannel(extensionManagementService, () => DefaultURITransformer);
+			const channel = new ExtensionManagementChannel(extensionManagementService, () => null);
 			server.registerChannel('extensions', channel);
 
 			// clean up deprecated extensions
@@ -149,8 +148,8 @@ function main(server: Server, initData: ISharedProcessInitData, configuration: I
 	});
 }
 
-function setupIPC(hook: string): Thenable<Server> {
-	function setup(retry: boolean): Thenable<Server> {
+function setupIPC(hook: string): Promise<Server> {
+	function setup(retry: boolean): Promise<Server> {
 		return serve(hook).then(null, err => {
 			if (!retry || platform.isWindows || err.code !== 'EADDRINUSE') {
 				return Promise.reject(err);