Merge from vscode 5b9869eb02fa4c96205a74d05cad9164dfd06d60 (#5607)

This commit is contained in:
Anthony Dresser
2019-05-24 12:20:30 -07:00
committed by GitHub
parent 361ada4963
commit bcc449b524
126 changed files with 3096 additions and 2255 deletions

View File

@@ -9,20 +9,19 @@ import * as stream from 'vs/base/node/stream';
import { getPathFromAmdModule } from 'vs/base/common/amd';
suite('Stream', () => {
test('readToMatchingString - ANSI', function () {
test('readToMatchingString - ANSI', async () => {
const file = getPathFromAmdModule(require, './fixtures/file.css');
return stream.readToMatchingString(file, '\n', 10, 100).then((result: string) => {
// \r may be present on Windows
assert.equal(result.replace('\r', ''), '/*---------------------------------------------------------------------------------------------');
});
const result = await stream.readToMatchingString(file, '\n', 10, 100);
// \r may be present on Windows
assert.equal(result!.replace('\r', ''), '/*---------------------------------------------------------------------------------------------');
});
test('readToMatchingString - empty', function () {
test('readToMatchingString - empty', async () => {
const file = getPathFromAmdModule(require, './fixtures/empty.txt');
return stream.readToMatchingString(file, '\n', 10, 100).then((result: string) => {
assert.equal(result, null);
});
const result = await stream.readToMatchingString(file, '\n', 10, 100);
assert.equal(result, null);
});
});