Merge VS Code 1.31.1 (#4283)

2026-01-13 17:22:15 -05:00 · 2019-03-15 13:09:45 -07:00
parent 7d31575149
commit 86bac90001
1716 changed files with 53308 additions and 48375 deletions
--- a/test/all.js
+++ b/test/all.js
@@ -55,11 +55,11 @@ function main() {
 		baseUrl: path.join(path.dirname(__dirname), 'src'),
 		paths: {
 			'vs/css': '../test/css.mock',
-			'vs': `../${ out }/vs`,
-			'sqltest': `../${ out }/sqltest`,
-			'sql': `../${ out }/sql`,
-			'lib': `../${ out }/lib`,
-			'bootstrap-fork': `../${ out }/bootstrap-fork`
+			'vs': `../${out}/vs`,
+			'sqltest': `../${out}/sqltest`,
+			'sql': `../${out}/sql`,
+			'lib': `../${out}/lib`,
+			'bootstrap-fork': `../${out}/bootstrap-fork`
 		},
 		catchError: true,
 		// {{SQL CARBON EDIT}}
@@ -101,12 +101,12 @@ function main() {
 			}

 			if (argv.forceLoad) {
-        // {{SQL CARBON EDIT}}
+				// {{SQL CARBON EDIT}}
 				var allFiles = glob.sync(out + '/sqltest/**/*.js');
-				allFiles = allFiles.map(function(source) {
+				allFiles = allFiles.map(function (source) {
 					return path.join(__dirname, '..', source);
 				});
-				allFiles = allFiles.filter(function(source) {
+				allFiles = allFiles.filter(function (source) {
 					if (seenSources[source]) {
 						return false;
 					}
@@ -118,7 +118,7 @@ function main() {
 					}
 					return true;
 				});
-				allFiles.forEach(function(source, index) {
+				allFiles.forEach(function (source, index) {
 					var contents = fs.readFileSync(source).toString();
 					contents = instrumenter.instrumentSync(contents, source);
 					var stopAt = contents.indexOf('}\n__cov');
@@ -130,18 +130,19 @@ function main() {
 				});
 			}

+			// {{SQL CARBON EDIT}}
 			let remapIgnores = /\b((winjs\.base)|(filters\.perf\.data)|(performance)|(marked)|(raw\.marked)|(nls)|(css))\.js$/;

 			var remappedCoverage = i_remap(global.__coverage__, { exclude: remapIgnores }).getFinalCoverage();

 			// The remapped coverage comes out with broken paths
-			var toUpperDriveLetter = function(str) {
+			var toUpperDriveLetter = function (str) {
 				if (/^[a-z]:/.test(str)) {
 					return str.charAt(0).toUpperCase() + str.substr(1);
 				}
 				return str;
 			};
-			var toLowerDriveLetter = function(str) {
+			var toLowerDriveLetter = function (str) {
 				if (/^[A-Z]:/.test(str)) {
 					return str.charAt(0).toLowerCase() + str.substr(1);
 				}
@@ -149,7 +150,7 @@ function main() {
 			};

 			var REPO_PATH = toUpperDriveLetter(path.join(__dirname, '..'));
-			var fixPath = function(brokenPath) {
+			var fixPath = function (brokenPath) {
 				var startIndex = brokenPath.indexOf(REPO_PATH);
 				if (startIndex === -1) {
 					return toLowerDriveLetter(brokenPath);
@@ -183,7 +184,7 @@ function main() {
 			}
 			var reporter = new istanbul.Reporter(null, coveragePath);
 			reporter.addAll(reportTypes);
-			reporter.write(collector, true, function () {});
+			reporter.write(collector, true, function () { });
 		});
 	}

@@ -231,7 +232,7 @@ function main() {
 		};
 	} else if (argv.run) {
 		var tests = (typeof argv.run === 'string') ? [argv.run] : argv.run;
-		var modulesToLoad = tests.map(function(test) {
+		var modulesToLoad = tests.map(function (test) {
 			test = test.replace(/^src/, 'out');
 			test = test.replace(/\.ts$/, '.js');
 			return path.relative(src, path.resolve(test)).replace(/(\.js)|(\.js\.map)$/, '').replace(/\\/g, '/');
@@ -240,12 +241,12 @@ function main() {
 			define(modulesToLoad, () => cb(null), cb);
 		};
 	} else if (argv['only-monaco-editor']) {
-		loadFunc = function(cb) {
+		loadFunc = function (cb) {
 			glob(TEST_GLOB, { cwd: src }, function (err, files) {
 				var modulesToLoad = files.map(function (file) {
 					return file.replace(/\.js$/, '');
 				});
-				modulesToLoad = modulesToLoad.filter(function(module) {
+				modulesToLoad = modulesToLoad.filter(function (module) {
 					if (/^vs\/workbench\//.test(module)) {
 						return false;
 					}
@@ -262,7 +263,7 @@ function main() {
 			});
 		};
 	} else {
-		loadFunc = function(cb) {
+		loadFunc = function (cb) {
 			glob(TEST_GLOB, { cwd: src }, function (err, files) {
 				var modulesToLoad = files.map(function (file) {
 					return file.replace(/\.js$/, '');
@@ -272,7 +273,7 @@ function main() {
 		};
 	}

-	loadFunc(function(err) {
+	loadFunc(function (err) {
 		if (err) {
 			console.error(err);
 			return process.exit(1);
@@ -309,7 +310,7 @@ function main() {
 		*/

 		// replace the default unexpected error handler to be useful during tests
-		loader(['vs/base/common/errors'], function(errors) {
+		loader(['vs/base/common/errors'], function (errors) {
 			errors.setUnexpectedErrorHandler(function (err) {
 				let stack = (err && err.stack) || (new Error().stack);
        // {{SQL CARBON EDIT}}
@@ -326,4 +327,4 @@ if (process.argv.some(function (a) { return /^--browser/.test(a); })) {
 	require('./browser');
 } else {
 	main();
-}
+}
--- a/test/assert.js
+++ b/test/assert.js
@@ -79,7 +79,7 @@ var util = {
    return typeof arg === 'symbol';
  },
  isUndefined: function(arg) {
-    return arg === void 0;
+    return arg === undefined;
  },
  isRegExp: function(re) {
    return util.isObject(re) && util.objectToString(re) === '[object RegExp]';
--- a/test/electron/renderer.js
+++ b/test/electron/renderer.js
@@ -94,7 +94,7 @@ function createCoverageReport(opts) {
 			return resolve(undefined);
 		}

-		const exclude = /\b((winjs\.base)|(marked)|(raw\.marked)|(nls)|(css))\.js$/;
+		const exclude = /\b((marked)|(raw\.marked)|(nls)|(css))\.js$/;
 		const remappedCoverage = i_remap(global.__coverage__, { exclude: exclude }).getFinalCoverage();

 		// The remapped coverage comes out with broken paths
--- a/test/smoke/package.json
+++ b/test/smoke/package.json
@@ -22,7 +22,7 @@
    "@types/webdriverio": "4.6.1",
    "concurrently": "^3.5.1",
    "cpx": "^1.5.0",
-    "electron": "^2.0.12",
+    "electron": "3.1.2",
    "htmlparser2": "^3.9.2",
    "mkdirp": "^0.5.1",
    "mocha": "^5.2.0",
--- a/test/smoke/src/application.ts
+++ b/test/smoke/src/application.ts
@@ -96,6 +96,7 @@ export class Application {

 	async stop(): Promise<any> {
 		if (this._code) {
+			await this._code.exit();
 			this._code.dispose();
 			this._code = undefined;
 		}
--- a/test/smoke/src/areas/debug/debugSmoke.ts
+++ b/test/smoke/src/areas/debug/debugSmoke.ts
@@ -24,9 +24,9 @@ const PAUSE = `.debug-toolbar .debug-action.pause`;
 const DEBUG_STATUS_BAR = `.statusbar.debugging`;
 const NOT_DEBUG_STATUS_BAR = `.statusbar:not(debugging)`;
 const TOOLBAR_HIDDEN = `.debug-toolbar[aria-hidden="true"]`;
-const STACK_FRAME = `${VIEWLET} .monaco-tree-row .stack-frame`;
+const STACK_FRAME = `${VIEWLET} .monaco-list-row .stack-frame`;
 const SPECIFIC_STACK_FRAME = filename => `${STACK_FRAME} .file[title*="${filename}"]`;
-const VARIABLE = `${VIEWLET} .debug-variables .monaco-tree-row .expression`;
+const VARIABLE = `${VIEWLET} .debug-variables .monaco-list-row .expression`;
 const CONSOLE_OUTPUT = `.repl .output.expression .value`;
 const CONSOLE_INPUT_OUTPUT = `.repl .input-output-pair .output.expression .value`;

--- a/test/smoke/src/areas/editor/peek.ts
+++ b/test/smoke/src/areas/editor/peek.ts
@@ -10,7 +10,7 @@ export class References {
 	private static readonly REFERENCES_WIDGET = '.monaco-editor .zone-widget .zone-widget-container.peekview-widget.reference-zone-widget.results-loaded';
 	private static readonly REFERENCES_TITLE_FILE_NAME = `${References.REFERENCES_WIDGET} .head .peekview-title .filename`;
 	private static readonly REFERENCES_TITLE_COUNT = `${References.REFERENCES_WIDGET} .head .peekview-title .meta`;
-	private static readonly REFERENCES = `${References.REFERENCES_WIDGET} .body .ref-tree.inline .monaco-tree-row .reference`;
+	private static readonly REFERENCES = `${References.REFERENCES_WIDGET} .body .ref-tree.inline .monaco-list-row .reference`;

 	constructor(private code: Code) { }

@@ -19,7 +19,7 @@ export class References {
 	}

 	async waitForReferencesCountInTitle(count: number): Promise<void> {
-		await this.code.waitForTextContent(References.REFERENCES_TITLE_COUNT, void 0, titleCount => {
+		await this.code.waitForTextContent(References.REFERENCES_TITLE_COUNT, undefined, titleCount => {
 			const matches = titleCount.match(/\d+/);
 			return matches ? parseInt(matches[0]) === count : false;
 		});
@@ -49,4 +49,4 @@ export class References {
 			}
 		}
 	}
-}
+}
--- a/test/smoke/src/areas/extensions/extensions.test.ts
+++ b/test/smoke/src/areas/extensions/extensions.test.ts
@@ -21,7 +21,7 @@ export function setup() {
 			await app.workbench.extensions.installExtension(extensionName);

 			await app.reload();
-			await app.workbench.extensions.openExtensionsViewlet();
+			await app.workbench.extensions.waitForExtensionsViewlet();
 			await app.workbench.quickopen.runCommand('Smoke Test Check');
 			await app.workbench.statusbar.waitForStatusbarText('smoke test', 'VS Code Smoke Test Check');
 		});
--- a/test/smoke/src/areas/extensions/extensions.ts
+++ b/test/smoke/src/areas/extensions/extensions.ts
@@ -24,6 +24,10 @@ export class Extensions extends Viewlet {
 		await this.code.waitForActiveElement(SEARCH_BOX);
 	}

+	async waitForExtensionsViewlet(): Promise<any> {
+		await this.code.waitForElement(SEARCH_BOX);
+	}
+
 	async searchForExtension(name: string): Promise<any> {
 		await this.code.waitAndClick(SEARCH_BOX);
 		await this.code.waitForActiveElement(SEARCH_BOX);
--- a/test/smoke/src/areas/preferences/settings.ts
+++ b/test/smoke/src/areas/preferences/settings.ts
@@ -15,21 +15,16 @@ export const enum ActivityBarPosition {
 	RIGHT = 1
 }

-const SEARCH_INPUT = '.settings-search-input input';
-
 export class SettingsEditor {

 	constructor(private code: Code, private userDataPath: string, private editors: Editors, private editor: Editor, private quickopen: QuickOpen) { }

 	async addUserSetting(setting: string, value: string): Promise<void> {
 		await this.openSettings();
-		await this.code.waitAndClick(SEARCH_INPUT);
-		await this.code.waitForActiveElement(SEARCH_INPUT);
-
-		await this.editor.waitForEditorFocus('settings.json', 1, '.editable-preferences-editor-container');
+		await this.editor.waitForEditorFocus('settings.json', 1);

 		await this.code.dispatchKeybinding('right');
-		await this.editor.waitForTypeInEditor('settings.json', `"${setting}": ${value}`, '.editable-preferences-editor-container');
+		await this.editor.waitForTypeInEditor('settings.json', `"${setting}": ${value}`);
 		await this.editors.saveOpenedFile();
 	}

@@ -38,7 +33,7 @@ export class SettingsEditor {
 		await new Promise((c, e) => fs.writeFile(settingsPath, '{}', 'utf8', err => err ? e(err) : c()));

 		await this.openSettings();
-		await this.editor.waitForEditorContents('settings.json', c => c === '{}', '.editable-preferences-editor-container');
+		await this.editor.waitForEditorContents('settings.json', c => c === '{}');
 	}

 	private async openSettings(): Promise<void> {
--- a/test/smoke/src/areas/problems/problems.ts
+++ b/test/smoke/src/areas/problems/problems.ts
@@ -40,7 +40,7 @@ export class Problems {

 	public static getSelectorInProblemsView(problemType: ProblemSeverity): string {
 		let selector = problemType === ProblemSeverity.WARNING ? 'warning' : 'error';
-		return `div[id="workbench.panel.markers"] .monaco-tl-contents .icon.${selector}`;
+		return `div[id="workbench.panel.markers"] .monaco-tl-contents .marker-icon.${selector}`;
 	}

 	public static getSelectorInEditor(problemType: ProblemSeverity): string {
--- a/test/smoke/src/vscode/code.ts
+++ b/test/smoke/src/vscode/code.ts
@@ -7,7 +7,7 @@ import * as path from 'path';
 import * as cp from 'child_process';
 import * as os from 'os';
 import { tmpName } from 'tmp';
-import { IDriver, connect as connectDriver, IDisposable, IElement } from './driver';
+import { IDriver, connect as connectDriver, IDisposable, IElement, Thenable } from './driver';
 import { Logger } from '../logger';

 const repoPath = path.join(__dirname, '../../../..');
@@ -64,7 +64,7 @@ async function connect(child: cp.ChildProcess, outPath: string, handlePath: stri
 	while (true) {
 		try {
 			const { client, driver } = await connectDriver(outPath, handlePath);
-			return new Code(child, client, driver, logger);
+			return new Code(client, driver, logger);
 		} catch (err) {
 			if (++errCount > 50) {
 				child.kill();
@@ -147,7 +147,7 @@ export async function spawn(options: SpawnOptions): Promise<Code> {
 }

 async function poll<T>(
-	fn: () => Promise<T>,
+	fn: () => Thenable<T>,
 	acceptFn: (result: T) => boolean,
 	timeoutMessage: string,
 	retryCount: number = 200,
@@ -188,7 +188,6 @@ export class Code {
 	private driver: IDriver;

 	constructor(
-		private process: cp.ChildProcess,
 		private client: IDisposable,
 		driver: IDriver,
 		readonly logger: Logger
@@ -232,9 +231,13 @@ export class Code {
 		await this.driver.reloadWindow(windowId);
 	}

+	async exit(): Promise<void> {
+		await this.driver.exitApplication();
+	}
+
 	async waitForTextContent(selector: string, textContent?: string, accept?: (result: string) => boolean): Promise<string> {
 		const windowId = await this.getActiveWindowId();
-		accept = accept || (result => textContent !== void 0 ? textContent === result : !!result);
+		accept = accept || (result => textContent !== undefined ? textContent === result : !!result);

 		return await poll(
 			() => this.driver.getElements(windowId, selector).then(els => els.length > 0 ? Promise.resolve(els[0].textContent) : Promise.reject(new Error('Element not found for textContent'))),
@@ -304,7 +307,6 @@ export class Code {

 	dispose(): void {
 		this.client.dispose();
-		this.process.kill();
 	}
 }

--- a/test/smoke/tools/copy-driver-definition.js
+++ b/test/smoke/tools/copy-driver-definition.js
@@ -18,6 +18,23 @@ contents = `/*------------------------------------------------------------------
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/

+/**
+ * Thenable is a common denominator between ES6 promises, Q, jquery.Deferred, WinJS.Promise,
+ * and others. This API makes no assumption about what promise library is being used which
+ * enables reusing existing code without migrating to a specific promise implementation. Still,
+ * we recommend the use of native promises which are available in this editor.
+ */
+interface Thenable<T> {
+	/**
+	* Attaches callbacks for the resolution and/or rejection of the Promise.
+	* @param onfulfilled The callback to execute when the Promise is resolved.
+	* @param onrejected The callback to execute when the Promise is rejected.
+	* @returns A Promise for the completion of which ever callback is executed.
+	*/
+	then<TResult>(onfulfilled?: (value: T) => TResult | Thenable<TResult>, onrejected?: (reason: any) => TResult | Thenable<TResult>): Thenable<TResult>;
+	then<TResult>(onfulfilled?: (value: T) => TResult | Thenable<TResult>, onrejected?: (reason: any) => void): Thenable<TResult>;
+}
+
 ${contents}

 export interface IDisposable {
--- a/test/smoke/yarn.lock
+++ b/test/smoke/yarn.lock
@@ -494,11 +494,23 @@ debug@3.1.0, debug@^3.1.0:
  dependencies:
    ms "2.0.0"

+debug@^3.0.0:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+  dependencies:
+    ms "^2.1.1"
+
 decamelize@^1.1.2:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=

+deep-extend@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
+
 deep-extend@~0.4.0:
  version "0.4.2"
  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
@@ -569,28 +581,28 @@ ecc-jsbn@~0.1.1:
  dependencies:
    jsbn "~0.1.0"

-electron-download@^3.0.1:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/electron-download/-/electron-download-3.3.0.tgz#2cfd54d6966c019c4d49ad65fbe65cc9cdef68c8"
-  integrity sha1-LP1U1pZsAZxNSa1l++Zcyc3vaMg=
+electron-download@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/electron-download/-/electron-download-4.1.1.tgz#02e69556705cc456e520f9e035556ed5a015ebe8"
+  integrity sha512-FjEWG9Jb/ppK/2zToP+U5dds114fM1ZOJqMAR4aXXL5CvyPE9fiqBK/9YcwC9poIFQTEJk/EM/zyRwziziRZrg==
  dependencies:
-    debug "^2.2.0"
-    fs-extra "^0.30.0"
-    home-path "^1.0.1"
+    debug "^3.0.0"
+    env-paths "^1.0.0"
+    fs-extra "^4.0.1"
    minimist "^1.2.0"
-    nugget "^2.0.0"
-    path-exists "^2.1.0"
-    rc "^1.1.2"
-    semver "^5.3.0"
-    sumchecker "^1.2.0"
+    nugget "^2.0.1"
+    path-exists "^3.0.0"
+    rc "^1.2.1"
+    semver "^5.4.1"
+    sumchecker "^2.0.2"

-electron@^2.0.12:
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-2.0.12.tgz#04b11ef3246cd2a5839a8f16314051341dc5c449"
-  integrity sha512-mw8hoM/GPtFPP8FGiJcVNe8Rx63YJ7O8bf7McQj21HAvrXGAwReGFrpIe5xN6ec10fDXNSNyfzRucjFXtOtLcg==
+electron@3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-3.1.2.tgz#e410b976c56fc2f783c3b0fb6d757e02eaeab902"
+  integrity sha512-B/mXRCN8jGBBx8dvtIgLyW+nE8i9y7K9G6wijU+cLoneqF5al9BgZA1l5xgZEiUrwTtt0cgXIWNwhStt7EDoQQ==
  dependencies:
    "@types/node" "^8.0.24"
-    electron-download "^3.0.1"
+    electron-download "^4.1.0"
    extract-zip "^1.0.3"

 entities@^1.1.1, entities@~1.1.1:
@@ -598,6 +610,11 @@ entities@^1.1.1, entities@~1.1.1:
  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
  integrity sha1-blwtClYhtdra7O+AuQ7ftc13cvA=

+env-paths@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-1.0.0.tgz#4168133b42bb05c38a35b1ae4397c8298ab369e0"
+  integrity sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA=
+
 error-ex@^1.2.0:
  version "1.3.1"
  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
@@ -605,11 +622,6 @@ error-ex@^1.2.0:
  dependencies:
    is-arrayish "^0.2.1"

-es6-promise@^4.0.5:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.1.1.tgz#8811e90915d9a0dba36274f0b242dbda78f9c92a"
-  integrity sha512-OaU1hHjgJf+b0NzsxCg7NdIYERD6Hy/PEmFLTjw+b65scuisG3Kt4QoTvJ66BBkPZ581gr0kpoVzKnxniM8nng==
-
 escape-string-regexp@1.0.5, escape-string-regexp@^1.0.0:
  version "1.0.5"
  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
@@ -744,16 +756,14 @@ form-data@~2.3.1:
    combined-stream "^1.0.5"
    mime-types "^2.1.12"

-fs-extra@^0.30.0:
-  version "0.30.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0"
-  integrity sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=
+fs-extra@^4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
+  integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==
  dependencies:
    graceful-fs "^4.1.2"
-    jsonfile "^2.1.0"
-    klaw "^1.0.0"
-    path-is-absolute "^1.0.0"
-    rimraf "^2.2.8"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"

 fs.realpath@^1.0.0:
  version "1.0.0"
@@ -847,7 +857,7 @@ glob@7.1.2, glob@^7.0.5:
    once "^1.3.0"
    path-is-absolute "^1.0.0"

-graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
+graceful-fs@^4.1.2, graceful-fs@^4.1.6:
  version "4.1.11"
  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
@@ -940,11 +950,6 @@ hoek@4.x.x:
  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
  integrity sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==

-home-path@^1.0.1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/home-path/-/home-path-1.0.5.tgz#788b29815b12d53bacf575648476e6f9041d133f"
-  integrity sha1-eIspgVsS1Tus9XVkhHbm+QQdEz8=
-
 hosted-git-info@^2.1.4:
  version "2.5.0"
  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
@@ -1155,10 +1160,10 @@ json-stringify-safe@~5.0.1:
  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=

-jsonfile@^2.1.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
-  integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug=
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
  optionalDependencies:
    graceful-fs "^4.1.6"

@@ -1191,13 +1196,6 @@ kind-of@^4.0.0:
  dependencies:
    is-buffer "^1.1.5"

-klaw@^1.0.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
-  integrity sha1-QIhDO0azsbolnXh4XY6W9zugJDk=
-  optionalDependencies:
-    graceful-fs "^4.1.9"
-
 load-json-file@^1.0.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -1377,6 +1375,11 @@ ms@2.0.0:
  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=

+ms@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+
 nan@^2.3.0:
  version "2.10.0"
  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
@@ -1439,7 +1442,7 @@ npmlog@^4.0.2:
    gauge "~2.7.3"
    set-blocking "~2.0.0"

-nugget@^2.0.0:
+nugget@^2.0.1:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/nugget/-/nugget-2.0.1.tgz#201095a487e1ad36081b3432fa3cada4f8d071b0"
  integrity sha1-IBCVpIfhrTYIGzQy+jytpPjQcbA=
@@ -1522,13 +1525,18 @@ parse-json@^2.2.0:
  dependencies:
    error-ex "^1.2.0"

-path-exists@^2.0.0, path-exists@^2.1.0:
+path-exists@^2.0.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
  dependencies:
    pinkie-promise "^2.0.0"

+path-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
+
 path-is-absolute@^1.0.0:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
@@ -1643,16 +1651,6 @@ randomatic@^1.1.3:
    is-number "^3.0.0"
    kind-of "^4.0.0"

-rc@^1.1.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.2.tgz#d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077"
-  integrity sha1-2M6ctX6NZNnHut2YdsfDTL48cHc=
-  dependencies:
-    deep-extend "~0.4.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
 rc@^1.1.7:
  version "1.2.6"
  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.6.tgz#eb18989c6d4f4f162c399f79ddd29f3835568092"
@@ -1663,6 +1661,16 @@ rc@^1.1.7:
    minimist "^1.2.0"
    strip-json-comments "~2.0.1"

+rc@^1.2.1:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
+  dependencies:
+    deep-extend "^0.6.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
 read-pkg-up@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -1831,7 +1839,7 @@ resolve@^1.1.7:
  dependencies:
    path-parse "^1.0.5"

-rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.6.1:
+rimraf@2, rimraf@^2.5.1, rimraf@^2.6.1:
  version "2.6.2"
  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
@@ -1853,6 +1861,11 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
  integrity sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==

+semver@^5.4.1:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
+  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
+
 set-blocking@~2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -2021,13 +2034,12 @@ subarg@^1.0.0:
  dependencies:
    minimist "^1.1.0"

-sumchecker@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-1.3.1.tgz#79bb3b4456dd04f18ebdbc0d703a1d1daec5105d"
-  integrity sha1-ebs7RFbdBPGOvbwNcDodHa7FEF0=
+sumchecker@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-2.0.2.tgz#0f42c10e5d05da5d42eea3e56c3399a37d6c5b3e"
+  integrity sha1-D0LBDl0F2l1C7qPlbDOZo31sWz4=
  dependencies:
    debug "^2.2.0"
-    es6-promise "^4.0.5"

 supports-color@5.4.0:
  version "5.4.0"
@@ -2142,6 +2154,11 @@ uid-number@^0.0.6:
  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
  integrity sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=

+universalify@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
 util-deprecate@~1.0.1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
--- a/test/tree/public/index.html
+++ b/test/tree/public/index.html
@@ -26,6 +26,7 @@

 <body>
 	<input type="text" id="filter" />
+	<button id="expandall">Expand All</button>
 	<button id="collapseall">Collapse All</button>
 	<button id="renderwidth">Render Width</button>
 	<button id="refresh">Refresh</button>
@@ -43,7 +44,7 @@

 		require.config({ baseUrl: '/static' });

-		require(['vs/base/browser/ui/tree/indexTree', 'vs/base/browser/ui/tree/asyncDataTree', 'vs/base/browser/ui/tree/tree', 'vs/base/common/iterator'], ({ IndexTree }, { AsyncDataTree }, { TreeVisibility }, { iter }) => {
+		require(['vs/base/browser/ui/tree/indexTree', 'vs/base/browser/ui/tree/asyncDataTree', 'vs/base/browser/ui/tree/dataTree', 'vs/base/browser/ui/tree/tree', 'vs/base/common/iterator'], ({ IndexTree }, { AsyncDataTree }, { DataTree }, { TreeVisibility }, { iter }) => {
 			function createIndexTree(opts) {
 				opts = opts || {};

@@ -59,7 +60,7 @@
 					renderElement(element, index, container) {
 						if (opts.supportDynamicHeights) {
 							let v = [];
-							for (let i = 1; i <= 3; i++) {
+							for (let i = 1; i <= 5; i++) {
 								v.push(element.element);
 							}
 							container.innerHTML = v.join('<br />');
@@ -94,7 +95,7 @@
 					}
 				};

-				const tree = new IndexTree(container, delegate, [renderer], { ...opts, filter: treeFilter, setRowLineHeight: false });
+				const tree = new IndexTree(container, delegate, [renderer], null, { ...opts, filter: treeFilter, setRowLineHeight: false });

 				return { tree, treeFilter };
 			}
@@ -137,6 +138,16 @@
 					}
 				};

+				const sorter = new class {
+					compare(a, b) {
+						if (a.collapsible === b.collapsible) {
+							return a.name < b.name ? -1 : 1;
+						}
+
+						return a.collapsible ? -1 : 1;
+					}
+				};
+
 				const dataSource = new class {
 					hasChildren(element) {
 						return element === null || element.element.type === 'dir';
@@ -153,11 +164,7 @@
 										collapsible: element.type === 'dir'
 									}));

-									if (element) {
-										setTimeout(() => c(els), 2500);
-									} else {
-										c(els);
-									}
+									c(els);
 								}
 							};
 						});
@@ -170,7 +177,70 @@
 					}
 				};

-				const tree = new AsyncDataTree(container, delegate, [renderer], dataSource, { filter: treeFilter, identityProvider });
+				const tree = new AsyncDataTree(container, delegate, [renderer], dataSource, { filter: treeFilter, sorter, identityProvider });
+
+				return { tree, treeFilter };
+			}
+
+			function createDataTree() {
+				const delegate = {
+					getHeight() { return 22; },
+					getTemplateId() { return 'template'; }
+				};
+
+				const renderer = {
+					templateId: 'template',
+					renderTemplate(container) { return container; },
+					renderElement(node, index, container) { container.textContent = node.element.name; },
+					disposeElement() { },
+					disposeTemplate() { }
+				};
+
+				const treeFilter = new class {
+					constructor() {
+						this.pattern = null;
+						let timeout;
+						filter.oninput = () => {
+							clearTimeout(timeout);
+							timeout = setTimeout(() => this.updatePattern(), 300);
+						};
+					}
+
+					updatePattern() {
+						if (!filter.value) {
+							this.pattern = null;
+						} else {
+							this.pattern = new RegExp(filter.value, 'i');
+						}
+
+						perf('refilter', () => tree.refilter());
+					}
+					filter(el) {
+						return (this.pattern ? this.pattern.test(el.name) : true) ? TreeVisibility.Visible : TreeVisibility.Recurse;
+					}
+				};
+
+				const dataSource = new class {
+					getChildren(element) {
+						return element.children || [];
+					}
+				};
+
+				const identityProvider = {
+					getId(node) {
+						return node.name;
+					}
+				};
+
+				const tree = new DataTree(container, delegate, [renderer], dataSource, { filter: treeFilter, identityProvider });
+
+				tree.input = {
+					children: [
+						{ name: 'A', children: [{ name: 'AA' }, { name: 'AB' }] },
+						{ name: 'B', children: [{ name: 'BA', children: [{ name: 'BAA' }] }, { name: 'BB' }] },
+						{ name: 'C' }
+					]
+				};

 				return { tree, treeFilter };
 			}
@@ -179,6 +249,7 @@
 				case '?problems': {
 					const { tree, treeFilter } = createIndexTree();

+					expandall.onclick = () => perf('expand all', () => tree.expandAll());
 					collapseall.onclick = () => perf('collapse all', () => tree.collapseAll());
 					renderwidth.onclick = () => perf('renderwidth', () => tree.layoutWidth(Math.random()));

@@ -199,6 +270,7 @@
 				case '?data': {
 					const { tree, treeFilter } = createAsyncDataTree();

+					expandall.onclick = () => perf('expand all', () => tree.expandAll());
 					collapseall.onclick = () => perf('collapse all', () => tree.collapseAll());
 					renderwidth.onclick = () => perf('renderwidth', () => tree.layoutWidth(Math.random()));
 					refresh.onclick = () => perf('refresh', () => tree.refresh(null, true));
@@ -207,9 +279,20 @@

 					break;
 				}
+				case '?objectdata': {
+					const { tree, treeFilter } = createDataTree();
+
+					expandall.onclick = () => perf('expand all', () => tree.expandAll());
+					collapseall.onclick = () => perf('collapse all', () => tree.collapseAll());
+					renderwidth.onclick = () => perf('renderwidth', () => tree.layoutWidth(Math.random()));
+					refresh.onclick = () => perf('refresh', () => tree.refresh(null, true));
+
+					break;
+				}
 				case '?height': {
 					const { tree, treeFilter } = createIndexTree({ supportDynamicHeights: true });

+					expandall.onclick = () => perf('expand all', () => tree.expandAll());
 					collapseall.onclick = () => perf('collapse all', () => tree.collapseAll());
 					renderwidth.onclick = () => perf('renderwidth', () => tree.layoutWidth(Math.random()));

@@ -222,11 +305,16 @@
 							treeFilter.updatePattern();
 						}
 					};
+
+					// container.
+
+
 					break;
 				}
 				default: {
 					const { tree, treeFilter } = createIndexTree();

+					expandall.onclick = () => perf('expand all', () => tree.expandAll());
 					collapseall.onclick = () => perf('collapse all', () => tree.collapseAll());
 					renderwidth.onclick = () => perf('renderwidth', () => tree.layoutWidth(Math.random()));

--- a/test/tree/server.js
+++ b/test/tree/server.js
@@ -17,7 +17,7 @@ async function getTree(fsPath, level) {
 	const element = path.basename(fsPath);
 	const stat = await fs.stat(fsPath);

-	if (!stat.isDirectory() || element === '.git' || element === '.build' || level >= 2) {
+	if (!stat.isDirectory() || element === '.git' || element === '.build' || level >= 4) {
 		return { element };
 	}

@@ -46,14 +46,6 @@ async function readdir(relativePath) {
 		}
 	}

-	result.sort((a, b) => {
-		if (a.type === b.type) {
-			return a.name < b.name ? -1 : 1;
-		}
-
-		return a.type === 'dir' ? -1 : 1;
-	});
-
 	return result;
 }