Merge from vscode 2b0b9136329c181a9e381463a1f7dc3a2d105a34 (#4880)

This commit is contained in:
Karl Burtram
2019-04-05 10:09:18 -07:00
committed by GitHub
parent 9bd7e30d18
commit cb5bcf2248
433 changed files with 8915 additions and 8361 deletions

View File

@@ -455,7 +455,7 @@ suite('Glob', () => {
expression = {
'**/*.js': {
}
} as any
};
assert.strictEqual('**/*.js', glob.match(expression, 'test.js', hasSibling));
@@ -474,7 +474,7 @@ suite('Glob', () => {
'**/*.js': { when: '$(basename).ts' },
'**/*.as': true,
'**/*.foo': false,
'**/*.bananas': { bananas: true }
'**/*.bananas': { bananas: true } as any
};
assert.strictEqual('**/*.js', glob.match(expression, 'test.js', hasSibling));
@@ -691,7 +691,7 @@ suite('Glob', () => {
});
test('expression with other falsy value', function () {
let expr = { '**/*.js': 0 };
let expr = { '**/*.js': 0 } as any;
assert.strictEqual(glob.match(expr, 'foo.js'), '**/*.js');
});