From de93fea90510dc7c449dbbb83cd07e7a9509cb27 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 6 Nov 2017 16:16:26 -0800
Subject: [PATCH] Fix some strict function mode tests in queryBuilder

TS cannot properly infer the types in this case
---
 .../search/test/common/queryBuilder.test.ts   | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/vs/workbench/parts/search/test/common/queryBuilder.test.ts b/src/vs/workbench/parts/search/test/common/queryBuilder.test.ts
index 4cf542b63a9..5f5fa458e07 100644
--- a/src/vs/workbench/parts/search/test/common/queryBuilder.test.ts
+++ b/src/vs/workbench/parts/search/test/common/queryBuilder.test.ts
@@ -356,12 +356,12 @@ suite('QueryBuilder', () => {
 				includePattern);
 		}
 
-		function testIncludesDataItem([includePattern, expectedResult]): void {
-			testIncludes(<string>includePattern, <ISearchPathsResult>expectedResult);
+		function testIncludesDataItem([includePattern, expectedResult]: [string, ISearchPathsResult]): void {
+			testIncludes(includePattern, expectedResult);
 		}
 
 		test('absolute includes', () => {
-			[
+			const cases: [string, ISearchPathsResult][] = [
 				[
 					fixPath('/foo/bar'),
 					<ISearchPathsResult>{
@@ -425,11 +425,12 @@ suite('QueryBuilder', () => {
 						}]
 					}
 				]
-			].forEach(testIncludesDataItem);
+			];
+			cases.forEach(testIncludesDataItem);
 		});
 
 		test('relative includes w/single root folder', () => {
-			[
+			const cases: [string, ISearchPathsResult][] = [
 				[
 					'./a',
 					<ISearchPathsResult>{
@@ -468,7 +469,8 @@ suite('QueryBuilder', () => {
 						}]
 					}
 				],
-			].forEach(testIncludesDataItem);
+			];
+			cases.forEach(testIncludesDataItem);
 		});
 
 		test('relative includes w/two root folders', () => {
@@ -476,7 +478,7 @@ suite('QueryBuilder', () => {
 			mockWorkspace.folders = toWorkspaceFolders([{ path: ROOT_1_URI.fsPath }, { path: getUri(ROOT_2).fsPath }]);
 			mockWorkspace.configuration = uri.file(fixPath('config'));
 
-			[
+			const cases: [string, ISearchPathsResult][] = [
 				[
 					'./root1',
 					<ISearchPathsResult>{
@@ -507,7 +509,8 @@ suite('QueryBuilder', () => {
 							}]
 					}
 				]
-			].forEach(testIncludesDataItem);
+			];
+			cases.forEach(testIncludesDataItem);
 		});
 
 		test('relative includes w/multiple ambiguous root folders', () => {
@@ -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.configuration = uri.file(fixPath('/config'));
 
-			[
+			const cases: [string, ISearchPathsResult][] = [
 				[
 					'',
 					<ISearchPathsResult>{
@@ -579,7 +582,8 @@ suite('QueryBuilder', () => {
 							}]
 					}
 				]
-			].forEach(testIncludesDataItem);
+			];
+			cases.forEach(testIncludesDataItem);
 		});
 	});
 });
-- 
GitLab