Merge from vscode 2cd495805cf99b31b6926f08ff4348124b2cf73d

src/vs/base/test/browser/ui/tree/compressedObjectTreeModel.test.ts

@@ -7,7 +7,7 @@ import * as assert from 'assert';
 import { compress, ICompressedTreeElement, ICompressedTreeNode, decompress, CompressedObjectTreeModel } from 'vs/base/browser/ui/tree/compressedObjectTreeModel';
 import { Iterable } from 'vs/base/common/iterator';
 import { ITreeNode } from 'vs/base/browser/ui/tree/tree';
-import { ISpliceable } from 'vs/base/common/sequence';
+import { IList } from 'vs/base/browser/ui/tree/indexTreeModel';
 
 interface IResolvedCompressedTreeElement<T> extends ICompressedTreeElement<T> {
 	readonly element: T;
@@ -289,11 +289,12 @@ suite('CompressedObjectTree', function () {
 		});
 	});
 
-	function toSpliceable<T>(arr: T[]): ISpliceable<T> {
+	function toList<T>(arr: T[]): IList<T> {
 		return {
 			splice(start: number, deleteCount: number, elements: T[]): void {
 				arr.splice(start, deleteCount, ...elements);
-			}
+			},
+			updateElementHeight() { }
 		};
 	}
 
@@ -305,7 +306,7 @@ suite('CompressedObjectTree', function () {
 
 		test('ctor', () => {
 			const list: ITreeNode<ICompressedTreeNode<number>>[] = [];
-			const model = new CompressedObjectTreeModel<number>('test', toSpliceable(list));
+			const model = new CompressedObjectTreeModel<number>('test', toList(list));
 			assert(model);
 			assert.equal(list.length, 0);
 			assert.equal(model.size, 0);
@@ -313,7 +314,7 @@ suite('CompressedObjectTree', function () {
 
 		test('flat', () => {
 			const list: ITreeNode<ICompressedTreeNode<number>>[] = [];
-			const model = new CompressedObjectTreeModel<number>('test', toSpliceable(list));
+			const model = new CompressedObjectTreeModel<number>('test', toList(list));
 
 			model.setChildren(null, [
 				{ element: 0 },
@@ -340,7 +341,7 @@ suite('CompressedObjectTree', function () {
 
 		test('nested', () => {
 			const list: ITreeNode<ICompressedTreeNode<number>>[] = [];
-			const model = new CompressedObjectTreeModel<number>('test', toSpliceable(list));
+			const model = new CompressedObjectTreeModel<number>('test', toList(list));
 
 			model.setChildren(null, [
 				{
@@ -376,7 +377,7 @@ suite('CompressedObjectTree', function () {
 
 		test('compressed', () => {
 			const list: ITreeNode<ICompressedTreeNode<number>>[] = [];
-			const model = new CompressedObjectTreeModel<number>('test', toSpliceable(list));
+			const model = new CompressedObjectTreeModel<number>('test', toList(list));
 
 			model.setChildren(null, [
 				{

src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts

@@ -5,14 +5,14 @@
 
 import * as assert from 'assert';
 import { ITreeNode, ITreeFilter, TreeVisibility } from 'vs/base/browser/ui/tree/tree';
-import { ISpliceable } from 'vs/base/common/sequence';
-import { IndexTreeModel, IIndexTreeNode } from 'vs/base/browser/ui/tree/indexTreeModel';
+import { IndexTreeModel, IIndexTreeNode, IList } from 'vs/base/browser/ui/tree/indexTreeModel';
 
-function toSpliceable<T>(arr: T[]): ISpliceable<T> {
+function toList<T>(arr: T[]): IList<T> {
 	return {
 		splice(start: number, deleteCount: number, elements: T[]): void {
 			arr.splice(start, deleteCount, ...elements);
-		}
+		},
+		updateElementHeight() { }
 	};
 }
 
@@ -24,14 +24,14 @@ suite('IndexTreeModel', function () {
 
 	test('ctor', () => {
 		const list: ITreeNode<number>[] = [];
-		const model = new IndexTreeModel<number>('test', toSpliceable(list), -1);
+		const model = new IndexTreeModel<number>('test', toList(list), -1);
 		assert(model);
 		assert.equal(list.length, 0);
 	});
 
 	test('insert', () => {
 		const list: ITreeNode<number>[] = [];
-		const model = new IndexTreeModel<number>('test', toSpliceable(list), -1);
+		const model = new IndexTreeModel<number>('test', toList(list), -1);
 
 		model.splice([0], 0, [
 			{ element: 0 },
@@ -53,7 +53,7 @@ suite('IndexTreeModel', function () {
 
 	test('deep insert', function () {
 		const list: ITreeNode<number>[] = [];
-		const model = new IndexTreeModel<number>('test', toSpliceable(list), -1);
+		const model = new IndexTreeModel<number>('test', toList(list), -1);
 
 		model.splice([0], 0, [
 			{
@@ -90,7 +90,7 @@ suite('IndexTreeModel', function () {
 
 	test('deep insert collapsed', function () {
 		const list: ITreeNode<number>[] = [];
-		const model = new IndexTreeModel<number>('test', toSpliceable(list), -1);
+		const model = new IndexTreeModel<number>('test', toList(list), -1);
 
 		model.splice([0], 0, [
 			{
@@ -118,7 +118,7 @@ suite('IndexTreeModel', function () {
 
 	test('delete', () => {
 		const list: ITreeNode<number>[] = [];
-		const model = new IndexTreeModel<number>('test', toSpliceable(list), -1);
+		const model = new IndexTreeModel<number>('test', toList(list), -1);
 
 		model.splice([0], 0, [
 			{ element: 0 },
@@ -143,7 +143,7 @@ suite('IndexTreeModel', function () {
 
 	test('nested delete', function () {
 		const list: ITreeNode<number>[] = [];
-		const model = new IndexTreeModel<number>('test', toSpliceable(list), -1);
+		const model = new IndexTreeModel<number>('test', toList(list), -1);
 
 		model.splice([0], 0, [
 			{
@@ -177,7 +177,7 @@ suite('IndexTreeModel', function () {
 
 	test('deep delete', function () {
 		const list: ITreeNode<number>[] = [];
-		const model = new IndexTreeModel<number>('test', toSpliceable(list), -1);
+		const model = new IndexTreeModel<number>('test', toList(list), -1);
 
 		model.splice([0], 0, [
 			{
@@ -205,7 +205,7 @@ suite('IndexTreeModel', function () {
 
 	test('hidden delete', function () {
 		const list: ITreeNode<number>[] = [];
-		const model = new IndexTreeModel<number>('test', toSpliceable(list), -1);
+		const model = new IndexTreeModel<number>('test', toList(list), -1);
 
 		model.splice([0], 0, [
 			{
@@ -230,7 +230,7 @@ suite('IndexTreeModel', function () {
 
 	test('collapse', () => {
 		const list: ITreeNode<number>[] = [];
-		const model = new IndexTreeModel<number>('test', toSpliceable(list), -1);
+		const model = new IndexTreeModel<number>('test', toList(list), -1);
 
 		model.splice([0], 0, [
 			{
@@ -261,7 +261,7 @@ suite('IndexTreeModel', function () {
 
 	test('expand', () => {
 		const list: ITreeNode<number>[] = [];
-		const model = new IndexTreeModel<number>('test', toSpliceable(list), -1);
+		const model = new IndexTreeModel<number>('test', toList(list), -1);
 
 		model.splice([0], 0, [
 			{
@@ -301,7 +301,7 @@ suite('IndexTreeModel', function () {
 
 	test('collapse should recursively adjust visible count', function () {
 		const list: ITreeNode<number>[] = [];
-		const model = new IndexTreeModel<number>('test', toSpliceable(list), -1);
+		const model = new IndexTreeModel<number>('test', toList(list), -1);
 
 		model.splice([0], 0, [
 			{
@@ -334,7 +334,7 @@ suite('IndexTreeModel', function () {
 
 	test('setCollapsible', () => {
 		const list: ITreeNode<number>[] = [];
-		const model = new IndexTreeModel<number>('test', toSpliceable(list), -1);
+		const model = new IndexTreeModel<number>('test', toList(list), -1);
 
 		model.splice([0], 0, [
 			{
@@ -403,7 +403,7 @@ suite('IndexTreeModel', function () {
 			}
 		};
 
-		const model = new IndexTreeModel<number>('test', toSpliceable(list), -1, { filter });
+		const model = new IndexTreeModel<number>('test', toList(list), -1, { filter });
 
 		model.splice([0], 0, [
 			{
@@ -437,7 +437,7 @@ suite('IndexTreeModel', function () {
 			}
 		};
 
-		const model = new IndexTreeModel<number>('test', toSpliceable(list), -1, { filter });
+		const model = new IndexTreeModel<number>('test', toList(list), -1, { filter });
 
 		model.splice([0], 0, [
 			{
@@ -460,7 +460,7 @@ suite('IndexTreeModel', function () {
 			}
 		};
 
-		const model = new IndexTreeModel<number>('test', toSpliceable(list), -1, { filter });
+		const model = new IndexTreeModel<number>('test', toList(list), -1, { filter });
 
 		model.splice([0], 0, [
 			{
@@ -499,7 +499,7 @@ suite('IndexTreeModel', function () {
 			}
 		};
 
-		const model = new IndexTreeModel<string>('test', toSpliceable(list), 'root', { filter });
+		const model = new IndexTreeModel<string>('test', toList(list), 'root', { filter });
 
 		model.splice([0], 0, [
 			{
@@ -545,7 +545,7 @@ suite('IndexTreeModel', function () {
 			}
 		};
 
-		const model = new IndexTreeModel<string>('test', toSpliceable(list), 'root', { filter });
+		const model = new IndexTreeModel<string>('test', toList(list), 'root', { filter });
 
 		model.splice([0], 0, [
 			{
@@ -591,7 +591,7 @@ suite('IndexTreeModel', function () {
 			}
 		};
 
-		const model = new IndexTreeModel<string>('test', toSpliceable(list), 'root', { filter });
+		const model = new IndexTreeModel<string>('test', toList(list), 'root', { filter });
 
 		model.splice([0], 0, [
 			{
@@ -639,7 +639,7 @@ suite('IndexTreeModel', function () {
 
 		test('simple', function () {
 			const list: IIndexTreeNode<number>[] = [];
-			const model = new IndexTreeModel<number>('test', toSpliceable(list), -1);
+			const model = new IndexTreeModel<number>('test', toList(list), -1);
 
 			model.splice([0], 0, [
 				{
@@ -669,7 +669,7 @@ suite('IndexTreeModel', function () {
 				}
 			};
 
-			const model = new IndexTreeModel<number>('test', toSpliceable(list), -1, { filter });
+			const model = new IndexTreeModel<number>('test', toList(list), -1, { filter });
 
 			model.splice([0], 0, [
 				{
@@ -701,7 +701,7 @@ suite('IndexTreeModel', function () {
 			}
 		};
 
-		const model = new IndexTreeModel<string>('test', toSpliceable(list), 'root', { filter });
+		const model = new IndexTreeModel<string>('test', toList(list), 'root', { filter });
 
 		model.splice([0], 0, [
 			{ element: 'silver' },
@@ -735,7 +735,7 @@ suite('IndexTreeModel', function () {
 			}
 		};
 
-		const model = new IndexTreeModel<string>('test', toSpliceable(list), 'root', { filter });
+		const model = new IndexTreeModel<string>('test', toList(list), 'root', { filter });
 
 		model.splice([0], 0, [
 			{ element: 'a', children: [{ element: 'aa' }] },

src/vs/base/test/browser/ui/tree/objectTreeModel.test.ts

@@ -5,15 +5,16 @@
 
 import * as assert from 'assert';
 import { ITreeNode, ITreeFilter, TreeVisibility } from 'vs/base/browser/ui/tree/tree';
-import { ISpliceable } from 'vs/base/common/sequence';
 import { ObjectTreeModel } from 'vs/base/browser/ui/tree/objectTreeModel';
+import { IList } from 'vs/base/browser/ui/tree/indexTreeModel';
 
-function toSpliceable<T>(arr: T[]): ISpliceable<T> {
+function toList<T>(arr: T[]): IList<T> {
 	return {
 		splice(start: number, deleteCount: number, elements: T[]): void {
 			// console.log(`splice (${start}, ${deleteCount}, ${elements.length} [${elements.join(', ')}] )`); // debugging
 			arr.splice(start, deleteCount, ...elements);
-		}
+		},
+		updateElementHeight() { }
 	};
 }
 
@@ -25,7 +26,7 @@ suite('ObjectTreeModel', function () {
 
 	test('ctor', () => {
 		const list: ITreeNode<number>[] = [];
-		const model = new ObjectTreeModel<number>('test', toSpliceable(list));
+		const model = new ObjectTreeModel<number>('test', toList(list));
 		assert(model);
 		assert.equal(list.length, 0);
 		assert.equal(model.size, 0);
@@ -33,7 +34,7 @@ suite('ObjectTreeModel', function () {
 
 	test('flat', () => {
 		const list: ITreeNode<number>[] = [];
-		const model = new ObjectTreeModel<number>('test', toSpliceable(list));
+		const model = new ObjectTreeModel<number>('test', toList(list));
 
 		model.setChildren(null, [
 			{ element: 0 },
@@ -60,7 +61,7 @@ suite('ObjectTreeModel', function () {
 
 	test('nested', () => {
 		const list: ITreeNode<number>[] = [];
-		const model = new ObjectTreeModel<number>('test', toSpliceable(list));
+		const model = new ObjectTreeModel<number>('test', toList(list));
 
 		model.setChildren(null, [
 			{
@@ -96,7 +97,7 @@ suite('ObjectTreeModel', function () {
 
 	test('setChildren on collapsed node', () => {
 		const list: ITreeNode<number>[] = [];
-		const model = new ObjectTreeModel<number>('test', toSpliceable(list));
+		const model = new ObjectTreeModel<number>('test', toList(list));
 
 		model.setChildren(null, [
 			{ element: 0, collapsed: true }
@@ -117,7 +118,7 @@ suite('ObjectTreeModel', function () {
 
 	test('setChildren on expanded, unrevealed node', () => {
 		const list: ITreeNode<number>[] = [];
-		const model = new ObjectTreeModel<number>('test', toSpliceable(list));
+		const model = new ObjectTreeModel<number>('test', toList(list));
 
 		model.setChildren(null, [
 			{
@@ -143,7 +144,7 @@ suite('ObjectTreeModel', function () {
 
 	test('collapse state is preserved with strict identity', () => {
 		const list: ITreeNode<string>[] = [];
-		const model = new ObjectTreeModel<string>('test', toSpliceable(list), { collapseByDefault: true });
+		const model = new ObjectTreeModel<string>('test', toList(list), { collapseByDefault: true });
 		const data = [{ element: 'father', children: [{ element: 'child' }] }];
 
 		model.setChildren(null, data);
@@ -173,7 +174,7 @@ suite('ObjectTreeModel', function () {
 		let compare: (a: string, b: string) => number = (a, b) => a < b ? -1 : 1;
 
 		const list: ITreeNode<string>[] = [];
-		const model = new ObjectTreeModel<string>('test', toSpliceable(list), { sorter: { compare(a, b) { return compare(a, b); } } });
+		const model = new ObjectTreeModel<string>('test', toList(list), { sorter: { compare(a, b) { return compare(a, b); } } });
 		const data = [
 			{ element: 'cars', children: [{ element: 'sedan' }, { element: 'convertible' }, { element: 'compact' }] },
 			{ element: 'airplanes', children: [{ element: 'passenger' }, { element: 'jet' }] },
@@ -188,7 +189,7 @@ suite('ObjectTreeModel', function () {
 		let compare: (a: string, b: string) => number = () => 0;
 
 		const list: ITreeNode<string>[] = [];
-		const model = new ObjectTreeModel<string>('test', toSpliceable(list), { sorter: { compare(a, b) { return compare(a, b); } } });
+		const model = new ObjectTreeModel<string>('test', toList(list), { sorter: { compare(a, b) { return compare(a, b); } } });
 		const data = [
 			{ element: 'cars', children: [{ element: 'sedan' }, { element: 'convertible' }, { element: 'compact' }] },
 			{ element: 'airplanes', children: [{ element: 'passenger' }, { element: 'jet' }] },
@@ -223,7 +224,7 @@ suite('ObjectTreeModel', function () {
 
 	test('expandTo', () => {
 		const list: ITreeNode<number>[] = [];
-		const model = new ObjectTreeModel<number>('test', toSpliceable(list), { collapseByDefault: true });
+		const model = new ObjectTreeModel<number>('test', toList(list), { collapseByDefault: true });
 
 		model.setChildren(null, [
 			{
@@ -254,7 +255,7 @@ suite('ObjectTreeModel', function () {
 				return fn(element) ? TreeVisibility.Visible : parentVisibility;
 			}
 		};
-		const model = new ObjectTreeModel<string>('test', toSpliceable(list), { filter });
+		const model = new ObjectTreeModel<string>('test', toList(list), { filter });
 
 		model.setChildren(null, [{ element: 'file', children: [{ element: 'hello' }] }]);
 		assert.deepEqual(toArray(list), ['file', 'hello']);

src/vs/base/test/node/encoding/encoding.test.ts

@@ -1,402 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as assert from 'assert';
-import * as fs from 'fs';
-import * as encoding from 'vs/base/node/encoding';
-import * as terminalEncoding from 'vs/base/node/terminalEncoding';
-import * as streams from 'vs/base/common/stream';
-import * as iconv from 'iconv-lite';
-import { getPathFromAmdModule } from 'vs/base/common/amd';
-import { newWriteableBufferStream, VSBuffer, VSBufferReadableStream, streamToBufferReadableStream } from 'vs/base/common/buffer';
-
-export async function detectEncodingByBOM(file: string): Promise<typeof encoding.UTF16be | typeof encoding.UTF16le | typeof encoding.UTF8_with_bom | null> {
-	try {
-		const { buffer, bytesRead } = await readExactlyByFile(file, 3);
-
-		return encoding.detectEncodingByBOMFromBuffer(buffer, bytesRead);
-	} catch (error) {
-		return null; // ignore errors (like file not found)
-	}
-}
-
-interface ReadResult {
-	buffer: VSBuffer | null;
-	bytesRead: number;
-}
-
-function readExactlyByFile(file: string, totalBytes: number): Promise<ReadResult> {
-	return new Promise<ReadResult>((resolve, reject) => {
-		fs.open(file, 'r', null, (err, fd) => {
-			if (err) {
-				return reject(err);
-			}
-
-			function end(err: Error | null, resultBuffer: Buffer | null, bytesRead: number): void {
-				fs.close(fd, closeError => {
-					if (closeError) {
-						return reject(closeError);
-					}
-
-					if (err && (<any>err).code === 'EISDIR') {
-						return reject(err); // we want to bubble this error up (file is actually a folder)
-					}
-
-					return resolve({ buffer: resultBuffer ? VSBuffer.wrap(resultBuffer) : null, bytesRead });
-				});
-			}
-
-			const buffer = Buffer.allocUnsafe(totalBytes);
-			let offset = 0;
-
-			function readChunk(): void {
-				fs.read(fd, buffer, offset, totalBytes - offset, null, (err, bytesRead) => {
-					if (err) {
-						return end(err, null, 0);
-					}
-
-					if (bytesRead === 0) {
-						return end(null, buffer, offset);
-					}
-
-					offset += bytesRead;
-
-					if (offset === totalBytes) {
-						return end(null, buffer, offset);
-					}
-
-					return readChunk();
-				});
-			}
-
-			readChunk();
-		});
-	});
-}
-
-suite('Encoding', () => {
-
-	test('detectBOM does not return error for non existing file', async () => {
-		const file = getPathFromAmdModule(require, './fixtures/not-exist.css');
-
-		const detectedEncoding = await detectEncodingByBOM(file);
-		assert.equal(detectedEncoding, null);
-	});
-
-	test('detectBOM UTF-8', async () => {
-		const file = getPathFromAmdModule(require, './fixtures/some_utf8.css');
-
-		const detectedEncoding = await detectEncodingByBOM(file);
-		assert.equal(detectedEncoding, 'utf8bom');
-	});
-
-	test('detectBOM UTF-16 LE', async () => {
-		const file = getPathFromAmdModule(require, './fixtures/some_utf16le.css');
-
-		const detectedEncoding = await detectEncodingByBOM(file);
-		assert.equal(detectedEncoding, 'utf16le');
-	});
-
-	test('detectBOM UTF-16 BE', async () => {
-		const file = getPathFromAmdModule(require, './fixtures/some_utf16be.css');
-
-		const detectedEncoding = await detectEncodingByBOM(file);
-		assert.equal(detectedEncoding, 'utf16be');
-	});
-
-	test('detectBOM ANSI', async function () {
-		const file = getPathFromAmdModule(require, './fixtures/some_ansi.css');
-
-		const detectedEncoding = await detectEncodingByBOM(file);
-		assert.equal(detectedEncoding, null);
-	});
-
-	test('detectBOM ANSI', async function () {
-		const file = getPathFromAmdModule(require, './fixtures/empty.txt');
-
-		const detectedEncoding = await detectEncodingByBOM(file);
-		assert.equal(detectedEncoding, null);
-	});
-
-	test('resolve terminal encoding (detect)', async function () {
-		const enc = await terminalEncoding.resolveTerminalEncoding();
-		assert.ok(enc.length > 0);
-	});
-
-	test('resolve terminal encoding (environment)', async function () {
-		process.env['VSCODE_CLI_ENCODING'] = 'utf16le';
-
-		const enc = await terminalEncoding.resolveTerminalEncoding();
-		assert.ok(await encoding.encodingExists(enc));
-		assert.equal(enc, 'utf16le');
-	});
-
-	test('detectEncodingFromBuffer (JSON saved as PNG)', async function () {
-		const file = getPathFromAmdModule(require, './fixtures/some.json.png');
-
-		const buffer = await readExactlyByFile(file, 512);
-		const mimes = encoding.detectEncodingFromBuffer(buffer);
-		assert.equal(mimes.seemsBinary, false);
-	});
-
-	test('detectEncodingFromBuffer (PNG saved as TXT)', async function () {
-		const file = getPathFromAmdModule(require, './fixtures/some.png.txt');
-		const buffer = await readExactlyByFile(file, 512);
-		const mimes = encoding.detectEncodingFromBuffer(buffer);
-		assert.equal(mimes.seemsBinary, true);
-	});
-
-	test('detectEncodingFromBuffer (XML saved as PNG)', async function () {
-		const file = getPathFromAmdModule(require, './fixtures/some.xml.png');
-		const buffer = await readExactlyByFile(file, 512);
-		const mimes = encoding.detectEncodingFromBuffer(buffer);
-		assert.equal(mimes.seemsBinary, false);
-	});
-
-	test('detectEncodingFromBuffer (QWOFF saved as TXT)', async function () {
-		const file = getPathFromAmdModule(require, './fixtures/some.qwoff.txt');
-		const buffer = await readExactlyByFile(file, 512);
-		const mimes = encoding.detectEncodingFromBuffer(buffer);
-		assert.equal(mimes.seemsBinary, true);
-	});
-
-	test('detectEncodingFromBuffer (CSS saved as QWOFF)', async function () {
-		const file = getPathFromAmdModule(require, './fixtures/some.css.qwoff');
-		const buffer = await readExactlyByFile(file, 512);
-		const mimes = encoding.detectEncodingFromBuffer(buffer);
-		assert.equal(mimes.seemsBinary, false);
-	});
-
-	test('detectEncodingFromBuffer (PDF)', async function () {
-		const file = getPathFromAmdModule(require, './fixtures/some.pdf');
-		const buffer = await readExactlyByFile(file, 512);
-		const mimes = encoding.detectEncodingFromBuffer(buffer);
-		assert.equal(mimes.seemsBinary, true);
-	});
-
-	test('detectEncodingFromBuffer (guess UTF-16 LE from content without BOM)', async function () {
-		const file = getPathFromAmdModule(require, './fixtures/utf16_le_nobom.txt');
-		const buffer = await readExactlyByFile(file, 512);
-		const mimes = encoding.detectEncodingFromBuffer(buffer);
-		assert.equal(mimes.encoding, encoding.UTF16le);
-		assert.equal(mimes.seemsBinary, false);
-	});
-
-	test('detectEncodingFromBuffer (guess UTF-16 BE from content without BOM)', async function () {
-		const file = getPathFromAmdModule(require, './fixtures/utf16_be_nobom.txt');
-		const buffer = await readExactlyByFile(file, 512);
-		const mimes = encoding.detectEncodingFromBuffer(buffer);
-		assert.equal(mimes.encoding, encoding.UTF16be);
-		assert.equal(mimes.seemsBinary, false);
-	});
-
-	test('autoGuessEncoding (UTF8)', async function () {
-		const file = getPathFromAmdModule(require, './fixtures/some_file.css');
-		const buffer = await readExactlyByFile(file, 512 * 8);
-		const mimes = await encoding.detectEncodingFromBuffer(buffer, true);
-		assert.equal(mimes.encoding, 'utf8');
-	});
-
-	test('autoGuessEncoding (ASCII)', async function () {
-		const file = getPathFromAmdModule(require, './fixtures/some_ansi.css');
-		const buffer = await readExactlyByFile(file, 512 * 8);
-		const mimes = await encoding.detectEncodingFromBuffer(buffer, true);
-		assert.equal(mimes.encoding, null);
-	});
-
-	test('autoGuessEncoding (ShiftJIS)', async function () {
-		const file = getPathFromAmdModule(require, './fixtures/some.shiftjis.txt');
-		const buffer = await readExactlyByFile(file, 512 * 8);
-		const mimes = await encoding.detectEncodingFromBuffer(buffer, true);
-		assert.equal(mimes.encoding, 'shiftjis');
-	});
-
-	test('autoGuessEncoding (CP1252)', async function () {
-		const file = getPathFromAmdModule(require, './fixtures/some.cp1252.txt');
-		const buffer = await readExactlyByFile(file, 512 * 8);
-		const mimes = await encoding.detectEncodingFromBuffer(buffer, true);
-		assert.equal(mimes.encoding, 'windows1252');
-	});
-
-	async function readAndDecodeFromDisk(path: string, fileEncoding: string | null) {
-		return new Promise<string>((resolve, reject) => {
-			fs.readFile(path, (err, data) => {
-				if (err) {
-					reject(err);
-				} else {
-					resolve(iconv.decode(data, encoding.toNodeEncoding(fileEncoding!)));
-				}
-			});
-		});
-	}
-
-	function newTestReadableStream(buffers: Buffer[]): VSBufferReadableStream {
-		const stream = newWriteableBufferStream();
-		buffers
-			.map(VSBuffer.wrap)
-			.forEach(buffer => {
-				setTimeout(() => {
-					stream.write(buffer);
-				});
-			});
-		setTimeout(() => {
-			stream.end();
-		});
-		return stream;
-	}
-
-	async function readAllAsString(stream: streams.ReadableStream<string>) {
-		return streams.consumeStream(stream, strings => strings.join(''));
-	}
-
-	test('toDecodeStream - some stream', async function () {
-		const source = newTestReadableStream([
-			Buffer.from([65, 66, 67]),
-			Buffer.from([65, 66, 67]),
-			Buffer.from([65, 66, 67]),
-		]);
-
-		const { detected, stream } = await encoding.toDecodeStream(source, { minBytesRequiredForDetection: 4, guessEncoding: false, overwriteEncoding: async detected => detected || encoding.UTF8 });
-
-		assert.ok(detected);
-		assert.ok(stream);
-
-		const content = await readAllAsString(stream);
-		assert.equal(content, 'ABCABCABC');
-	});
-
-	test('toDecodeStream - some stream, expect too much data', async function () {
-		const source = newTestReadableStream([
-			Buffer.from([65, 66, 67]),
-			Buffer.from([65, 66, 67]),
-			Buffer.from([65, 66, 67]),
-		]);
-
-		const { detected, stream } = await encoding.toDecodeStream(source, { minBytesRequiredForDetection: 64, guessEncoding: false, overwriteEncoding: async detected => detected || encoding.UTF8 });
-
-		assert.ok(detected);
-		assert.ok(stream);
-
-		const content = await readAllAsString(stream);
-		assert.equal(content, 'ABCABCABC');
-	});
-
-	test('toDecodeStream - some stream, no data', async function () {
-		const source = newWriteableBufferStream();
-		source.end();
-
-		const { detected, stream } = await encoding.toDecodeStream(source, { minBytesRequiredForDetection: 512, guessEncoding: false, overwriteEncoding: async detected => detected || encoding.UTF8 });
-
-		assert.ok(detected);
-		assert.ok(stream);
-
-		const content = await readAllAsString(stream);
-		assert.equal(content, '');
-	});
-
-
-	test('toDecodeStream - encoding, utf16be', async function () {
-		const path = getPathFromAmdModule(require, './fixtures/some_utf16be.css');
-		const source = streamToBufferReadableStream(fs.createReadStream(path));
-
-		const { detected, stream } = await encoding.toDecodeStream(source, { minBytesRequiredForDetection: 64, guessEncoding: false, overwriteEncoding: async detected => detected || encoding.UTF8 });
-
-		assert.equal(detected.encoding, 'utf16be');
-		assert.equal(detected.seemsBinary, false);
-
-		const expected = await readAndDecodeFromDisk(path, detected.encoding);
-		const actual = await readAllAsString(stream);
-		assert.equal(actual, expected);
-	});
-
-
-	test('toDecodeStream - empty file', async function () {
-		const path = getPathFromAmdModule(require, './fixtures/empty.txt');
-		const source = streamToBufferReadableStream(fs.createReadStream(path));
-		const { detected, stream } = await encoding.toDecodeStream(source, { guessEncoding: false, overwriteEncoding: async detected => detected || encoding.UTF8 });
-
-		const expected = await readAndDecodeFromDisk(path, detected.encoding);
-		const actual = await readAllAsString(stream);
-		assert.equal(actual, expected);
-	});
-
-	test('toDecodeStream - decodes buffer entirely', async function () {
-		const emojis = Buffer.from('🖥️💻💾');
-		const incompleteEmojis = emojis.slice(0, emojis.length - 1);
-
-		const buffers: Buffer[] = [];
-		for (let i = 0; i < incompleteEmojis.length; i++) {
-			buffers.push(incompleteEmojis.slice(i, i + 1));
-		}
-
-		const source = newTestReadableStream(buffers);
-		const { stream } = await encoding.toDecodeStream(source, { minBytesRequiredForDetection: 4, guessEncoding: false, overwriteEncoding: async detected => detected || encoding.UTF8 });
-
-		const expected = incompleteEmojis.toString(encoding.UTF8);
-		const actual = await readAllAsString(stream);
-
-		assert.equal(actual, expected);
-	});
-
-	test('toEncodeReadable - encoding, utf16be', async function () {
-		const path = getPathFromAmdModule(require, './fixtures/some_utf16be.css');
-		const source = await readAndDecodeFromDisk(path, encoding.UTF16be);
-
-		const expected = VSBuffer.wrap(
-			iconv.encode(source, encoding.toNodeEncoding(encoding.UTF16be))
-		).toString();
-
-		const actual = streams.consumeReadable(
-			await encoding.toEncodeReadable(streams.toReadable(source), encoding.UTF16be),
-			VSBuffer.concat
-		).toString();
-
-		assert.equal(actual, expected);
-	});
-
-	test('toEncodeReadable - empty readable to utf8', async function () {
-		const source: streams.Readable<string> = {
-			read() {
-				return null;
-			}
-		};
-
-		const actual = streams.consumeReadable(
-			await encoding.toEncodeReadable(source, encoding.UTF8),
-			VSBuffer.concat
-		).toString();
-
-		assert.equal(actual, '');
-	});
-
-	[{
-		utfEncoding: encoding.UTF8,
-		relatedBom: encoding.UTF8_BOM
-	}, {
-		utfEncoding: encoding.UTF8_with_bom,
-		relatedBom: encoding.UTF8_BOM
-	}, {
-		utfEncoding: encoding.UTF16be,
-		relatedBom: encoding.UTF16be_BOM,
-	}, {
-		utfEncoding: encoding.UTF16le,
-		relatedBom: encoding.UTF16le_BOM
-	}].forEach(({ utfEncoding, relatedBom }) => {
-		test(`toEncodeReadable - empty readable to ${utfEncoding} with BOM`, async function () {
-			const source: streams.Readable<string> = {
-				read() {
-					return null;
-				}
-			};
-
-			const encodedReadable = encoding.toEncodeReadable(source, utfEncoding, { addBOM: true });
-
-			const expected = VSBuffer.wrap(Buffer.from(relatedBom)).toString();
-			const actual = streams.consumeReadable(await encodedReadable, VSBuffer.concat).toString();
-
-			assert.equal(actual, expected);
-		});
-	});
-});

src/vs/base/test/node/encoding/fixtures/some.cp1252.txt

@@ -1,23 +0,0 @@
-using System;
-using System.Drawing;
-using System.Collections;
-using System.ComponentModel;
-using System.Windows.Forms;
-using System.Data;
-using System.Data.OleDb;
-using System.Data.Odbc;
-using System.IO;
-using System.Net.Mail;
-using System.Text.RegularExpressions;
-using System.DirectoryServices;
-using System.Diagnostics;
-using System.Resources;
-using System.Globalization;
-using System.Reflection;
-using System.Runtime.Serialization.Formatters.Binary;
-using System.Runtime.Serialization;
-
-
-ObjectCount = LoadObjects("Öffentlicher Ordner");  
-
-Private = "Persönliche Information"  

src/vs/base/test/node/encoding/fixtures/some.css.qwoff

@@ -1,35 +0,0 @@
-/*----------------------------------------------------------
-The base color for this template is #5c87b2. If you'd like
-to use a different color start by replacing all instances of
-#5c87b2 with your new color.
-----------------------------------------------------------*/
-body
-{
-    background-color: #5c87b2;
-    font-size: .75em;
-    font-family: Segoe UI, Verdana, Helvetica, Sans-Serif;
-    margin: 8px;
-    padding: 0;
-    color: #696969;
-}
-
-h1, h2, h3, h4, h5, h6
-{
-    color: #000;
-    font-size: 40px;
-    margin: 0px;
-}
-
-textarea 
-{
-   font-family: Consolas
-}
-
-#results 
-{
-    margin-top: 2em;
-    margin-left: 2em;
-    color: black;
-    font-size: medium;
-}
-

src/vs/base/test/node/encoding/fixtures/some.json.png

@@ -1,11 +0,0 @@
-{
-	"type": "typescript",
-
-	"sources": [
-		"examples/company.ts",
-		"examples/conway.ts",
-		"examples/employee.ts",
-		"examples/large.ts",
-		"examples/small.ts"
-	]
-}

src/vs/base/test/node/encoding/fixtures/some.shiftjis.txt

@@ -1 +0,0 @@
-VSCODEは最高のエディタだ。

src/vs/base/test/node/encoding/fixtures/some.xml.png

@@ -1,3 +0,0 @@
-<?xml>
-
-</xml>

src/vs/base/test/node/encoding/fixtures/some_ansi.css

@@ -1,40 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------
-The base color for this template is #5c87b2. If you'd like
-to use a different color start by replacing all instances of
-#5c87b2 with your new color.
-----------------------------------------------------------*/
-body
-{
-    background-color: #5c87b2;
-    font-size: .75em;
-    font-family: Segoe UI, Verdana, Helvetica, Sans-Serif;
-    margin: 8px;
-    padding: 0;
-    color: #696969;
-}
-
-h1, h2, h3, h4, h5, h6
-{
-    color: #000;
-    font-size: 40px;
-    margin: 0px;
-}
-
-textarea 
-{
-   font-family: Consolas
-}
-
-#results 
-{
-    margin-top: 2em;
-    margin-left: 2em;
-    color: black;
-    font-size: medium;
-}
-

src/vs/base/test/node/encoding/fixtures/some_file.css

@@ -1,42 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------
-The base color for this template is #5c87b2. If you'd like
-to use a different color start by replacing all instances of
-#5c87b2 with your new color.
-
-öäüßßß
-----------------------------------------------------------*/
-body
-{
-    background-color: #5c87b2;
-    font-size: .75em;
-    font-family: Segoe UI, Verdana, Helvetica, Sans-Serif;
-    margin: 8px;
-    padding: 0;
-    color: #696969;
-}
-
-h1, h2, h3, h4, h5, h6
-{
-    color: #000;
-    font-size: 40px;
-    margin: 0px;
-}
-
-textarea
-{
-   font-family: Consolas
-}
-
-#results
-{
-    margin-top: 2em;
-    margin-left: 2em;
-    color: black;
-    font-size: medium;
-}
-

src/vs/base/test/node/encoding/fixtures/some_utf8.css

@@ -1,42 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------
-The base color for this template is #5c87b2. If you'd like
-to use a different color start by replacing all instances of
-#5c87b2 with your new color.
-
-öäüßßß
-----------------------------------------------------------*/
-body
-{
-    background-color: #5c87b2;
-    font-size: .75em;
-    font-family: Segoe UI, Verdana, Helvetica, Sans-Serif;
-    margin: 8px;
-    padding: 0;
-    color: #696969;
-}
-
-h1, h2, h3, h4, h5, h6
-{
-    color: #000;
-    font-size: 40px;
-    margin: 0px;
-}
-
-textarea
-{
-   font-family: Consolas
-}
-
-#results
-{
-    margin-top: 2em;
-    margin-left: 2em;
-    color: black;
-    font-size: medium;
-}
-