Merge from vscode 966b87dd4013be1a9c06e2b8334522ec61905cc2 (#4696)

This commit is contained in:
Anthony Dresser
2019-03-26 11:43:38 -07:00
committed by GitHub
parent b1393ae615
commit 0d8ef9583b
268 changed files with 5947 additions and 3422 deletions

View File

@@ -181,7 +181,7 @@ suite('ExtHostSearch', () => {
const reportedResults = [
joinPath(rootFolderA, 'file1.ts'),
joinPath(rootFolderA, 'file2.ts'),
joinPath(rootFolderA, 'file3.ts')
joinPath(rootFolderA, 'subfolder/file3.ts')
];
await registerTestFileSearchProvider({
@@ -586,7 +586,7 @@ suite('ExtHostSearch', () => {
const reportedResults = [
joinPath(fancySchemeFolderA, 'file1.ts'),
joinPath(fancySchemeFolderA, 'file2.ts'),
joinPath(fancySchemeFolderA, 'file3.ts'),
joinPath(fancySchemeFolderA, 'subfolder/file3.ts'),
];