提交 de93fea9 编写于 作者: M Matt Bierner

Fix some strict function mode tests in queryBuilder

TS cannot properly infer the types in this case
上级 6c19ff14
...@@ -356,12 +356,12 @@ suite('QueryBuilder', () => { ...@@ -356,12 +356,12 @@ suite('QueryBuilder', () => {
includePattern); includePattern);
} }
function testIncludesDataItem([includePattern, expectedResult]): void { function testIncludesDataItem([includePattern, expectedResult]: [string, ISearchPathsResult]): void {
testIncludes(<string>includePattern, <ISearchPathsResult>expectedResult); testIncludes(includePattern, expectedResult);
} }
test('absolute includes', () => { test('absolute includes', () => {
[ const cases: [string, ISearchPathsResult][] = [
[ [
fixPath('/foo/bar'), fixPath('/foo/bar'),
<ISearchPathsResult>{ <ISearchPathsResult>{
...@@ -425,11 +425,12 @@ suite('QueryBuilder', () => { ...@@ -425,11 +425,12 @@ suite('QueryBuilder', () => {
}] }]
} }
] ]
].forEach(testIncludesDataItem); ];
cases.forEach(testIncludesDataItem);
}); });
test('relative includes w/single root folder', () => { test('relative includes w/single root folder', () => {
[ const cases: [string, ISearchPathsResult][] = [
[ [
'./a', './a',
<ISearchPathsResult>{ <ISearchPathsResult>{
...@@ -468,7 +469,8 @@ suite('QueryBuilder', () => { ...@@ -468,7 +469,8 @@ suite('QueryBuilder', () => {
}] }]
} }
], ],
].forEach(testIncludesDataItem); ];
cases.forEach(testIncludesDataItem);
}); });
test('relative includes w/two root folders', () => { test('relative includes w/two root folders', () => {
...@@ -476,7 +478,7 @@ suite('QueryBuilder', () => { ...@@ -476,7 +478,7 @@ suite('QueryBuilder', () => {
mockWorkspace.folders = toWorkspaceFolders([{ path: ROOT_1_URI.fsPath }, { path: getUri(ROOT_2).fsPath }]); mockWorkspace.folders = toWorkspaceFolders([{ path: ROOT_1_URI.fsPath }, { path: getUri(ROOT_2).fsPath }]);
mockWorkspace.configuration = uri.file(fixPath('config')); mockWorkspace.configuration = uri.file(fixPath('config'));
[ const cases: [string, ISearchPathsResult][] = [
[ [
'./root1', './root1',
<ISearchPathsResult>{ <ISearchPathsResult>{
...@@ -507,7 +509,8 @@ suite('QueryBuilder', () => { ...@@ -507,7 +509,8 @@ suite('QueryBuilder', () => {
}] }]
} }
] ]
].forEach(testIncludesDataItem); ];
cases.forEach(testIncludesDataItem);
}); });
test('relative includes w/multiple ambiguous root folders', () => { test('relative includes w/multiple ambiguous root folders', () => {
...@@ -516,7 +519,7 @@ suite('QueryBuilder', () => { ...@@ -516,7 +519,7 @@ suite('QueryBuilder', () => {
mockWorkspace.folders = toWorkspaceFolders([{ path: ROOT_1_URI.fsPath }, { path: getUri(ROOT_2).fsPath }, { path: getUri(ROOT_3).fsPath }]); mockWorkspace.folders = toWorkspaceFolders([{ path: ROOT_1_URI.fsPath }, { path: getUri(ROOT_2).fsPath }, { path: getUri(ROOT_3).fsPath }]);
mockWorkspace.configuration = uri.file(fixPath('/config')); mockWorkspace.configuration = uri.file(fixPath('/config'));
[ const cases: [string, ISearchPathsResult][] = [
[ [
'', '',
<ISearchPathsResult>{ <ISearchPathsResult>{
...@@ -579,7 +582,8 @@ suite('QueryBuilder', () => { ...@@ -579,7 +582,8 @@ suite('QueryBuilder', () => {
}] }]
} }
] ]
].forEach(testIncludesDataItem); ];
cases.forEach(testIncludesDataItem);
}); });
}); });
}); });
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册