Merge remote-tracking branch 'origin/master' into tyriar/virtual_process

extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts

@@ -126,26 +126,28 @@ suite('window namespace tests', () => {
 			terminal1.show();
 		});
 
-		test('hideFromUser terminal: onDidWriteData should work', done => {
-			const terminal = window.createTerminal({ name: 'bg', hideFromUser: true });
-			let data = '';
-			terminal.onDidWriteData(e => {
-				data += e;
-				if (data.indexOf('foo') !== -1) {
-					terminal.dispose();
-					done();
-				}
+		suite('hideFromUser', () => {
+			test('should fire onDidWriteData correctly', done => {
+				const terminal = window.createTerminal({ name: 'bg', hideFromUser: true });
+				let data = '';
+				terminal.onDidWriteData(e => {
+					data += e;
+					if (data.indexOf('foo') !== -1) {
+						terminal.dispose();
+						done();
+					}
+				});
+				terminal.sendText('foo');
 			});
-			terminal.sendText('foo');
-		});
 
-		test('hideFromUser terminal: should be available to terminals API', done => {
-			const terminal = window.createTerminal({ name: 'bg', hideFromUser: true });
-			window.onDidOpenTerminal(t => {
-				equal(t, terminal);
-				equal(t.name, 'bg');
-				ok(window.terminals.indexOf(terminal) !== -1);
-				done();
+			test('should be available to terminals API', done => {
+				const terminal = window.createTerminal({ name: 'bg', hideFromUser: true });
+				window.onDidOpenTerminal(t => {
+					equal(t, terminal);
+					equal(t.name, 'bg');
+					ok(window.terminals.indexOf(terminal) !== -1);
+					done();
+				});
 			});
 		});
 

package.json

@@ -49,7 +49,7 @@
     "v8-inspect-profiler": "^0.0.20",
     "vscode-chokidar": "1.6.5",
     "vscode-proxy-agent": "0.4.0",
-    "vscode-ripgrep": "^1.2.5",
+    "vscode-ripgrep": "^1.3.1",
     "vscode-sqlite3": "4.0.7",
     "vscode-textmate": "^4.1.1",
     "xterm": "3.15.0-beta50",

src/vs/base/common/collections.ts

@@ -46,9 +46,9 @@ export function size<T>(from: IStringDictionary<T> | INumberDictionary<T>): numb
 }
 
 export function first<T>(from: IStringDictionary<T> | INumberDictionary<T>): T | undefined {
-	for (let key in from) {
+	for (const key in from) {
 		if (hasOwnProperty.call(from, key)) {
-			return from[key];
+			return (from as any)[key];
 		}
 	}
 	return undefined;

src/vs/base/common/parsers.ts

@@ -3,8 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as Types from 'vs/base/common/types';
-
 export const enum ValidationState {
 	OK = 0,
 	Info = 1,
@@ -78,25 +76,4 @@ export abstract class Parser {
 	public fatal(message: string): void {
 		this._problemReporter.fatal(message);
 	}
-
-	protected static merge<T extends object>(destination: T, source: T, overwrite: boolean): void {
-		Object.keys(source).forEach((key: string) => {
-			const destValue = destination[key];
-			const sourceValue = source[key];
-			if (Types.isUndefined(sourceValue)) {
-				return;
-			}
-			if (Types.isUndefined(destValue)) {
-				destination[key] = sourceValue;
-			} else {
-				if (overwrite) {
-					if (Types.isObject(destValue) && Types.isObject(sourceValue)) {
-						this.merge(destValue, sourceValue, overwrite);
-					} else {
-						destination[key] = sourceValue;
-					}
-				}
-			}
-		});
-	}
 }
\ No newline at end of file

src/vs/base/common/path.ts

@@ -212,7 +212,7 @@ export const win32: IPath = {
 				// absolute path, get cwd for that drive, or the process cwd if
 				// the drive cwd is not available. We're sure the device is not
 				// a UNC path at this points, because UNC paths are always absolute.
-				path = process.env['=' + resolvedDevice] || process.cwd();
+				path = (process.env as any)['=' + resolvedDevice] || process.cwd();
 
 				// Verify that a cwd was found and that it actually points
 				// to our drive. If not, default to the drive's root.

src/vs/base/node/encoding.ts

@@ -395,7 +395,7 @@ export async function resolveTerminalEncoding(verbose?: boolean): Promise<string
 
 			exec('chcp', (err, stdout, stderr) => {
 				if (stdout) {
-					const windowsTerminalEncodingKeys = Object.keys(windowsTerminalEncodings);
+					const windowsTerminalEncodingKeys = Object.keys(windowsTerminalEncodings) as Array<keyof typeof windowsTerminalEncodings>;
 					for (const key of windowsTerminalEncodingKeys) {
 						if (stdout.indexOf(key) >= 0) {
 							return resolve(windowsTerminalEncodings[key]);

src/vs/base/test/browser/ui/grid/gridview.test.ts

@@ -59,8 +59,8 @@ suite('Gridview', function () {
 		];
 
 		gridview.addView(views[0] as IView, 200, [0]);
-		gridview.addView(views[1][0] as IView, 200, [1]);
-		gridview.addView(views[1][1] as IView, 200, [1, 1]);
+		gridview.addView((views[1] as TestView[])[0] as IView, 200, [1]);
+		gridview.addView((views[1] as TestView[])[1] as IView, 200, [1, 1]);
 
 		assert.deepEqual(nodesToArrays(gridview.getViews()), views);
 

src/vs/base/test/common/decorators.test.ts

@@ -119,7 +119,7 @@ suite('Decorators', () => {
 		assert.equal(foo.answer, 42);
 
 		try {
-			foo['$memoize$answer'] = 1337;
+			(foo as any)['$memoize$answer'] = 1337;
 			assert(false);
 		} catch (e) {
 			assert.equal(foo.answer, 42);

src/vs/code/electron-browser/processExplorer/processExplorerMain.ts

@@ -16,7 +16,7 @@ import { IContextMenuItem } from 'vs/base/parts/contextmenu/common/contextmenu';
 import { popup } from 'vs/base/parts/contextmenu/electron-browser/contextmenu';
 import { ProcessItem } from 'vs/base/common/processes';
 import { addDisposableListener } from 'vs/base/browser/dom';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import { isRemoteDiagnosticError, IRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnosticsService';
 
 
@@ -24,7 +24,7 @@ let mapPidToWindowTitle = new Map<number, string>();
 
 const DEBUG_FLAGS_PATTERN = /\s--(inspect|debug)(-brk|port)?=(\d+)?/;
 const DEBUG_PORT_PATTERN = /\s--(inspect|debug)-port=(\d+)/;
-const listeners: IDisposable[] = [];
+const listeners = new DisposableStore();
 const collapsedStateCache: Map<string, boolean> = new Map<string, boolean>();
 let lastRequestTime: number;
 
@@ -171,7 +171,7 @@ function renderProcessGroupHeader(sectionName: string, body: HTMLElement, contai
 	updateSectionCollapsedState(!collapsedStateCache.get(sectionName), body, twistie, sectionName);
 	data.prepend(twistie);
 
-	listeners.push(addDisposableListener(data, 'click', (e) => {
+	listeners.add(addDisposableListener(data, 'click', (e) => {
 		const isHidden = body.classList.contains('hidden');
 		updateSectionCollapsedState(isHidden, body, twistie, sectionName);
 	}));
@@ -222,7 +222,7 @@ function renderTableSection(sectionName: string, processList: FormattedProcessIt
 
 		row.append(cpu, memory, pid, name);
 
-		listeners.push(addDisposableListener(row, 'contextmenu', (e) => {
+		listeners.add(addDisposableListener(row, 'contextmenu', (e) => {
 			showContextMenu(e, p, sectionIsLocal);
 		}));
 
@@ -239,7 +239,7 @@ function updateProcessInfo(processLists: [{ name: string, rootProcess: ProcessIt
 	}
 
 	container.innerHTML = '';
-	listeners.forEach(l => l.dispose());
+	listeners.clear();
 
 	const tableHead = document.createElement('thead');
 	tableHead.innerHTML = `<tr>

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

@@ -5,7 +5,7 @@
 
 import { basename, dirname, join } from 'vs/base/common/path';
 import { onUnexpectedError } from 'vs/base/common/errors';
-import { dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { toDisposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { readdir, rimraf, stat } from 'vs/base/node/pfs';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import product from 'vs/platform/product/node/product';
@@ -16,7 +16,7 @@ export class NodeCachedDataCleaner {
 		? 1000 * 60 * 60 * 24 * 7 // roughly 1 week
 		: 1000 * 60 * 60 * 24 * 30 * 3; // roughly 3 months
 
-	private _disposables: IDisposable[] = [];
+	private readonly _disposables = new DisposableStore();
 
 	constructor(
 		@IEnvironmentService private readonly _environmentService: IEnvironmentService
@@ -25,7 +25,7 @@ export class NodeCachedDataCleaner {
 	}
 
 	dispose(): void {
-		this._disposables = dispose(this._disposables);
+		this._disposables.dispose();
 	}
 
 	private _manageCachedDataSoon(): void {
@@ -76,7 +76,7 @@ export class NodeCachedDataCleaner {
 
 		}, 30 * 1000);
 
-		this._disposables.push(toDisposable(() => {
+		this._disposables.add(toDisposable(() => {
 			if (handle) {
 				clearTimeout(handle);
 				handle = undefined;

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

@@ -37,7 +37,7 @@ import { ILocalizationsService } from 'vs/platform/localizations/common/localiza
 import { LocalizationsChannel } from 'vs/platform/localizations/node/localizationsIpc';
 import { DialogChannelClient } from 'vs/platform/dialogs/node/dialogIpc';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IDisposable, dispose, combinedDisposable } from 'vs/base/common/lifecycle';
+import { combinedDisposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { DownloadService } from 'vs/platform/download/node/downloadService';
 import { IDownloadService } from 'vs/platform/download/common/download';
 import { IChannel, IServerChannel, StaticRouter } from 'vs/base/parts/ipc/common/ipc';
@@ -85,24 +85,24 @@ class MainProcessService implements IMainProcessService {
 async function main(server: Server, initData: ISharedProcessInitData, configuration: ISharedProcessConfiguration): Promise<void> {
 	const services = new ServiceCollection();
 
-	const disposables: IDisposable[] = [];
+	const disposables = new DisposableStore();
 
-	const onExit = () => dispose(disposables);
+	const onExit = () => disposables.dispose();
 	process.once('exit', onExit);
 	ipcRenderer.once('handshake:goodbye', onExit);
 
-	disposables.push(server);
+	disposables.add(server);
 
 	const environmentService = new EnvironmentService(initData.args, process.execPath);
 
 	const mainRouter = new StaticRouter(ctx => ctx === 'main');
 	const logLevelClient = new LogLevelSetterChannelClient(server.getChannel('loglevel', mainRouter));
 	const logService = new FollowerLogService(logLevelClient, new SpdLogService('sharedprocess', environmentService.logsPath, initData.logLevel));
-	disposables.push(logService);
+	disposables.add(logService);
 	logService.info('main', JSON.stringify(configuration));
 
 	const configurationService = new ConfigurationService(environmentService.settingsResource);
-	disposables.push(configurationService);
+	disposables.add(configurationService);
 	await configurationService.initialize();
 
 	services.set(IEnvironmentService, environmentService);
@@ -137,7 +137,7 @@ async function main(server: Server, initData: ISharedProcessInitData, configurat
 		if (!extensionDevelopmentLocationURI && !environmentService.args['disable-telemetry'] && product.enableTelemetry) {
 			if (product.aiConfig && product.aiConfig.asimovKey && isBuilt) {
 				appInsightsAppender = new AppInsightsAppender(eventPrefix, null, product.aiConfig.asimovKey, telemetryLogService);
-				disposables.push(appInsightsAppender); // Ensure the AI appender is disposed so that it flushes remaining data
+				disposables.add(appInsightsAppender); // Ensure the AI appender is disposed so that it flushes remaining data
 			}
 			const config: ITelemetryServiceConfig = {
 				appender: combinedAppender(appInsightsAppender, new LogAppender(logService)),
@@ -179,13 +179,13 @@ async function main(server: Server, initData: ISharedProcessInitData, configurat
 			// update localizations cache
 			(localizationsService as LocalizationsService).update();
 			// cache clean ups
-			disposables.push(combinedDisposable(
+			disposables.add(combinedDisposable(
 				instantiationService2.createInstance(NodeCachedDataCleaner),
 				instantiationService2.createInstance(LanguagePackCachedDataCleaner),
 				instantiationService2.createInstance(StorageDataCleaner),
 				instantiationService2.createInstance(LogsDataCleaner)
 			));
-			disposables.push(extensionManagementService as ExtensionManagementService);
+			disposables.add(extensionManagementService as ExtensionManagementService);
 		});
 	});
 }

src/vs/code/electron-main/sharedProcess.ts

@@ -12,7 +12,7 @@ import { Barrier } from 'vs/base/common/async';
 import { ILogService } from 'vs/platform/log/common/log';
 import { ILifecycleService } from 'vs/platform/lifecycle/electron-main/lifecycleMain';
 import { IThemeMainService } from 'vs/platform/theme/electron-main/themeMainService';
-import { dispose, toDisposable, IDisposable } from 'vs/base/common/lifecycle';
+import { toDisposable, DisposableStore } from 'vs/base/common/lifecycle';
 
 export class SharedProcess implements ISharedProcess {
 
@@ -66,10 +66,10 @@ export class SharedProcess implements ISharedProcess {
 
 		this.window.on('close', onClose);
 
-		const disposables: IDisposable[] = [];
+		const disposables = new DisposableStore();
 
 		this.lifecycleService.onWillShutdown(() => {
-			dispose(disposables);
+			disposables.dispose();
 
 			// Shut the shared process down when we are quitting
 			//
@@ -103,7 +103,7 @@ export class SharedProcess implements ISharedProcess {
 					logLevel: this.logService.getLevel()
 				});
 
-				disposables.push(toDisposable(() => sender.send('handshake:goodbye')));
+				disposables.add(toDisposable(() => sender.send('handshake:goodbye')));
 				ipcMain.once('handshake:im ready', () => c(undefined));
 			});
 		});

src/vs/code/node/cliProcessMain.ts

@@ -41,7 +41,7 @@ import { CancellationToken } from 'vs/base/common/cancellation';
 import { LocalizationsService } from 'vs/platform/localizations/node/localizations';
 import { Schemas } from 'vs/base/common/network';
 import { SpdLogService } from 'vs/platform/log/node/spdlogService';
-import { buildTelemetryMessage } from 'vs/platform/environment/node/argv';
+import { buildTelemetryMessage } from 'vs/platform/telemetry/node/telemetry';
 
 const notFound = (id: string) => localize('notFound', "Extension '{0}' not found.", id);
 const notInstalled = (id: string) => localize('notInstalled', "Extension '{0}' is not installed.", id);

src/vs/editor/browser/services/codeEditorServiceImpl.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as dom from 'vs/base/browser/dom';
-import { IDisposable, dispose as disposeAll } from 'vs/base/common/lifecycle';
+import { IDisposable, DisposableStore } from 'vs/base/common/lifecycle';
 import * as strings from 'vs/base/common/strings';
 import { URI } from 'vs/base/common/uri';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
@@ -123,7 +123,7 @@ interface ProviderArguments {
 
 class DecorationTypeOptionsProvider implements IModelDecorationOptionsProvider {
 
-	private _disposables: IDisposable[];
+	private readonly _disposables = new DisposableStore();
 	public refCount: number;
 
 	public className: string | undefined;
@@ -138,11 +138,10 @@ class DecorationTypeOptionsProvider implements IModelDecorationOptionsProvider {
 
 	constructor(themeService: IThemeService, providerArgs: ProviderArguments) {
 		this.refCount = 0;
-		this._disposables = [];
 
 		const createCSSRules = (type: ModelDecorationCSSRuleType) => {
 			const rules = new DecorationCSSRules(type, providerArgs, themeService);
-			this._disposables.push(rules);
+			this._disposables.add(rules);
 			if (rules.hasContent) {
 				return rules.className;
 			}
@@ -150,7 +149,7 @@ class DecorationTypeOptionsProvider implements IModelDecorationOptionsProvider {
 		};
 		const createInlineCSSRules = (type: ModelDecorationCSSRuleType) => {
 			const rules = new DecorationCSSRules(type, providerArgs, themeService);
-			this._disposables.push(rules);
+			this._disposables.add(rules);
 			if (rules.hasContent) {
 				return { className: rules.className, hasLetterSpacing: rules.hasLetterSpacing };
 			}
@@ -202,7 +201,7 @@ class DecorationTypeOptionsProvider implements IModelDecorationOptionsProvider {
 	}
 
 	public dispose(): void {
-		this._disposables = disposeAll(this._disposables);
+		this._disposables.dispose();
 	}
 }
 

src/vs/editor/common/services/modelServiceImpl.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Disposable, IDisposable, DisposableStore } from 'vs/base/common/lifecycle';
 import * as platform from 'vs/base/common/platform';
 import { URI } from 'vs/base/common/uri';
 import { EDITOR_MODEL_DEFAULTS } from 'vs/editor/common/config/editorOptions';
@@ -30,7 +30,7 @@ class ModelData implements IDisposable {
 	private _languageSelection: ILanguageSelection | null;
 	private _languageSelectionListener: IDisposable | null;
 
-	private _modelEventListeners: IDisposable[];
+	private readonly _modelEventListeners = new DisposableStore();
 
 	constructor(
 		model: ITextModel,
@@ -42,9 +42,8 @@ class ModelData implements IDisposable {
 		this._languageSelection = null;
 		this._languageSelectionListener = null;
 
-		this._modelEventListeners = [];
-		this._modelEventListeners.push(model.onWillDispose(() => onWillDispose(model)));
-		this._modelEventListeners.push(model.onDidChangeLanguage((e) => onDidChangeLanguage(model, e)));
+		this._modelEventListeners.add(model.onWillDispose(() => onWillDispose(model)));
+		this._modelEventListeners.add(model.onDidChangeLanguage((e) => onDidChangeLanguage(model, e)));
 	}
 
 	private _disposeLanguageSelection(): void {
@@ -59,7 +58,7 @@ class ModelData implements IDisposable {
 	}
 
 	public dispose(): void {
-		this._modelEventListeners = dispose(this._modelEventListeners);
+		this._modelEventListeners.dispose();
 		this._disposeLanguageSelection();
 	}
 

src/vs/editor/contrib/colorPicker/colorDetector.ts

@@ -78,7 +78,7 @@ export class ColorDetector extends Disposable implements IEditorContribution {
 		// handle deprecated settings. [languageId].colorDecorators.enable
 		const deprecatedConfig = this._configurationService.getValue<{}>(languageId.language);
 		if (deprecatedConfig) {
-			const colorDecorators = deprecatedConfig['colorDecorators']; // deprecatedConfig.valueOf('.colorDecorators.enable');
+			const colorDecorators = (deprecatedConfig as any)['colorDecorators']; // deprecatedConfig.valueOf('.colorDecorators.enable');
 			if (colorDecorators && colorDecorators['enable'] !== undefined && !colorDecorators['enable']) {
 				return colorDecorators['enable'];
 			}

src/vs/editor/contrib/contextmenu/contextmenu.ts

@@ -10,7 +10,7 @@ import { ActionViewItem, Separator } from 'vs/base/browser/ui/actionbar/actionba
 import { IAnchor } from 'vs/base/browser/ui/contextview/contextview';
 import { IAction } from 'vs/base/common/actions';
 import { KeyCode, KeyMod, ResolvedKeybinding } from 'vs/base/common/keyCodes';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
 import { EditorAction, ServicesAccessor, registerEditorAction, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
 import { IEditorContribution, ScrollType } from 'vs/editor/common/editorCommon';
@@ -31,7 +31,7 @@ export class ContextMenuController implements IEditorContribution {
 		return editor.getContribution<ContextMenuController>(ContextMenuController.ID);
 	}
 
-	private _toDispose: IDisposable[] = [];
+	private readonly _toDispose = new DisposableStore();
 	private _contextMenuIsBeingShownCount: number = 0;
 	private readonly _editor: ICodeEditor;
 
@@ -45,13 +45,13 @@ export class ContextMenuController implements IEditorContribution {
 	) {
 		this._editor = editor;
 
-		this._toDispose.push(this._editor.onContextMenu((e: IEditorMouseEvent) => this._onContextMenu(e)));
-		this._toDispose.push(this._editor.onMouseWheel((e: IMouseWheelEvent) => {
+		this._toDispose.add(this._editor.onContextMenu((e: IEditorMouseEvent) => this._onContextMenu(e)));
+		this._toDispose.add(this._editor.onMouseWheel((e: IMouseWheelEvent) => {
 			if (this._contextMenuIsBeingShownCount > 0) {
 				this._contextViewService.hideContextView();
 			}
 		}));
-		this._toDispose.push(this._editor.onKeyDown((e: IKeyboardEvent) => {
+		this._toDispose.add(this._editor.onKeyDown((e: IKeyboardEvent) => {
 			if (e.keyCode === KeyCode.ContextMenu) {
 				// Chrome is funny like that
 				e.preventDefault();
@@ -217,7 +217,7 @@ export class ContextMenuController implements IEditorContribution {
 			this._contextViewService.hideContextView();
 		}
 
-		this._toDispose = dispose(this._toDispose);
+		this._toDispose.dispose();
 	}
 }
 

src/vs/editor/contrib/links/links.ts

@@ -9,7 +9,7 @@ import * as async from 'vs/base/common/async';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { MarkdownString } from 'vs/base/common/htmlContent';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import * as platform from 'vs/base/common/platform';
 import { ICodeEditor, MouseTargetType } from 'vs/editor/browser/editorBrowser';
 import { EditorAction, ServicesAccessor, registerEditorAction, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
@@ -172,7 +172,7 @@ class LinkDetector implements editorCommon.IEditorContribution {
 
 	private readonly editor: ICodeEditor;
 	private enabled: boolean;
-	private listenersToRemove: IDisposable[];
+	private readonly listenersToRemove = new DisposableStore();
 	private readonly timeout: async.TimeoutTimer;
 	private computePromise: async.CancelablePromise<LinksList> | null;
 	private activeLinksList: LinksList | null;
@@ -189,22 +189,21 @@ class LinkDetector implements editorCommon.IEditorContribution {
 		this.editor = editor;
 		this.openerService = openerService;
 		this.notificationService = notificationService;
-		this.listenersToRemove = [];
 
 		let clickLinkGesture = new ClickLinkGesture(editor);
-		this.listenersToRemove.push(clickLinkGesture);
-		this.listenersToRemove.push(clickLinkGesture.onMouseMoveOrRelevantKeyDown(([mouseEvent, keyboardEvent]) => {
+		this.listenersToRemove.add(clickLinkGesture);
+		this.listenersToRemove.add(clickLinkGesture.onMouseMoveOrRelevantKeyDown(([mouseEvent, keyboardEvent]) => {
 			this._onEditorMouseMove(mouseEvent, keyboardEvent);
 		}));
-		this.listenersToRemove.push(clickLinkGesture.onExecute((e) => {
+		this.listenersToRemove.add(clickLinkGesture.onExecute((e) => {
 			this.onEditorMouseUp(e);
 		}));
-		this.listenersToRemove.push(clickLinkGesture.onCancel((e) => {
+		this.listenersToRemove.add(clickLinkGesture.onCancel((e) => {
 			this.cleanUpActiveLinkDecoration();
 		}));
 
 		this.enabled = editor.getConfiguration().contribInfo.links;
-		this.listenersToRemove.push(editor.onDidChangeConfiguration((e) => {
+		this.listenersToRemove.add(editor.onDidChangeConfiguration((e) => {
 			let enabled = editor.getConfiguration().contribInfo.links;
 			if (this.enabled === enabled) {
 				// No change in our configuration option
@@ -221,10 +220,10 @@ class LinkDetector implements editorCommon.IEditorContribution {
 			// Start computing (for the getting enabled case)
 			this.beginCompute();
 		}));
-		this.listenersToRemove.push(editor.onDidChangeModelContent((e) => this.onChange()));
-		this.listenersToRemove.push(editor.onDidChangeModel((e) => this.onModelChanged()));
-		this.listenersToRemove.push(editor.onDidChangeModelLanguage((e) => this.onModelModeChanged()));
-		this.listenersToRemove.push(LinkProviderRegistry.onDidChange((e) => this.onModelModeChanged()));
+		this.listenersToRemove.add(editor.onDidChangeModelContent((e) => this.onChange()));
+		this.listenersToRemove.add(editor.onDidChangeModel((e) => this.onModelChanged()));
+		this.listenersToRemove.add(editor.onDidChangeModelLanguage((e) => this.onModelModeChanged()));
+		this.listenersToRemove.add(LinkProviderRegistry.onDidChange((e) => this.onModelModeChanged()));
 
 		this.timeout = new async.TimeoutTimer();
 		this.computePromise = null;
@@ -414,7 +413,7 @@ class LinkDetector implements editorCommon.IEditorContribution {
 	}
 
 	public dispose(): void {
-		this.listenersToRemove = dispose(this.listenersToRemove);
+		this.listenersToRemove.dispose();
 		this.stop();
 		this.timeout.dispose();
 	}

src/vs/editor/contrib/suggest/media/suggest.css

@@ -301,6 +301,11 @@
 	background-image: url('./close-dark.svg');
 }
 
+.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .readMore,
+.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .readMore {
+	background-image: url('./info-dark.svg');
+}
+
 .monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .suggest-icon::before,
 .monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .suggest-icon::before { background-image: url('Misc_inverse_16x.svg'); }
 

src/vs/editor/contrib/suggest/suggestModel.ts

@@ -293,6 +293,9 @@ export class SuggestModel implements IDisposable {
 			this.cancel();
 
 			this._triggerQuickSuggest.cancelAndSet(() => {
+				if (this._state !== State.Idle) {
+					return;
+				}
 				if (!LineContext.shouldAutoTrigger(this._editor)) {
 					return;
 				}

src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts

@@ -9,7 +9,7 @@ import { CancelablePromise, createCancelablePromise, first, timeout } from 'vs/b
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { onUnexpectedError, onUnexpectedExternalError } from 'vs/base/common/errors';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { IActiveCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { EditorAction, IActionOptions, registerDefaultLanguageCommand, registerEditorAction, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
 import { CursorChangeReason, ICursorPositionChangedEvent } from 'vs/editor/common/controller/cursorEvents';
@@ -164,7 +164,7 @@ class WordHighlighter {
 	private occurrencesHighlight: boolean;
 	private readonly model: ITextModel;
 	private _decorationIds: string[];
-	private toUnhook: IDisposable[];
+	private readonly toUnhook = new DisposableStore();
 
 	private workerRequestTokenId: number = 0;
 	private workerRequest: IOccurenceAtPositionRequest | null;
@@ -183,8 +183,7 @@ class WordHighlighter {
 		this._ignorePositionChangeEvent = false;
 		this.occurrencesHighlight = this.editor.getConfiguration().contribInfo.occurrencesHighlight;
 		this.model = this.editor.getModel();
-		this.toUnhook = [];
-		this.toUnhook.push(editor.onDidChangeCursorPosition((e: ICursorPositionChangedEvent) => {
+		this.toUnhook.add(editor.onDidChangeCursorPosition((e: ICursorPositionChangedEvent) => {
 
 			if (this._ignorePositionChangeEvent) {
 				// We are changing the position => ignore this event
@@ -199,10 +198,10 @@ class WordHighlighter {
 
 			this._onPositionChanged(e);
 		}));
-		this.toUnhook.push(editor.onDidChangeModelContent((e) => {
+		this.toUnhook.add(editor.onDidChangeModelContent((e) => {
 			this._stopAll();
 		}));
-		this.toUnhook.push(editor.onDidChangeConfiguration((e) => {
+		this.toUnhook.add(editor.onDidChangeConfiguration((e) => {
 			let newValue = this.editor.getConfiguration().contribInfo.occurrencesHighlight;
 			if (this.occurrencesHighlight !== newValue) {
 				this.occurrencesHighlight = newValue;
@@ -454,7 +453,7 @@ class WordHighlighter {
 
 	public dispose(): void {
 		this._stopAll();
-		this.toUnhook = dispose(this.toUnhook);
+		this.toUnhook.dispose();
 	}
 }
 

src/vs/editor/standalone/browser/standaloneThemeServiceImpl.ts

@@ -27,7 +27,7 @@ class StandaloneTheme implements IStandaloneTheme {
 	public readonly themeName: string;
 
 	private readonly themeData: IStandaloneThemeData;
-	private colors: { [colorId: string]: Color } | null;
+	private colors: Map<string, Color> | null;
 	private readonly defaultColors: { [colorId: string]: Color | undefined; };
 	private _tokenTheme: TokenTheme | null;
 
@@ -57,19 +57,18 @@ class StandaloneTheme implements IStandaloneTheme {
 		}
 	}
 
-	private getColors(): { [colorId: string]: Color } {
+	private getColors(): Map<string, Color> {
 		if (!this.colors) {
-			let colors: { [colorId: string]: Color } = Object.create(null);
+			const colors = new Map<string, Color>();
 			for (let id in this.themeData.colors) {
-				colors[id] = Color.fromHex(this.themeData.colors[id]);
+				colors.set(id, Color.fromHex(this.themeData.colors[id]));
 			}
 			if (this.themeData.inherit) {
 				let baseData = getBuiltinRules(this.themeData.base);
 				for (let id in baseData.colors) {
-					if (!colors[id]) {
-						colors[id] = Color.fromHex(baseData.colors[id]);
+					if (!colors.has(id)) {
+						colors.set(id, Color.fromHex(baseData.colors[id]));
 					}
-
 				}
 			}
 			this.colors = colors;
@@ -78,7 +77,7 @@ class StandaloneTheme implements IStandaloneTheme {
 	}
 
 	public getColor(colorId: ColorIdentifier, useDefault?: boolean): Color | undefined {
-		const color = this.getColors()[colorId];
+		const color = this.getColors().get(colorId);
 		if (color) {
 			return color;
 		}

src/vs/platform/actions/browser/menuEntryActionViewItem.ts

@@ -9,7 +9,7 @@ import { ActionViewItem, Separator } from 'vs/base/browser/ui/actionbar/actionba
 import { IAction } from 'vs/base/common/actions';
 import { Emitter } from 'vs/base/common/event';
 import { IdGenerator } from 'vs/base/common/idGenerator';
-import { dispose, IDisposable, toDisposable, MutableDisposable, DisposableStore } from 'vs/base/common/lifecycle';
+import { IDisposable, toDisposable, MutableDisposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { isLinux, isWindows } from 'vs/base/common/platform';
 import { localize } from 'vs/nls';
 import { ICommandAction, IMenu, IMenuActionOptions, MenuItemAction, SubmenuItemAction } from 'vs/platform/actions/common/actions';
@@ -20,7 +20,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 // The alternative key on all platforms is alt. On windows we also support shift as an alternative key #44136
 class AlternativeKeyEmitter extends Emitter<boolean> {
 
-	private _subscriptions: IDisposable[] = [];
+	private readonly _subscriptions = new DisposableStore();
 	private _isPressed: boolean;
 	private static instance: AlternativeKeyEmitter;
 	private _suppressAltKeyUp: boolean = false;
@@ -28,10 +28,10 @@ class AlternativeKeyEmitter extends Emitter<boolean> {
 	private constructor(contextMenuService: IContextMenuService) {
 		super();
 
-		this._subscriptions.push(domEvent(document.body, 'keydown')(e => {
+		this._subscriptions.add(domEvent(document.body, 'keydown')(e => {
 			this.isPressed = e.altKey || ((isWindows || isLinux) && e.shiftKey);
 		}));
-		this._subscriptions.push(domEvent(document.body, 'keyup')(e => {
+		this._subscriptions.add(domEvent(document.body, 'keyup')(e => {
 			if (this.isPressed) {
 				if (this._suppressAltKeyUp) {
 					e.preventDefault();
@@ -41,10 +41,10 @@ class AlternativeKeyEmitter extends Emitter<boolean> {
 			this._suppressAltKeyUp = false;
 			this.isPressed = false;
 		}));
-		this._subscriptions.push(domEvent(document.body, 'mouseleave')(e => this.isPressed = false));
-		this._subscriptions.push(domEvent(document.body, 'blur')(e => this.isPressed = false));
+		this._subscriptions.add(domEvent(document.body, 'mouseleave')(e => this.isPressed = false));
+		this._subscriptions.add(domEvent(document.body, 'blur')(e => this.isPressed = false));
 		// Workaround since we do not get any events while a context menu is shown
-		this._subscriptions.push(contextMenuService.onDidContextMenu(() => this.isPressed = false));
+		this._subscriptions.add(contextMenuService.onDidContextMenu(() => this.isPressed = false));
 	}
 
 	get isPressed(): boolean {
@@ -72,7 +72,7 @@ class AlternativeKeyEmitter extends Emitter<boolean> {
 
 	dispose() {
 		super.dispose();
-		this._subscriptions = dispose(this._subscriptions);
+		this._subscriptions.dispose();
 	}
 }
 

src/vs/platform/actions/common/actions.ts

@@ -121,64 +121,61 @@ export interface IMenuService {
 	createMenu(id: MenuId, scopedKeybindingService: IContextKeyService): IMenu;
 }
 
+export type ICommandsMap = Map<string, ICommandAction>;
+
 export interface IMenuRegistry {
 	addCommand(userCommand: ICommandAction): IDisposable;
-	getCommand(id: string): ICommandAction;
+	getCommand(id: string): ICommandAction | undefined;
 	getCommands(): ICommandsMap;
 	appendMenuItem(menu: MenuId, item: IMenuItem | ISubmenuItem): IDisposable;
 	getMenuItems(loc: MenuId): Array<IMenuItem | ISubmenuItem>;
 	readonly onDidChangeMenu: Event<MenuId>;
 }
 
-export interface ICommandsMap {
-	[id: string]: ICommandAction;
-}
-
 export const MenuRegistry: IMenuRegistry = new class implements IMenuRegistry {
 
-	private readonly _commands: { [id: string]: ICommandAction } = Object.create(null);
-	private readonly _menuItems: { [loc: number]: Array<IMenuItem | ISubmenuItem> } = Object.create(null);
+	private readonly _commands = new Map<string, ICommandAction>();
+	private readonly _menuItems = new Map<number, Array<IMenuItem | ISubmenuItem>>();
 	private readonly _onDidChangeMenu = new Emitter<MenuId>();
 
 	readonly onDidChangeMenu: Event<MenuId> = this._onDidChangeMenu.event;
 
 	addCommand(command: ICommandAction): IDisposable {
-		this._commands[command.id] = command;
+		this._commands.set(command.id, command);
 		this._onDidChangeMenu.fire(MenuId.CommandPalette);
 		return {
 			dispose: () => {
-				if (delete this._commands[command.id]) {
+				if (this._commands.delete(command.id)) {
 					this._onDidChangeMenu.fire(MenuId.CommandPalette);
 				}
 			}
 		};
 	}
 
-	getCommand(id: string): ICommandAction {
-		return this._commands[id];
+	getCommand(id: string): ICommandAction | undefined {
+		return this._commands.get(id);
 	}
 
 	getCommands(): ICommandsMap {
-		const result: ICommandsMap = Object.create(null);
-		for (const key in this._commands) {
-			result[key] = this.getCommand(key);
-		}
-		return result;
+		const map = new Map<string, ICommandAction>();
+		this._commands.forEach((value, key) => map.set(key, value));
+		return map;
 	}
 
 	appendMenuItem(id: MenuId, item: IMenuItem | ISubmenuItem): IDisposable {
-		let array = this._menuItems[id];
+		let array = this._menuItems.get(id);
 		if (!array) {
-			this._menuItems[id] = array = [item];
+			array = [item];
+			this._menuItems.set(id, array);
 		} else {
 			array.push(item);
 		}
 		this._onDidChangeMenu.fire(id);
 		return {
 			dispose: () => {
-				const idx = array.indexOf(item);
+				const idx = array!.indexOf(item);
 				if (idx >= 0) {
-					array.splice(idx, 1);
+					array!.splice(idx, 1);
 					this._onDidChangeMenu.fire(id);
 				}
 			}
@@ -186,7 +183,7 @@ export const MenuRegistry: IMenuRegistry = new class implements IMenuRegistry {
 	}
 
 	getMenuItems(id: MenuId): Array<IMenuItem | ISubmenuItem> {
-		const result = (this._menuItems[id] || []).slice(0);
+		const result = (this._menuItems.get(id) || []).slice(0);
 
 		if (id === MenuId.CommandPalette) {
 			// CommandPalette is special because it shows
@@ -207,11 +204,11 @@ export const MenuRegistry: IMenuRegistry = new class implements IMenuRegistry {
 				set.add(alt.id);
 			}
 		}
-		for (let id in this._commands) {
+		this._commands.forEach((command, id) => {
 			if (!set.has(id)) {
-				result.push({ command: this._commands[id] });
+				result.push({ command });
 			}
-		}
+		});
 	}
 };
 

src/vs/platform/commands/common/commands.ts

@@ -9,6 +9,7 @@ import { ServicesAccessor, createDecorator } from 'vs/platform/instantiation/com
 import { Event, Emitter } from 'vs/base/common/event';
 import { LinkedList } from 'vs/base/common/linkedList';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
+import { keys } from 'vs/base/common/map';
 
 export const ICommandService = createDecorator<ICommandService>('commandService');
 
@@ -22,9 +23,7 @@ export interface ICommandService {
 	executeCommand<T = any>(commandId: string, ...args: any[]): Promise<T | undefined>;
 }
 
-export interface ICommandsMap {
-	[id: string]: ICommand;
-}
+export type ICommandsMap = Map<string, ICommand>;
 
 export interface ICommandHandler {
 	(accessor: ServicesAccessor, ...args: any[]): void;
@@ -122,10 +121,13 @@ export const CommandsRegistry: ICommandRegistry = new class implements ICommandR
 	}
 
 	getCommands(): ICommandsMap {
-		const result: ICommandsMap = Object.create(null);
-		this._commands.forEach((value, key) => {
-			result[key] = this.getCommand(key)!;
-		});
+		const result = new Map<string, ICommand>();
+		for (const key of keys(this._commands)) {
+			const command = this.getCommand(key);
+			if (command) {
+				result.set(key, command);
+			}
+		}
 		return result;
 	}
 };

src/vs/platform/commands/test/commands.test.ts

@@ -68,10 +68,10 @@ suite('Command Tests', function () {
 			}
 		});
 
-		CommandsRegistry.getCommands()['test'].handler.apply(undefined, [undefined!, 'string']);
-		CommandsRegistry.getCommands()['test2'].handler.apply(undefined, [undefined!, 'string']);
-		assert.throws(() => CommandsRegistry.getCommands()['test3'].handler.apply(undefined, [undefined!, 'string']));
-		assert.equal(CommandsRegistry.getCommands()['test3'].handler.apply(undefined, [undefined!, 1]), true);
+		CommandsRegistry.getCommands().get('test')!.handler.apply(undefined, [undefined!, 'string']);
+		CommandsRegistry.getCommands().get('test2')!.handler.apply(undefined, [undefined!, 'string']);
+		assert.throws(() => CommandsRegistry.getCommands().get('test3')!.handler.apply(undefined, [undefined!, 'string']));
+		assert.equal(CommandsRegistry.getCommands().get('test3')!.handler.apply(undefined, [undefined!, 1]), true);
 
 	});
 });

src/vs/platform/contextkey/browser/contextKeyService.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Emitter, Event, PauseableEmitter } from 'vs/base/common/event';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { keys } from 'vs/base/common/map';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -323,7 +323,7 @@ export class ContextKeyService extends AbstractContextKeyService implements ICon
 	private _lastContextId: number;
 	private readonly _contexts = new Map<number, Context>();
 
-	private _toDispose: IDisposable[] = [];
+	private readonly _toDispose = new DisposableStore();
 
 	constructor(@IConfigurationService configurationService: IConfigurationService) {
 		super(0);
@@ -332,7 +332,7 @@ export class ContextKeyService extends AbstractContextKeyService implements ICon
 
 		const myContext = new ConfigAwareContextValuesContainer(this._myContextId, configurationService, this._onDidChangeContext);
 		this._contexts.set(this._myContextId, myContext);
-		this._toDispose.push(myContext);
+		this._toDispose.add(myContext);
 
 		// Uncomment this to see the contexts continuously logged
 		// let lastLoggedValue: string | null = null;
@@ -348,7 +348,7 @@ export class ContextKeyService extends AbstractContextKeyService implements ICon
 
 	public dispose(): void {
 		this._isDisposed = true;
-		this._toDispose = dispose(this._toDispose);
+		this._toDispose.dispose();
 	}
 
 	public getContextValuesContainer(contextId: number): Context {

src/vs/platform/contextview/browser/contextMenuHandler.ts

@@ -5,7 +5,7 @@
 
 import 'vs/css!./contextMenuHandler';
 
-import { IDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
+import { combinedDisposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { ActionRunner, IRunEvent, WBActionExecutedEvent, WBActionExecutedClassification } from 'vs/base/common/actions';
 import { Menu } from 'vs/base/browser/ui/menu/menu';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
@@ -67,7 +67,7 @@ export class ContextMenuHandler {
 					this.block = container.appendChild($('.context-view-block'));
 				}
 
-				const menuDisposables: IDisposable[] = [];
+				const menuDisposables = new DisposableStore();
 
 				const actionRunner = delegate.actionRunner || new ActionRunner();
 				actionRunner.onDidBeforeRun(this.onActionRun, this, menuDisposables);
@@ -79,7 +79,7 @@ export class ContextMenuHandler {
 					getKeyBinding: delegate.getKeyBinding ? delegate.getKeyBinding : action => this.keybindingService.lookupKeybinding(action.id)
 				});
 
-				menuDisposables.push(attachMenuStyler(menu, this.themeService));
+				menuDisposables.add(attachMenuStyler(menu, this.themeService));
 
 				menu.onDidCancel(() => this.contextViewService.hideContextView(true), null, menuDisposables);
 				menu.onDidBlur(() => this.contextViewService.hideContextView(true), null, menuDisposables);
@@ -104,7 +104,7 @@ export class ContextMenuHandler {
 					this.contextViewService.hideContextView(true);
 				}, null, menuDisposables);
 
-				return combinedDisposable(...menuDisposables, menu);
+				return combinedDisposable(menuDisposables, menu);
 			},
 
 			focus: () => {

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

@@ -8,8 +8,7 @@ import * as os from 'os';
 import { localize } from 'vs/nls';
 import { ParsedArgs } from 'vs/platform/environment/common/environment';
 import { join } from 'vs/base/common/path';
-import { statSync, readFileSync } from 'fs';
-import { writeFileSync, readdirSync } from 'vs/base/node/pfs';
+import { writeFileSync } from 'vs/base/node/pfs';
 
 /**
  * This code is also used by standalone cli's. Avoid adding any other dependencies.
@@ -122,8 +121,8 @@ export function parseArgs(args: string[], isOptionSupported = (_: Option) => tru
 		}
 	}
 	// remote aliases to avoid confusion
-	const parsedArgs = minimist(args, { string, boolean, alias }) as ParsedArgs;
-	for (let o of options) {
+	const parsedArgs = minimist(args, { string, boolean, alias });
+	for (const o of options) {
 		if (o.alias) {
 			delete parsedArgs[o.alias];
 		}
@@ -204,10 +203,10 @@ export function buildHelpMessage(productName: string, executableName: string, ve
 		}
 		help.push('');
 	}
-	for (let key in categories) {
+	for (const key in categories) {
 		let categoryOptions = options.filter(o => !!o.description && o.cat === key && isOptionSupported(o));
 		if (categoryOptions.length) {
-			help.push(categories[key]);
+			help.push(categories[key as keyof HelpCategories]);
 			help.push(...formatOptions(categoryOptions, columns));
 			help.push('');
 		}
@@ -219,41 +218,6 @@ export function buildVersionMessage(version: string | undefined, commit: string
 	return `${version || localize('unknownVersion', "Unknown version")}\n${commit || localize('unknownCommit', "Unknown commit")}\n${process.arch}`;
 }
 
-export function buildTelemetryMessage(appRoot: string, extensionsPath: string): string {
-	// Gets all the directories inside the extension directory
-	const dirs = readdirSync(extensionsPath).filter(files => {
-		// This handles case where broken symbolic links can cause statSync to throw and error
-		try {
-			return statSync(join(extensionsPath, files)).isDirectory();
-		} catch {
-			return false;
-		}
-	});
-	const telemetryJsonFolders: string[] = [];
-	dirs.forEach((dir) => {
-		const files = readdirSync(join(extensionsPath, dir)).filter(file => file === 'telemetry.json');
-		// We know it contains a telemetry.json file so we add it to the list of folders which have one
-		if (files.length === 1) {
-			telemetryJsonFolders.push(dir);
-		}
-	});
-	const mergedTelemetry = Object.create(null);
-	// Simple function to merge the telemetry into one json object
-	const mergeTelemetry = (contents: string, dirName: string) => {
-		const telemetryData = JSON.parse(contents);
-		mergedTelemetry[dirName] = telemetryData;
-	};
-	telemetryJsonFolders.forEach((folder) => {
-		const contents = readFileSync(join(extensionsPath, folder, 'telemetry.json')).toString();
-		mergeTelemetry(contents, folder);
-	});
-	let contents = readFileSync(join(appRoot, 'telemetry-core.json')).toString();
-	mergeTelemetry(contents, 'vscode-core');
-	contents = readFileSync(join(appRoot, 'telemetry-extensions.json')).toString();
-	mergeTelemetry(contents, 'vscode-extensions');
-	return JSON.stringify(mergedTelemetry, null, 4);
-}
-
 /**
  * Converts an argument into an array
  * @param arg a argument value. Can be undefined, an entry or an array

src/vs/platform/extensions/common/extensions.ts

@@ -140,6 +140,7 @@ export interface IExtensionManifest {
 	readonly bugs?: { url: string; };
 	readonly enableProposedApi?: boolean;
 	readonly api?: string;
+	readonly scripts?: { [key: string]: string; };
 }
 
 export const enum ExtensionType {

src/vs/platform/keybinding/common/keybindingResolver.ts

@@ -8,6 +8,7 @@ import { MenuRegistry } from 'vs/platform/actions/common/actions';
 import { CommandsRegistry, ICommandHandlerDescription } from 'vs/platform/commands/common/commands';
 import { ContextKeyAndExpr, ContextKeyExpr, IContext } from 'vs/platform/contextkey/common/contextkey';
 import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
+import { keys } from 'vs/base/common/map';
 
 export interface IResolveResult {
 	enterChord: boolean;
@@ -334,10 +335,10 @@ export class KeybindingResolver {
 			}
 			unboundCommands.push(id);
 		};
-		for (const id in MenuRegistry.getCommands()) {
+		for (const id of keys(MenuRegistry.getCommands())) {
 			addCommand(id, true);
 		}
-		for (const id in CommandsRegistry.getCommands()) {
+		for (const id of keys(CommandsRegistry.getCommands())) {
 			addCommand(id, false);
 		}
 

src/vs/platform/state/node/stateService.ts

@@ -11,14 +11,16 @@ import { isUndefined, isUndefinedOrNull } from 'vs/base/common/types';
 import { IStateService } from 'vs/platform/state/common/state';
 import { ILogService } from 'vs/platform/log/common/log';
 
+type StorageDatebase = { [key: string]: any; };
+
 export class FileStorage {
 
-	private _database: object | null = null;
+	private _database: StorageDatebase | null = null;
 	private lastFlushedSerializedDatabase: string | null = null;
 
 	constructor(private dbPath: string, private onError: (error: Error) => void) { }
 
-	private get database(): object {
+	private get database(): StorageDatebase {
 		if (!this._database) {
 			this._database = this.loadSync();
 		}
@@ -40,7 +42,7 @@ export class FileStorage {
 		this._database = database;
 	}
 
-	private loadSync(): object {
+	private loadSync(): StorageDatebase {
 		try {
 			this.lastFlushedSerializedDatabase = fs.readFileSync(this.dbPath).toString();
 
@@ -54,7 +56,7 @@ export class FileStorage {
 		}
 	}
 
-	private async loadAsync(): Promise<object> {
+	private async loadAsync(): Promise<StorageDatebase> {
 		try {
 			this.lastFlushedSerializedDatabase = (await readFile(this.dbPath)).toString();
 

src/vs/platform/telemetry/browser/errorTelemetry.ts

@@ -20,7 +20,7 @@ export default class ErrorTelemetry extends BaseErrorTelemetry {
 				oldOnError.apply(this, arguments);
 			}
 		};
-		this._disposables.push(toDisposable(function () {
+		this._disposables.add(toDisposable(() => {
 			if (oldOnError) {
 				globals.onerror = oldOnError;
 			}

src/vs/platform/telemetry/common/errorTelemetry.ts

@@ -5,7 +5,7 @@
 
 import { binarySearch } from 'vs/base/common/arrays';
 import * as Errors from 'vs/base/common/errors';
-import { dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { toDisposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { safeStringify } from 'vs/base/common/objects';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 
@@ -49,7 +49,7 @@ export default abstract class BaseErrorTelemetry {
 	private _flushDelay: number;
 	private _flushHandle: any = -1;
 	private _buffer: ErrorEvent[] = [];
-	protected _disposables: IDisposable[] = [];
+	protected readonly _disposables = new DisposableStore();
 
 	constructor(telemetryService: ITelemetryService, flushDelay = BaseErrorTelemetry.ERROR_FLUSH_TIMEOUT) {
 		this._telemetryService = telemetryService;
@@ -57,7 +57,7 @@ export default abstract class BaseErrorTelemetry {
 
 		// (1) check for unexpected but handled errors
 		const unbind = Errors.errorHandler.addListener((err) => this._onErrorEvent(err));
-		this._disposables.push(toDisposable(unbind));
+		this._disposables.add(toDisposable(unbind));
 
 		// (2) install implementation-specific error listeners
 		this.installErrorListeners();
@@ -66,7 +66,7 @@ export default abstract class BaseErrorTelemetry {
 	dispose() {
 		clearTimeout(this._flushHandle);
 		this._flushBuffer();
-		this._disposables = dispose(this._disposables);
+		this._disposables.dispose();
 	}
 
 	protected installErrorListeners(): void {

src/vs/platform/telemetry/node/telemetry.ts

+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+
+import { readdirSync } from 'vs/base/node/pfs';
+import { statSync, readFileSync } from 'fs';
+import { join } from 'vs/base/common/path';
+
+export function buildTelemetryMessage(appRoot: string, extensionsPath: string): string {
+	// Gets all the directories inside the extension directory
+	const dirs = readdirSync(extensionsPath).filter(files => {
+		// This handles case where broken symbolic links can cause statSync to throw and error
+		try {
+			return statSync(join(extensionsPath, files)).isDirectory();
+		} catch {
+			return false;
+		}
+	});
+	const telemetryJsonFolders: string[] = [];
+	dirs.forEach((dir) => {
+		const files = readdirSync(join(extensionsPath, dir)).filter(file => file === 'telemetry.json');
+		// We know it contains a telemetry.json file so we add it to the list of folders which have one
+		if (files.length === 1) {
+			telemetryJsonFolders.push(dir);
+		}
+	});
+	const mergedTelemetry = Object.create(null);
+	// Simple function to merge the telemetry into one json object
+	const mergeTelemetry = (contents: string, dirName: string) => {
+		const telemetryData = JSON.parse(contents);
+		mergedTelemetry[dirName] = telemetryData;
+	};
+	telemetryJsonFolders.forEach((folder) => {
+		const contents = readFileSync(join(extensionsPath, folder, 'telemetry.json')).toString();
+		mergeTelemetry(contents, folder);
+	});
+	let contents = readFileSync(join(appRoot, 'telemetry-core.json')).toString();
+	mergeTelemetry(contents, 'vscode-core');
+	contents = readFileSync(join(appRoot, 'telemetry-extensions.json')).toString();
+	mergeTelemetry(contents, 'vscode-extensions');
+	return JSON.stringify(mergedTelemetry, null, 4);
+}
\ No newline at end of file

src/vs/workbench/api/browser/mainThreadCommands.ts

@@ -36,10 +36,9 @@ export class MainThreadCommands implements MainThreadCommandsShape {
 		return this._proxy.$getContributedCommandHandlerDescriptions().then(result => {
 			// add local commands
 			const commands = CommandsRegistry.getCommands();
-			for (let id in commands) {
-				let { description } = commands[id];
-				if (description) {
-					result[id] = description;
+			for (const [id, command] of commands) {
+				if (command.description) {
+					result[id] = command.description;
 				}
 			}
 
@@ -79,7 +78,7 @@ export class MainThreadCommands implements MainThreadCommandsShape {
 	}
 
 	$getCommands(): Promise<string[]> {
-		return Promise.resolve(Object.keys(CommandsRegistry.getCommands()));
+		return Promise.resolve([...CommandsRegistry.getCommands().keys()]);
 	}
 }
 

src/vs/workbench/api/browser/mainThreadDebugService.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import { URI as uri } from 'vs/base/common/uri';
 import { IDebugService, IConfig, IDebugConfigurationProvider, IBreakpoint, IFunctionBreakpoint, IBreakpointData, ITerminalSettings, IDebugAdapter, IDebugAdapterDescriptorFactory, IDebugSession, IDebugAdapterFactory } from 'vs/workbench/contrib/debug/common/debug';
 import {
@@ -20,7 +20,7 @@ import { convertToVSCPaths, convertToDAPaths } from 'vs/workbench/contrib/debug/
 export class MainThreadDebugService implements MainThreadDebugServiceShape, IDebugAdapterFactory {
 
 	private readonly _proxy: ExtHostDebugServiceShape;
-	private _toDispose: IDisposable[];
+	private readonly _toDispose = new DisposableStore();
 	private _breakpointEventsActive: boolean;
 	private readonly _debugAdapters: Map<number, ExtensionHostDebugAdapter>;
 	private _debugAdaptersHandleCounter = 1;
@@ -33,19 +33,18 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape, IDeb
 		@IDebugService private readonly debugService: IDebugService
 	) {
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostDebugService);
-		this._toDispose = [];
-		this._toDispose.push(debugService.onDidNewSession(session => {
+		this._toDispose.add(debugService.onDidNewSession(session => {
 			this._proxy.$acceptDebugSessionStarted(this.getSessionDto(session));
 		}));
 		// Need to start listening early to new session events because a custom event can come while a session is initialising
-		this._toDispose.push(debugService.onWillNewSession(session => {
-			this._toDispose.push(session.onDidCustomEvent(event => this._proxy.$acceptDebugSessionCustomEvent(this.getSessionDto(session), event)));
+		this._toDispose.add(debugService.onWillNewSession(session => {
+			this._toDispose.add(session.onDidCustomEvent(event => this._proxy.$acceptDebugSessionCustomEvent(this.getSessionDto(session), event)));
 		}));
-		this._toDispose.push(debugService.onDidEndSession(session => {
+		this._toDispose.add(debugService.onDidEndSession(session => {
 			this._proxy.$acceptDebugSessionTerminated(this.getSessionDto(session));
 			this._sessions.delete(session.getId());
 		}));
-		this._toDispose.push(debugService.getViewModel().onDidFocusSession(session => {
+		this._toDispose.add(debugService.getViewModel().onDidFocusSession(session => {
 			this._proxy.$acceptDebugSessionActiveChanged(this.getSessionDto(session));
 		}));
 
@@ -56,7 +55,7 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape, IDeb
 	}
 
 	public dispose(): void {
-		this._toDispose = dispose(this._toDispose);
+		this._toDispose.dispose();
 	}
 
 	// interface IDebugAdapterProvider
@@ -79,7 +78,7 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape, IDeb
 	// RPC methods (MainThreadDebugServiceShape)
 
 	public $registerDebugTypes(debugTypes: string[]) {
-		this._toDispose.push(this.debugService.getConfigurationManager().registerDebugAdapterFactory(debugTypes, this));
+		this._toDispose.add(this.debugService.getConfigurationManager().registerDebugAdapterFactory(debugTypes, this));
 	}
 
 	public $startBreakpointEvents(): void {
@@ -88,7 +87,7 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape, IDeb
 			this._breakpointEventsActive = true;
 
 			// set up a handler to send more
-			this._toDispose.push(this.debugService.getModel().onDidChangeBreakpoints(e => {
+			this._toDispose.add(this.debugService.getModel().onDidChangeBreakpoints(e => {
 				// Ignore session only breakpoint events since they should only reflect in the UI
 				if (e && !e.sessionOnly) {
 					const delta: IBreakpointsDeltaDto = {};
@@ -170,7 +169,7 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape, IDeb
 			};
 		}
 		this._debugConfigurationProviders.set(handle, provider);
-		this._toDispose.push(this.debugService.getConfigurationManager().registerDebugConfigurationProvider(provider));
+		this._toDispose.add(this.debugService.getConfigurationManager().registerDebugConfigurationProvider(provider));
 
 		return Promise.resolve(undefined);
 	}
@@ -192,7 +191,7 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape, IDeb
 			}
 		};
 		this._debugAdapterDescriptorFactories.set(handle, provider);
-		this._toDispose.push(this.debugService.getConfigurationManager().registerDebugAdapterDescriptorFactory(provider));
+		this._toDispose.add(this.debugService.getConfigurationManager().registerDebugAdapterDescriptorFactory(provider));
 
 		return Promise.resolve(undefined);
 	}

src/vs/workbench/api/browser/mainThreadDocuments.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { IDisposable, IReference, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, IReference, dispose, DisposableStore } from 'vs/base/common/lifecycle';
 import { Schemas } from 'vs/base/common/network';
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { ITextModel } from 'vs/editor/common/model';
@@ -73,7 +73,7 @@ export class MainThreadDocuments implements MainThreadDocumentsShape {
 	private readonly _untitledEditorService: IUntitledEditorService;
 	private readonly _environmentService: IWorkbenchEnvironmentService;
 
-	private _toDispose: IDisposable[];
+	private readonly _toDispose = new DisposableStore();
 	private _modelToDisposeMap: { [modelUrl: string]: IDisposable; };
 	private readonly _proxy: ExtHostDocumentsShape;
 	private readonly _modelIsSynced: { [modelId: string]: boolean; };
@@ -100,23 +100,22 @@ export class MainThreadDocuments implements MainThreadDocumentsShape {
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostDocuments);
 		this._modelIsSynced = {};
 
-		this._toDispose = [];
-		this._toDispose.push(documentsAndEditors.onDocumentAdd(models => models.forEach(this._onModelAdded, this)));
-		this._toDispose.push(documentsAndEditors.onDocumentRemove(urls => urls.forEach(this._onModelRemoved, this)));
-		this._toDispose.push(this._modelReferenceCollection);
-		this._toDispose.push(modelService.onModelModeChanged(this._onModelModeChanged, this));
+		this._toDispose.add(documentsAndEditors.onDocumentAdd(models => models.forEach(this._onModelAdded, this)));
+		this._toDispose.add(documentsAndEditors.onDocumentRemove(urls => urls.forEach(this._onModelRemoved, this)));
+		this._toDispose.add(this._modelReferenceCollection);
+		this._toDispose.add(modelService.onModelModeChanged(this._onModelModeChanged, this));
 
-		this._toDispose.push(textFileService.models.onModelSaved(e => {
+		this._toDispose.add(textFileService.models.onModelSaved(e => {
 			if (this._shouldHandleFileEvent(e)) {
 				this._proxy.$acceptModelSaved(e.resource);
 			}
 		}));
-		this._toDispose.push(textFileService.models.onModelReverted(e => {
+		this._toDispose.add(textFileService.models.onModelReverted(e => {
 			if (this._shouldHandleFileEvent(e)) {
 				this._proxy.$acceptDirtyStateChanged(e.resource, false);
 			}
 		}));
-		this._toDispose.push(textFileService.models.onModelDirty(e => {
+		this._toDispose.add(textFileService.models.onModelDirty(e => {
 			if (this._shouldHandleFileEvent(e)) {
 				this._proxy.$acceptDirtyStateChanged(e.resource, true);
 			}
@@ -130,7 +129,7 @@ export class MainThreadDocuments implements MainThreadDocumentsShape {
 			this._modelToDisposeMap[modelUrl].dispose();
 		});
 		this._modelToDisposeMap = Object.create(null);
-		this._toDispose = dispose(this._toDispose);
+		this._toDispose.dispose();
 	}
 
 	private _shouldHandleFileEvent(e: TextFileModelChangeEvent): boolean {

src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Emitter, Event } from 'vs/base/common/event';
-import { IDisposable, combinedDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, combinedDisposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { values } from 'vs/base/common/map';
 import { URI } from 'vs/base/common/uri';
 import { ICodeEditor, isCodeEditor, isDiffEditor, IActiveCodeEditor } from 'vs/editor/browser/editorBrowser';
@@ -144,7 +144,7 @@ const enum ActiveEditorOrder {
 
 class MainThreadDocumentAndEditorStateComputer {
 
-	private _toDispose: IDisposable[] = [];
+	private readonly _toDispose = new DisposableStore();
 	private _toDisposeOnEditorRemove = new Map<string, IDisposable>();
 	private _currentState: DocumentAndEditorState;
 	private _activeEditorOrder: ActiveEditorOrder = ActiveEditorOrder.Editor;
@@ -172,7 +172,7 @@ class MainThreadDocumentAndEditorStateComputer {
 	}
 
 	dispose(): void {
-		this._toDispose = dispose(this._toDispose);
+		this._toDispose.dispose();
 	}
 
 	private _onDidAddEditor(e: ICodeEditor): void {
@@ -304,9 +304,8 @@ class MainThreadDocumentAndEditorStateComputer {
 @extHostCustomer
 export class MainThreadDocumentsAndEditors {
 
-	private _toDispose: IDisposable[];
+	private readonly _toDispose = new DisposableStore();
 	private readonly _proxy: ExtHostDocumentsAndEditorsShape;
-	private readonly _stateComputer: MainThreadDocumentAndEditorStateComputer;
 	private _textEditors = <{ [id: string]: MainThreadTextEditor }>Object.create(null);
 
 	private _onTextEditorAdd = new Emitter<MainThreadTextEditor[]>();
@@ -336,28 +335,23 @@ export class MainThreadDocumentsAndEditors {
 	) {
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostDocumentsAndEditors);
 
-		const mainThreadDocuments = new MainThreadDocuments(this, extHostContext, this._modelService, modeService, this._textFileService, fileService, textModelResolverService, untitledEditorService, environmentService);
+		const mainThreadDocuments = this._toDispose.add(new MainThreadDocuments(this, extHostContext, this._modelService, modeService, this._textFileService, fileService, textModelResolverService, untitledEditorService, environmentService));
 		extHostContext.set(MainContext.MainThreadDocuments, mainThreadDocuments);
 
-		const mainThreadTextEditors = new MainThreadTextEditors(this, extHostContext, codeEditorService, bulkEditService, this._editorService, this._editorGroupService);
+		const mainThreadTextEditors = this._toDispose.add(new MainThreadTextEditors(this, extHostContext, codeEditorService, bulkEditService, this._editorService, this._editorGroupService));
 		extHostContext.set(MainContext.MainThreadTextEditors, mainThreadTextEditors);
 
 		// It is expected that the ctor of the state computer calls our `_onDelta`.
-		this._stateComputer = new MainThreadDocumentAndEditorStateComputer(delta => this._onDelta(delta), _modelService, codeEditorService, this._editorService, panelService);
-
-		this._toDispose = [
-			mainThreadDocuments,
-			mainThreadTextEditors,
-			this._stateComputer,
-			this._onTextEditorAdd,
-			this._onTextEditorRemove,
-			this._onDocumentAdd,
-			this._onDocumentRemove,
-		];
+		this._toDispose.add(new MainThreadDocumentAndEditorStateComputer(delta => this._onDelta(delta), _modelService, codeEditorService, this._editorService, panelService));
+
+		this._toDispose.add(this._onTextEditorAdd);
+		this._toDispose.add(this._onTextEditorRemove);
+		this._toDispose.add(this._onDocumentAdd);
+		this._toDispose.add(this._onDocumentRemove);
 	}
 
 	dispose(): void {
-		this._toDispose = dispose(this._toDispose);
+		this._toDispose.dispose();
 	}
 
 	private _onDelta(delta: DocumentAndEditorStateDelta): void {

src/vs/workbench/api/browser/mainThreadEditor.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Emitter, Event } from 'vs/base/common/event';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { RenderLineNumbersType, TextEditorCursorStyle, cursorStyleToString } from 'vs/editor/common/config/editorOptions';
 import { IRange, Range } from 'vs/editor/common/core/range';
@@ -173,10 +173,10 @@ export class MainThreadTextEditor {
 	private readonly _id: string;
 	private _model: ITextModel;
 	private readonly _modelService: IModelService;
-	private _modelListeners: IDisposable[];
+	private readonly _modelListeners = new DisposableStore();
 	private _codeEditor: ICodeEditor | null;
 	private readonly _focusTracker: IFocusTracker;
-	private _codeEditorListeners: IDisposable[];
+	private readonly _codeEditorListeners = new DisposableStore();
 
 	private _properties: MainThreadTextEditorProperties;
 	private readonly _onPropertiesChanged: Emitter<IEditorPropertiesChangeData>;
@@ -193,12 +193,10 @@ export class MainThreadTextEditor {
 		this._codeEditor = null;
 		this._focusTracker = focusTracker;
 		this._modelService = modelService;
-		this._codeEditorListeners = [];
 
 		this._onPropertiesChanged = new Emitter<IEditorPropertiesChangeData>();
 
-		this._modelListeners = [];
-		this._modelListeners.push(this._model.onDidChangeOptions((e) => {
+		this._modelListeners.add(this._model.onDidChangeOptions((e) => {
 			this._updatePropertiesNow(null);
 		}));
 
@@ -208,9 +206,9 @@ export class MainThreadTextEditor {
 
 	public dispose(): void {
 		this._model = null!;
-		this._modelListeners = dispose(this._modelListeners);
+		this._modelListeners.dispose();
 		this._codeEditor = null;
-		this._codeEditorListeners = dispose(this._codeEditorListeners);
+		this._codeEditorListeners.dispose();
 	}
 
 	private _updatePropertiesNow(selectionChangeSource: string | null): void {
@@ -249,36 +247,36 @@ export class MainThreadTextEditor {
 			// Nothing to do...
 			return;
 		}
-		this._codeEditorListeners = dispose(this._codeEditorListeners);
+		this._codeEditorListeners.clear();
 
 		this._codeEditor = codeEditor;
 		if (this._codeEditor) {
 
 			// Catch early the case that this code editor gets a different model set and disassociate from this model
-			this._codeEditorListeners.push(this._codeEditor.onDidChangeModel(() => {
+			this._codeEditorListeners.add(this._codeEditor.onDidChangeModel(() => {
 				this.setCodeEditor(null);
 			}));
 
-			this._codeEditorListeners.push(this._codeEditor.onDidFocusEditorWidget(() => {
+			this._codeEditorListeners.add(this._codeEditor.onDidFocusEditorWidget(() => {
 				this._focusTracker.onGainedFocus();
 			}));
-			this._codeEditorListeners.push(this._codeEditor.onDidBlurEditorWidget(() => {
+			this._codeEditorListeners.add(this._codeEditor.onDidBlurEditorWidget(() => {
 				this._focusTracker.onLostFocus();
 			}));
 
-			this._codeEditorListeners.push(this._codeEditor.onDidChangeCursorSelection((e) => {
+			this._codeEditorListeners.add(this._codeEditor.onDidChangeCursorSelection((e) => {
 				// selection
 				this._updatePropertiesNow(e.source);
 			}));
-			this._codeEditorListeners.push(this._codeEditor.onDidChangeConfiguration(() => {
+			this._codeEditorListeners.add(this._codeEditor.onDidChangeConfiguration(() => {
 				// options
 				this._updatePropertiesNow(null);
 			}));
-			this._codeEditorListeners.push(this._codeEditor.onDidLayoutChange(() => {
+			this._codeEditorListeners.add(this._codeEditor.onDidLayoutChange(() => {
 				// visibleRanges
 				this._updatePropertiesNow(null);
 			}));
-			this._codeEditorListeners.push(this._codeEditor.onDidScrollChange(() => {
+			this._codeEditorListeners.add(this._codeEditor.onDidScrollChange(() => {
 				// visibleRanges
 				this._updatePropertiesNow(null);
 			}));

src/vs/workbench/api/browser/mainThreadEditors.ts

@@ -5,7 +5,7 @@
 
 import { localize } from 'vs/nls';
 import { disposed } from 'vs/base/common/errors';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, DisposableStore } from 'vs/base/common/lifecycle';
 import { equals as objectEquals } from 'vs/base/common/objects';
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
@@ -32,7 +32,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 	private readonly _instanceId: string;
 	private readonly _proxy: ExtHostEditorsShape;
 	private readonly _documentsAndEditors: MainThreadDocumentsAndEditors;
-	private _toDispose: IDisposable[];
+	private readonly _toDispose = new DisposableStore();
 	private _textEditorsListenersMap: { [editorId: string]: IDisposable[]; };
 	private _editorPositionData: ITextEditorPositionData | null;
 	private _registeredDecorationTypes: { [decorationType: string]: boolean; };
@@ -48,16 +48,16 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		this._instanceId = String(++MainThreadTextEditors.INSTANCE_COUNT);
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostEditors);
 		this._documentsAndEditors = documentsAndEditors;
-		this._toDispose = [];
+
 		this._textEditorsListenersMap = Object.create(null);
 		this._editorPositionData = null;
 
-		this._toDispose.push(documentsAndEditors.onTextEditorAdd(editors => editors.forEach(this._onTextEditorAdd, this)));
-		this._toDispose.push(documentsAndEditors.onTextEditorRemove(editors => editors.forEach(this._onTextEditorRemove, this)));
+		this._toDispose.add(documentsAndEditors.onTextEditorAdd(editors => editors.forEach(this._onTextEditorAdd, this)));
+		this._toDispose.add(documentsAndEditors.onTextEditorRemove(editors => editors.forEach(this._onTextEditorRemove, this)));
 
-		this._toDispose.push(this._editorService.onDidVisibleEditorsChange(() => this._updateActiveAndVisibleTextEditors()));
-		this._toDispose.push(this._editorGroupService.onDidRemoveGroup(() => this._updateActiveAndVisibleTextEditors()));
-		this._toDispose.push(this._editorGroupService.onDidMoveGroup(() => this._updateActiveAndVisibleTextEditors()));
+		this._toDispose.add(this._editorService.onDidVisibleEditorsChange(() => this._updateActiveAndVisibleTextEditors()));
+		this._toDispose.add(this._editorGroupService.onDidRemoveGroup(() => this._updateActiveAndVisibleTextEditors()));
+		this._toDispose.add(this._editorGroupService.onDidMoveGroup(() => this._updateActiveAndVisibleTextEditors()));
 
 		this._registeredDecorationTypes = Object.create(null);
 	}
@@ -67,7 +67,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 			dispose(this._textEditorsListenersMap[editorId]);
 		});
 		this._textEditorsListenersMap = Object.create(null);
-		this._toDispose = dispose(this._toDispose);
+		this._toDispose.dispose();
 		for (let decorationType in this._registeredDecorationTypes) {
 			this._codeEditorService.removeDecorationType(decorationType);
 		}

src/vs/workbench/api/browser/mainThreadSCM.ts

@@ -6,7 +6,7 @@
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { Event, Emitter } from 'vs/base/common/event';
 import { assign } from 'vs/base/common/objects';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { ISCMService, ISCMRepository, ISCMProvider, ISCMResource, ISCMResourceGroup, ISCMResourceDecorations, IInputValidation } from 'vs/workbench/contrib/scm/common/scm';
 import { ExtHostContext, MainThreadSCMShape, ExtHostSCMShape, SCMProviderFeatures, SCMRawResourceSplices, SCMGroupFeatures, MainContext, IExtHostContext } from '../common/extHost.protocol';
 import { Command } from 'vs/editor/common/modes';
@@ -268,7 +268,7 @@ export class MainThreadSCM implements MainThreadSCMShape {
 	private readonly _proxy: ExtHostSCMShape;
 	private _repositories: { [handle: number]: ISCMRepository; } = Object.create(null);
 	private _inputDisposables: { [handle: number]: IDisposable; } = Object.create(null);
-	private _disposables: IDisposable[] = [];
+	private readonly _disposables = new DisposableStore();
 
 	constructor(
 		extHostContext: IExtHostContext,
@@ -289,7 +289,7 @@ export class MainThreadSCM implements MainThreadSCMShape {
 			.forEach(id => this._inputDisposables[id].dispose());
 		this._inputDisposables = Object.create(null);
 
-		this._disposables = dispose(this._disposables);
+		this._disposables.dispose();
 	}
 
 	$registerSourceControl(handle: number, id: string, label: string, rootUri: UriComponents | undefined): void {

src/vs/workbench/api/browser/mainThreadSearch.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { CancellationToken } from 'vs/base/common/cancellation';
-import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { dispose, IDisposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { values } from 'vs/base/common/map';
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -96,7 +96,7 @@ class SearchOperation {
 
 class RemoteSearchProvider implements ISearchResultProvider, IDisposable {
 
-	private readonly _registrations: IDisposable[];
+	private readonly _registrations = new DisposableStore();
 	private readonly _searches = new Map<number, SearchOperation>();
 
 	constructor(
@@ -106,11 +106,11 @@ class RemoteSearchProvider implements ISearchResultProvider, IDisposable {
 		private readonly _handle: number,
 		private readonly _proxy: ExtHostSearchShape
 	) {
-		this._registrations = [searchService.registerSearchResultProvider(this._scheme, type, this)];
+		this._registrations.add(searchService.registerSearchResultProvider(this._scheme, type, this));
 	}
 
 	dispose(): void {
-		dispose(this._registrations);
+		this._registrations.dispose();
 	}
 
 	fileSearch(query: IFileQuery, token: CancellationToken = CancellationToken.None): Promise<ISearchComplete> {

src/vs/workbench/api/browser/mainThreadTerminalService.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { ITerminalService, ITerminalInstance, IShellLaunchConfig, ITerminalProcessExtHostProxy, ITerminalProcessExtHostRequest, ITerminalDimensions, EXT_HOST_CREATION_DELAY, IAvailableShellsRequest, IDefaultShellAndArgsRequest } from 'vs/workbench/contrib/terminal/common/terminal';
 import { ExtHostContext, ExtHostTerminalServiceShape, MainThreadTerminalServiceShape, MainContext, IExtHostContext, ShellLaunchConfigDto, TerminalLaunchConfig } from 'vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
@@ -17,7 +17,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 
 	private _proxy: ExtHostTerminalServiceShape;
 	private _remoteAuthority: string | null;
-	private _toDispose: IDisposable[] = [];
+	private readonly _toDispose = new DisposableStore();
 	private _terminalProcesses: { [id: number]: Promise<ITerminalProcessExtHostProxy> } = {};
 	private _terminalProcessesReady: { [id: number]: (proxy: ITerminalProcessExtHostProxy) => void } = {};
 	private _terminalOnDidWriteDataListeners: { [id: number]: IDisposable } = {};
@@ -33,7 +33,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 		this._remoteAuthority = extHostContext.remoteAuthority;
 
 		// ITerminalService listeners
-		this._toDispose.push(_terminalService.onInstanceCreated((instance) => {
+		this._toDispose.add(_terminalService.onInstanceCreated((instance) => {
 			// Delay this message so the TerminalInstance constructor has a chance to finish and
 			// return the ID normally to the extension host. The ID that is passed here will be used
 			// to register non-extension API terminals in the extension host.
@@ -42,20 +42,21 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 				this._onInstanceDimensionsChanged(instance);
 			}, EXT_HOST_CREATION_DELAY);
 		}));
-		this._toDispose.push(_terminalService.onInstanceDisposed(instance => this._onTerminalDisposed(instance)));
-		this._toDispose.push(_terminalService.onInstanceProcessIdReady(instance => this._onTerminalProcessIdReady(instance)));
-		this._toDispose.push(_terminalService.onInstanceDimensionsChanged(instance => this._onInstanceDimensionsChanged(instance)));
-		this._toDispose.push(_terminalService.onInstanceMaximumDimensionsChanged(instance => this._onInstanceMaximumDimensionsChanged(instance)));
-		this._toDispose.push(_terminalService.onInstanceRequestExtHostProcess(request => this._onTerminalRequestExtHostProcess(request)));
-		this._toDispose.push(_terminalService.onInstanceRequestVirtualProcess(proxy => this._onTerminalRequestVirtualProcess(proxy)));
-		this._toDispose.push(_terminalService.onActiveInstanceChanged(instance => this._onActiveTerminalChanged(instance ? instance.id : null)));
-		this._toDispose.push(_terminalService.onInstanceTitleChanged(instance => this._onTitleChanged(instance.id, instance.title)));
-		this._toDispose.push(_terminalService.configHelper.onWorkspacePermissionsChanged(isAllowed => this._onWorkspacePermissionsChanged(isAllowed)));
-		this._toDispose.push(_terminalService.onRequestAvailableShells(e => this._onRequestAvailableShells(e)));
+
+		this._toDispose.add(_terminalService.onInstanceDisposed(instance => this._onTerminalDisposed(instance)));
+		this._toDispose.add(_terminalService.onInstanceProcessIdReady(instance => this._onTerminalProcessIdReady(instance)));
+		this._toDispose.add(_terminalService.onInstanceDimensionsChanged(instance => this._onInstanceDimensionsChanged(instance)));
+		this._toDispose.add(_terminalService.onInstanceMaximumDimensionsChanged(instance => this._onInstanceMaximumDimensionsChanged(instance)));
+		this._toDispose.add(_terminalService.onInstanceRequestExtHostProcess(request => this._onTerminalRequestExtHostProcess(request)));
+		this._toDispose.add(_terminalService.onInstanceRequestVirtualProcess(proxy => this._onTerminalRequestVirtualProcess(proxy)));
+		this._toDispose.add(_terminalService.onActiveInstanceChanged(instance => this._onActiveTerminalChanged(instance ? instance.id : null)));
+		this._toDispose.add(_terminalService.onInstanceTitleChanged(instance => this._onTitleChanged(instance.id, instance.title)));
+		this._toDispose.add(_terminalService.configHelper.onWorkspacePermissionsChanged(isAllowed => this._onWorkspacePermissionsChanged(isAllowed)));
+		this._toDispose.add(_terminalService.onRequestAvailableShells(e => this._onRequestAvailableShells(e)));
 
 		// ITerminalInstanceService listeners
 		if (terminalInstanceService.onRequestDefaultShellAndArgs) {
-			this._toDispose.push(terminalInstanceService.onRequestDefaultShellAndArgs(e => this._onRequestDefaultShellAndArgs(e)));
+			this._toDispose.add(terminalInstanceService.onRequestDefaultShellAndArgs(e => this._onRequestDefaultShellAndArgs(e)));
 		}
 
 		// Set initial ext host state
@@ -72,7 +73,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 	}
 
 	public dispose(): void {
-		this._toDispose = dispose(this._toDispose);
+		this._toDispose.dispose();
 
 		// TODO@Daniel: Should all the previously created terminals be disposed
 		// when the extension host process goes down ?

src/vs/workbench/api/browser/mainThreadWindow.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Event } from 'vs/base/common/event';
-import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { IWindowService, IWindowsService } from 'vs/platform/windows/common/windows';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
@@ -17,7 +17,7 @@ import { extractLocalHostUriMetaDataForPortMapping } from 'vs/workbench/contrib/
 export class MainThreadWindow implements MainThreadWindowShape {
 
 	private readonly proxy: ExtHostWindowShape;
-	private disposables: IDisposable[] = [];
+	private readonly disposables = new DisposableStore();
 	private readonly _tunnels = new Map<number, Promise<RemoteTunnel>>();
 
 	constructor(
@@ -34,7 +34,7 @@ export class MainThreadWindow implements MainThreadWindowShape {
 	}
 
 	dispose(): void {
-		this.disposables = dispose(this.disposables);
+		this.disposables.dispose();
 
 		for (const tunnel of this._tunnels.values()) {
 			tunnel.then(tunnel => tunnel.dispose());

src/vs/workbench/api/browser/mainThreadWorkspace.ts

@@ -5,7 +5,7 @@
 
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import { isPromiseCanceledError } from 'vs/base/common/errors';
-import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
@@ -28,7 +28,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 @extHostNamedCustomer(MainContext.MainThreadWorkspace)
 export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 
-	private readonly _toDispose: IDisposable[] = [];
+	private readonly _toDispose = new DisposableStore();
 	private readonly _activeCancelTokens: { [id: number]: CancellationTokenSource } = Object.create(null);
 	private readonly _proxy: ExtHostWorkspaceShape;
 	private readonly _queryBuilder = this._instantiationService.createInstance(QueryBuilder);
@@ -52,7 +52,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 	}
 
 	dispose(): void {
-		dispose(this._toDispose);
+		this._toDispose.dispose();
 
 		for (let requestId in this._activeCancelTokens) {
 			const tokenSource = this._activeCancelTokens[requestId];

src/vs/workbench/browser/parts/views/media/views.css

@@ -152,6 +152,7 @@
 .customview-tree .monaco-tree .custom-view-tree-node-item > .custom-view-tree-node-item-resourceLabel > .actions .action-label {
 	width: 16px;
 	height: 100%;
+	background-size: 16px;
 	background-position: 50% 50%;
 	background-repeat: no-repeat;
 }
\ No newline at end of file

src/vs/workbench/contrib/debug/browser/media/current-and-breakpoint.svg

 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 8C10 8.39556 9.8827 8.78224 9.66294 9.11114C9.44318 9.44004 9.13082 9.69638 8.76537 9.84776C8.39992 9.99913 7.99778 10.0387 7.60982 9.96157C7.22186 9.8844 6.86549 9.69392 6.58579 9.41421C6.30608 9.13451 6.1156 8.77814 6.03843 8.39018C5.96126 8.00222 6.00087 7.60009 6.15224 7.23463C6.30362 6.86918 6.55996 6.55682 6.88886 6.33706C7.21776 6.1173 7.60444 6 8 6C8.53043 6 9.03914 6.21071 9.41421 6.58579C9.78929 6.96086 10 7.46957 10 8Z" fill="#FFCC00"/>
+<path d="M10 8C10 8.39556 9.8827 8.78224 9.66294 9.11114C9.44318 9.44004 9.13082 9.69638 8.76537 9.84776C8.39992 9.99913 7.99778 10.0387 7.60982 9.96157C7.22186 9.8844 6.86549 9.69392 6.58579 9.41421C6.30608 9.13451 6.1156 8.77814 6.03843 8.39018C5.96126 8.00222 6.00087 7.60009 6.15224 7.23463C6.30362 6.86918 6.55996 6.55682 6.88886 6.33706C7.21776 6.1173 7.60444 6 8 6C8.53043 6 9.03914 6.21071 9.41421 6.58579C9.78929 6.96086 10 7.46957 10 8Z" fill="#E51400"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M3 3.25L4.25 2H9.30677L10.2355 2.41331L14.4986 7.14518L14.5 8.81702L10.2368 13.5647L9.30677 13.9796H4.25L3 12.7296V3.25ZM4.25 12.7296V3.25H9.30677L13.5699 7.98187L9.30677 12.7296H4.25Z" fill="#FFCC00"/>
 </svg>

src/vs/workbench/contrib/debug/browser/media/stackframe-and-breakpoint.svg

 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 8C10 8.39556 9.8827 8.78224 9.66294 9.11114C9.44318 9.44004 9.13082 9.69638 8.76537 9.84776C8.39992 9.99913 7.99778 10.0387 7.60982 9.96157C7.22186 9.8844 6.86549 9.69392 6.58579 9.41421C6.30608 9.13451 6.1156 8.77814 6.03843 8.39018C5.96126 8.00222 6.00087 7.60009 6.15224 7.23463C6.30362 6.86918 6.55996 6.55682 6.88886 6.33706C7.21776 6.1173 7.60444 6 8 6C8.53043 6 9.03914 6.21071 9.41421 6.58579C9.78929 6.96086 10 7.46957 10 8Z" fill="#89D185"/>
+<path d="M10 8C10 8.39556 9.8827 8.78224 9.66294 9.11114C9.44318 9.44004 9.13082 9.69638 8.76537 9.84776C8.39992 9.99913 7.99778 10.0387 7.60982 9.96157C7.22186 9.8844 6.86549 9.69392 6.58579 9.41421C6.30608 9.13451 6.1156 8.77814 6.03843 8.39018C5.96126 8.00222 6.00087 7.60009 6.15224 7.23463C6.30362 6.86918 6.55996 6.55682 6.88886 6.33706C7.21776 6.1173 7.60444 6 8 6C8.53043 6 9.03914 6.21071 9.41421 6.58579C9.78929 6.96086 10 7.46957 10 8Z" fill="#E51400"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M3 3.25L4.25 2H9.30677L10.2355 2.41331L14.4986 7.14518L14.5 8.81702L10.2368 13.5647L9.30677 13.9796H4.25L3 12.7296V3.25ZM4.25 12.7296V3.25H9.30677L13.5699 7.98187L9.30677 12.7296H4.25Z" fill="#89D185"/>
 </svg>

src/vs/workbench/contrib/experiments/electron-browser/experimentService.ts

@@ -77,8 +77,10 @@ export enum ExperimentActionType {
 	ExtensionSearchResults = 'ExtensionSearchResults'
 }
 
+export type LocalizedPromptText = { [locale: string]: string; };
+
 export interface IExperimentActionPromptProperties {
-	promptText: string | { [key: string]: string };
+	promptText: string | LocalizedPromptText;
 	commands: IExperimentActionPromptCommand[];
 }
 

src/vs/workbench/contrib/experiments/test/electron-browser/experimentalPrompts.test.ts

@@ -13,7 +13,7 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
 import { ExperimentalPrompts } from 'vs/workbench/contrib/experiments/electron-browser/experimentalPrompt';
-import { ExperimentActionType, ExperimentState, IExperiment, IExperimentActionPromptProperties, IExperimentService } from 'vs/workbench/contrib/experiments/electron-browser/experimentService';
+import { ExperimentActionType, ExperimentState, IExperiment, IExperimentActionPromptProperties, IExperimentService, LocalizedPromptText } from 'vs/workbench/contrib/experiments/electron-browser/experimentService';
 import { TestExperimentService } from 'vs/workbench/contrib/experiments/test/electron-browser/experimentService.test';
 import { TestLifecycleService } from 'vs/workbench/test/workbenchTestServices';
 
@@ -185,12 +185,13 @@ suite('Experimental Prompts', () => {
 		};
 
 		assert.equal(ExperimentalPrompts.getLocalizedText(simpleTextCase.promptText, 'any-language'), simpleTextCase.promptText);
-		assert.equal(ExperimentalPrompts.getLocalizedText(multipleLocaleCase.promptText, 'en'), multipleLocaleCase.promptText['en']);
-		assert.equal(ExperimentalPrompts.getLocalizedText(multipleLocaleCase.promptText, 'de'), multipleLocaleCase.promptText['de']);
-		assert.equal(ExperimentalPrompts.getLocalizedText(multipleLocaleCase.promptText, 'en-au'), multipleLocaleCase.promptText['en-au']);
-		assert.equal(ExperimentalPrompts.getLocalizedText(multipleLocaleCase.promptText, 'en-gb'), multipleLocaleCase.promptText['en']);
-		assert.equal(ExperimentalPrompts.getLocalizedText(multipleLocaleCase.promptText, 'fr'), multipleLocaleCase.promptText['en']);
-		assert.equal(ExperimentalPrompts.getLocalizedText(englishUSTextCase.promptText, 'fr'), englishUSTextCase.promptText['en-us']);
+		const multipleLocalePromptText = multipleLocaleCase.promptText as LocalizedPromptText;
+		assert.equal(ExperimentalPrompts.getLocalizedText(multipleLocaleCase.promptText, 'en'), multipleLocalePromptText['en']);
+		assert.equal(ExperimentalPrompts.getLocalizedText(multipleLocaleCase.promptText, 'de'), multipleLocalePromptText['de']);
+		assert.equal(ExperimentalPrompts.getLocalizedText(multipleLocaleCase.promptText, 'en-au'), multipleLocalePromptText['en-au']);
+		assert.equal(ExperimentalPrompts.getLocalizedText(multipleLocaleCase.promptText, 'en-gb'), multipleLocalePromptText['en']);
+		assert.equal(ExperimentalPrompts.getLocalizedText(multipleLocaleCase.promptText, 'fr'), multipleLocalePromptText['en']);
+		assert.equal(ExperimentalPrompts.getLocalizedText(englishUSTextCase.promptText, 'fr'), (englishUSTextCase.promptText as LocalizedPromptText)['en-us']);
 		assert.equal(!!ExperimentalPrompts.getLocalizedText(noEnglishTextCase.promptText, 'fr'), false);
 	});
 });

src/vs/workbench/contrib/webview/common/resourceLoader.ts

@@ -5,7 +5,7 @@
 
 import { VSBuffer } from 'vs/base/common/buffer';
 import { sep } from 'vs/base/common/path';
-import { startsWith } from 'vs/base/common/strings';
+import { startsWith, endsWith } from 'vs/base/common/strings';
 import { URI } from 'vs/base/common/uri';
 import { IFileService } from 'vs/platform/files/common/files';
 import { REMOTE_HOST_SCHEME } from 'vs/platform/remote/common/remoteHosts';
@@ -45,10 +45,11 @@ export async function loadLocalResource(
 	extensionLocation: URI | undefined,
 	getRoots: () => ReadonlyArray<URI>
 ): Promise<LocalResourceResponse> {
-	const requestPath = requestUri.path;
+	const requestPath = requestUri.authority ? `//${requestUri.authority}${requestUri.path}` : requestUri.path;
 	const normalizedPath = URI.file(requestPath);
 	for (const root of getRoots()) {
-		if (!startsWith(normalizedPath.fsPath, root.fsPath + sep)) {
+		const rootPath = root.fsPath + (endsWith(root.fsPath, sep) ? '' : sep);
+		if (!startsWith(normalizedPath.fsPath, rootPath)) {
 			continue;
 		}
 

src/vs/workbench/contrib/welcome/gettingStarted/electron-browser/telemetryOptOut.ts

@@ -96,7 +96,7 @@ export class TelemetryOptOut implements IWorkbenchContribution {
 
 				return this.galleryService.getCoreTranslation(extensionToFetchTranslationsFrom, locale!)
 					.then(translation => {
-						const translationsFromPack = translation && translation.contents ? translation.contents['vs/workbench/contrib/welcome/gettingStarted/electron-browser/telemetryOptOut'] : {};
+						const translationsFromPack: any = translation && translation.contents ? translation.contents['vs/workbench/contrib/welcome/gettingStarted/electron-browser/telemetryOptOut'] : {};
 						if (!!translationsFromPack[promptMessageKey] && !!translationsFromPack[yesLabelKey] && !!translationsFromPack[noLabelKey]) {
 							promptMessage = translationsFromPack[promptMessageKey].replace('{0}', this.privacyUrl) + ' (Please help Microsoft improve Visual Studio Code by allowing the collection of usage data.)';
 							yesLabel = translationsFromPack[yesLabelKey] + ' (Yes)';

src/vs/workbench/services/keybinding/browser/keybindingService.ts

@@ -675,8 +675,8 @@ function updateSchema() {
 	};
 
 	const allCommands = CommandsRegistry.getCommands();
-	for (let commandId in allCommands) {
-		const commandDescription = allCommands[commandId].description;
+	for (const [commandId, command] of allCommands) {
+		const commandDescription = command.description;
 
 		addKnownCommand(commandId, commandDescription ? commandDescription.description : undefined);
 
@@ -704,7 +704,7 @@ function updateSchema() {
 	}
 
 	const menuCommands = MenuRegistry.getCommands();
-	for (let commandId in menuCommands) {
+	for (const commandId of menuCommands.keys()) {
 		addKnownCommand(commandId);
 	}
 }

src/vs/workbench/services/preferences/common/keybindingsEditorModel.ts

@@ -210,7 +210,7 @@ export class KeybindingsEditorModel extends EditorModel {
 	}
 
 	private static toKeybindingEntry(command: string, keybindingItem: ResolvedKeybindingItem, workbenchActionsRegistry: IWorkbenchActionRegistry, editorActions: { [id: string]: string; }): IKeybindingItem {
-		const menuCommand = MenuRegistry.getCommand(command);
+		const menuCommand = MenuRegistry.getCommand(command)!;
 		const editorActionLabel = editorActions[command];
 		return <IKeybindingItem>{
 			keybinding: keybindingItem.resolvedKeybinding,

src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts

@@ -121,9 +121,10 @@ export class RipgrepTextSearchEngine {
  * "failed" when a fatal error was produced.
  */
 export function rgErrorMsgForDisplay(msg: string): Maybe<SearchError> {
-	const firstLine = msg.split('\n')[0].trim();
+	const lines = msg.split('\n');
+	const firstLine = lines[0].trim();
 
-	if (startsWith(firstLine, 'regex parse error')) {
+	if (lines.some(l => startsWith(l, 'regex parse error'))) {
 		return new SearchError('Regex parse error', SearchErrorCode.regexParseError);
 	}
 
@@ -415,18 +416,19 @@ function getRgArgs(query: TextSearchQuery, options: TextSearchOptions): string[]
 		}
 	}
 
+	// Allow $ to match /r/n
+	args.push('--crlf');
+
 	let searchPatternAfterDoubleDashes: Maybe<string>;
 	if (query.isWordMatch) {
 		const regexp = createRegExp(pattern, !!query.isRegExp, { wholeWord: query.isWordMatch });
 		const regexpStr = regexp.source.replace(/\\\//g, '/'); // RegExp.source arbitrarily returns escaped slashes. Search and destroy.
 		args.push('--regexp', regexpStr);
 	} else if (query.isRegExp) {
-		let fixedRegexpQuery = fixRegexEndingPattern(query.pattern);
-		fixedRegexpQuery = fixRegexNewline(fixedRegexpQuery);
+		let fixedRegexpQuery = fixRegexNewline(query.pattern);
 		fixedRegexpQuery = fixNewline(fixedRegexpQuery);
-		fixedRegexpQuery = fixRegexCRMatchingNonWordClass(fixedRegexpQuery, !!query.isMultiline);
-		fixedRegexpQuery = fixRegexCRMatchingWhitespaceClass(fixedRegexpQuery, !!query.isMultiline);
 		args.push('--regexp', fixedRegexpQuery);
+		args.push('--auto-hybrid-regex');
 	} else {
 		searchPatternAfterDoubleDashes = pattern;
 		args.push('--fixed-strings');
@@ -508,32 +510,12 @@ export interface IRgSubmatch {
 
 export type IRgBytesOrText = { bytes: string } | { text: string };
 
-export function fixRegexEndingPattern(pattern: string): string {
-	// Replace an unescaped $ at the end of the pattern with \r?$
-	// Match $ preceeded by none or even number of literal \
-	return pattern.match(/([^\\]|^)(\\\\)*\$$/) ?
-		pattern.replace(/\$$/, '\\r?$') :
-		pattern;
-}
-
 export function fixRegexNewline(pattern: string): string {
 	// Replace an unescaped $ at the end of the pattern with \r?$
 	// Match $ preceeded by none or even number of literal \
 	return pattern.replace(/([^\\]|^)(\\\\)*\\n/g, '$1$2\\r?\\n');
 }
 
-export function fixRegexCRMatchingWhitespaceClass(pattern: string, isMultiline: boolean): string {
-	return isMultiline ?
-		pattern.replace(/([^\\]|^)((?:\\\\)*)\\s/g, '$1$2(\\r?\\n|[^\\S\\r])') :
-		pattern.replace(/([^\\]|^)((?:\\\\)*)\\s/g, '$1$2[ \\t\\f]');
-}
-
-export function fixRegexCRMatchingNonWordClass(pattern: string, isMultiline: boolean): string {
-	return isMultiline ?
-		pattern.replace(/([^\\]|^)((?:\\\\)*)\\W/g, '$1$2(\\r?\\n|[^\\w\\r])') :
-		pattern.replace(/([^\\]|^)((?:\\\\)*)\\W/g, '$1$2[^\\w\\r]');
-}
-
 export function fixNewline(pattern: string): string {
 	return pattern.replace(/\n/g, '\\r?\\n');
 }

src/vs/workbench/services/search/test/node/ripgrepTextSearchEngine.test.ts

@@ -6,7 +6,7 @@
 import * as assert from 'assert';
 import { joinPath } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
-import { fixRegexCRMatchingNonWordClass, fixRegexCRMatchingWhitespaceClass, fixRegexEndingPattern, fixRegexNewline, IRgMatch, IRgMessage, RipgrepParser, unicodeEscapesToPCRE2, fixNewline } from 'vs/workbench/services/search/node/ripgrepTextSearchEngine';
+import { fixRegexNewline, IRgMatch, IRgMessage, RipgrepParser, unicodeEscapesToPCRE2, fixNewline } from 'vs/workbench/services/search/node/ripgrepTextSearchEngine';
 import { Range, TextSearchResult } from 'vs/workbench/services/search/common/searchExtTypes';
 
 suite('RipgrepTextSearchEngine', () => {
@@ -24,70 +24,6 @@ suite('RipgrepTextSearchEngine', () => {
 		assert.equal(unicodeEscapesToPCRE2(''), '');
 	});
 
-	test('fixRegexEndingPattern', () => {
-		function testFixRegexEndingPattern([input, expectedResult]: string[]): void {
-			assert.equal(fixRegexEndingPattern(input), expectedResult);
-		}
-
-		[
-			['foo', 'foo'],
-			['', ''],
-			['^foo.*bar\\s+', '^foo.*bar\\s+'],
-			['foo$', 'foo\\r?$'],
-			['$', '\\r?$'],
-			['foo\\$', 'foo\\$'],
-			['foo\\\\$', 'foo\\\\\\r?$'],
-		].forEach(testFixRegexEndingPattern);
-	});
-
-	test('fixRegexCRMatchingWhitespaceClass', () => {
-		function testFixRegexCRMatchingWhitespaceClass([inputReg, isMultiline, testStr, shouldMatch]: [string, boolean, string, boolean]): void {
-			const fixed = fixRegexCRMatchingWhitespaceClass(inputReg, isMultiline);
-			const reg = new RegExp(fixed);
-			assert.equal(reg.test(testStr), shouldMatch, `${inputReg} => ${reg}, ${testStr}, ${shouldMatch}`);
-		}
-
-		[
-			['foo', false, 'foo', true],
-
-			['foo\\s', false, 'foo\r\n', false],
-			['foo\\sabc', true, 'foo\r\nabc', true],
-
-			['foo\\s', false, 'foo\n', false],
-			['foo\\s', true, 'foo\n', true],
-
-			['foo\\s\\n', true, 'foo\r\n', false],
-			['foo\\r\\s', true, 'foo\r\n', true],
-
-			['foo\\s+abc', true, 'foo   \r\nabc', true],
-			['foo\\s+abc', false, 'foo   \t   abc', true],
-		].forEach(testFixRegexCRMatchingWhitespaceClass);
-	});
-
-	test('fixRegexCRMatchingNonWordClass', () => {
-		function testRegexCRMatchingNonWordClass([inputReg, isMultiline, testStr, shouldMatch]: [string, boolean, string, boolean]): void {
-			const fixed = fixRegexCRMatchingNonWordClass(inputReg, isMultiline);
-			const reg = new RegExp(fixed);
-			assert.equal(reg.test(testStr), shouldMatch, `${inputReg} => ${reg}, ${testStr}, ${shouldMatch}`);
-		}
-
-		[
-			['foo', false, 'foo', true],
-
-			['foo\\W', false, 'foo\r\n', false],
-			['foo\\Wabc', true, 'foo\r\nabc', true],
-
-			['foo\\W', false, 'foo\n', true],
-			['foo\\W', true, 'foo\n', true],
-
-			['foo\\W\\n', true, 'foo\r\n', false],
-			['foo\\r\\W', true, 'foo\r\n', true],
-
-			['foo\\W+abc', true, 'foo   \r\nabc', true],
-			['foo\\W+abc', false, 'foo .-\t   abc', true],
-		].forEach(testRegexCRMatchingNonWordClass);
-	});
-
 	test('fixRegexNewline', () => {
 		function testFixRegexNewline([inputReg, testStr, shouldMatch]: [string, string, boolean]): void {
 			const fixed = fixRegexNewline(inputReg);

src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts

@@ -378,7 +378,7 @@ suite('Search-integration', function () {
 				folderQueries: ROOT_FOLDER_QUERY,
 				contentPattern: { pattern: 'foo' },
 				includePattern: {
-					'***': true
+					'{{}': true
 				}
 			};
 
@@ -386,26 +386,10 @@ suite('Search-integration', function () {
 				throw new Error('expected fail');
 			}, err => {
 				const searchError = deserializeSearchError(err.message);
-				assert.equal(searchError.message, 'Error parsing glob \'***\': invalid use of **; must be one path component');
+				assert.equal(searchError.message, 'Error parsing glob \'/{{}\': nested alternate groups are not allowed');
 				assert.equal(searchError.code, SearchErrorCode.globParseError);
 			});
 		});
-
-		test('invalid literal', () => {
-			const config: ITextQuery = {
-				type: QueryType.Text,
-				folderQueries: ROOT_FOLDER_QUERY,
-				contentPattern: { pattern: 'foo\nbar', isRegExp: true }
-			};
-
-			return doSearchTest(config, 0).then(() => {
-				throw new Error('expected fail');
-			}, err => {
-				const searchError = deserializeSearchError(err.message);
-				assert.equal(searchError.message, 'The literal \'"\\n"\' is not allowed in a regex');
-				assert.equal(searchError.code, SearchErrorCode.invalidLiteral);
-			});
-		});
 	});
 });
 

src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts

@@ -68,10 +68,11 @@ suite('ExtHostLanguageFeatureCommands', function () {
 			instantiationService.stub(ICommandService, {
 				_serviceBrand: undefined,
 				executeCommand(id: string, args: any): any {
-					if (!CommandsRegistry.getCommands()[id]) {
+					const command = CommandsRegistry.getCommands().get(id);
+					if (!command) {
 						return Promise.reject(new Error(id + ' NOT known'));
 					}
-					let { handler } = CommandsRegistry.getCommands()[id];
+					const { handler } = command;
 					return Promise.resolve(instantiationService.invokeFunction(handler, args));
 				}
 			});

yarn.lock

@@ -9490,10 +9490,10 @@ vscode-proxy-agent@0.4.0:
     https-proxy-agent "2.2.1"
     socks-proxy-agent "4.0.1"
 
-vscode-ripgrep@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.2.5.tgz#2093c8f36d52bd2dab9eb45b003dd02533c5499c"
-  integrity sha512-n5XBm9od5hahpljw9T8wbkuMnAY7LlAG1OyEEtcCZEX9aCHFuBKSP0IcvciGRTbtWRovNuT83A2iRjt6PL3bLg==
+vscode-ripgrep@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.3.1.tgz#51fb93debcd0c18a8b90dbc37f84f94333d0c486"
+  integrity sha512-4WLB/n4ZeWNi5AEzPTkfYrqbKtXlv0SlgmxbRVdulwZzGx/lfWeWPu9Shy32orM27IofQAQDuirbRBOYNJVzBA==
 
 vscode-sqlite3@4.0.7:
   version "4.0.7"