Merge from vscode 2cfc8172e533e50c90e6a3152f6bfb1f82f963f3 (#6516)

* Merge from vscode 2cfc8172e533e50c90e6a3152f6bfb1f82f963f3

* fix tests

test/electron/renderer.html

@@ -19,4 +19,4 @@
 	</script>
 </body>
 
-</html>
+</html>

test/smoke/package.json

@@ -22,7 +22,7 @@
     "@types/webdriverio": "4.6.1",
     "concurrently": "^3.5.1",
     "cpx": "^1.5.0",
-    "electron": "4.2.5",
+    "electron": "4.2.7",
     "htmlparser2": "^3.9.2",
     "mkdirp": "^0.5.1",
     "mocha": "^5.2.0",

test/smoke/yarn.lock

@@ -676,10 +676,10 @@ electron-download@^4.1.0:
     semver "^5.4.1"
     sumchecker "^2.0.2"
 
-electron@4.2.5:
-  version "4.2.5"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-4.2.5.tgz#1d1432c38e2b2190318f7ca30897cdfdcf942e5a"
-  integrity sha512-P132MXzTtyn2ZaekhKi5JeHzmTAMuR/uQt4hrg3vfJV7fpncx9SL6UFwHAK1DU13iiyZJqqIziNUu+o8nODHsA==
+electron@4.2.7:
+  version "4.2.7"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-4.2.7.tgz#bdd2dbf489a4a4255405bd8330cc8509831d29ba"
+  integrity sha512-Azpkw0OPzKVipSsN9/0DrBQhXOpG48Q1gTG7Akchtv37s8TijMe403TUgHxGGhw2ti117ek51kYf7NXLhjXqoA==
   dependencies:
     "@types/node" "^10.12.18"
     electron-download "^4.1.0"

test/tree/public/index.html

@@ -44,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/dataTree', 'vs/base/browser/ui/tree/tree', 'vs/base/common/iterator'], ({ IndexTree }, { AsyncDataTree }, { DataTree }, { TreeVisibility }, { iter }) => {
+		require(['vs/base/browser/ui/tree/indexTree', 'vs/base/browser/ui/tree/compressedObjectTree', 'vs/base/browser/ui/tree/asyncDataTree', 'vs/base/browser/ui/tree/dataTree', 'vs/base/browser/ui/tree/tree', 'vs/base/common/iterator'], ({ IndexTree }, { CompressedObjectTree }, { AsyncDataTree }, { DataTree }, { TreeVisibility }, { iter }) => {
 			function createIndexTree(opts) {
 				opts = opts || {};
 
@@ -100,6 +100,57 @@
 				return { tree, treeFilter };
 			}
 
+			function createCompressedObjectTree(opts) {
+				opts = opts || {};
+
+				const delegate = {
+					getHeight() { return 22; },
+					getTemplateId() { return 'template'; },
+					hasDynamicHeight() { return true; }
+				};
+
+				const renderer = {
+					templateId: 'template',
+					renderTemplate(container) { return container; },
+					renderElement(element, index, container) {
+						if (element.element.elements.length > 1) {
+							container.innerHTML = `🙈 ${element.element.elements.map(el => el.name).join('/')}`;
+						} else {
+							container.innerHTML = element.element.elements[0].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) : true) ? TreeVisibility.Visible : TreeVisibility.Recurse;
+					}
+				};
+
+				const tree = new CompressedObjectTree(container, delegate, [renderer], { ...opts, filter: treeFilter, setRowLineHeight: false, collapseByDefault: true, setRowLineHeight: true });
+
+				return { tree, treeFilter };
+			}
+
 			function createAsyncDataTree() {
 				const delegate = {
 					getHeight() { return 22; },
@@ -155,7 +206,7 @@
 					getChildren(element) {
 						return new Promise((c, e) => {
 							const xhr = new XMLHttpRequest();
-							xhr.open('GET', element ? `/api/readdir?path=${element.element.path}` : '/api/readdir');
+							xhr.open('GET', element ? `/ api / readdir ? path = ${element.element.path} ` : '/api/readdir');
 							xhr.send();
 							xhr.onreadystatechange = function () {
 								if (this.readyState == 4 && this.status == 200) {
@@ -258,7 +309,7 @@
 						const errors = [];
 
 						for (let j = 1; j <= 3; j++) {
-							errors.push({ element: `error #${j}` });
+							errors.push({ element: `error #${j} ` });
 						}
 
 						files.push({ element: `file #${i}`, children: errors });
@@ -289,6 +340,23 @@
 
 					break;
 				}
+				case '?compressed': {
+					const { tree, treeFilter } = createCompressedObjectTree();
+
+					expandall.onclick = () => perf('expand all', () => tree.expandAll());
+					collapseall.onclick = () => perf('collapse all', () => tree.collapseAll());
+
+					const xhr = new XMLHttpRequest();
+					xhr.open('GET', '/compressed.json');
+					xhr.send();
+					xhr.onreadystatechange = function () {
+						if (this.readyState == 4 && this.status == 200) {
+							tree.setChildren(null, JSON.parse(this.responseText));
+						}
+					};
+
+					break;
+				}
 				case '?height': {
 					const { tree, treeFilter } = createIndexTree({ supportDynamicHeights: true });
 

test/tree/tree.js

@@ -0,0 +1,24 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const path = require('path');
+const fs = require('fs');
+
+function collect(location) {
+	const element = { name: path.basename(location) };
+	const stat = fs.statSync(location);
+
+	if (!stat.isDirectory()) {
+		return { element, incompressible: true };
+	}
+
+	const children = fs.readdirSync(location)
+		.map(child => path.join(location, child))
+		.map(collect);
+
+	return { element, children };
+}
+
+console.log(JSON.stringify(collect(process.cwd())));