From 2fe0e23d7cba3f304d63d4ca3fd19d2a4783657f Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Sun, 10 Mar 2019 00:50:46 +0000
Subject: [PATCH] Fix querybuilder tests

---
 .../contrib/search/common/queryBuilder.ts     |  2 +-
 .../search/test/common/queryBuilder.test.ts   | 32 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/vs/workbench/contrib/search/common/queryBuilder.ts b/src/vs/workbench/contrib/search/common/queryBuilder.ts
index c1e525e22a8..f4d479fa1f2 100644
--- a/src/vs/workbench/contrib/search/common/queryBuilder.ts
+++ b/src/vs/workbench/contrib/search/common/queryBuilder.ts
@@ -332,7 +332,7 @@ export class QueryBuilder {
 
 			searchPath = normalizeSlashes(searchPath);
 			if (strings.startsWith(searchPath, '../')) {
-				const resolvedPath = path.resolve(workspaceUri.path, searchPath);
+				const resolvedPath = path.posix.resolve(workspaceUri.path, searchPath);
 				return [{
 					searchPath: workspaceUri.with({ path: resolvedPath })
 				}];
diff --git a/src/vs/workbench/contrib/search/test/common/queryBuilder.test.ts b/src/vs/workbench/contrib/search/test/common/queryBuilder.test.ts
index 77279512b17..5eec2e0c82d 100644
--- a/src/vs/workbench/contrib/search/test/common/queryBuilder.test.ts
+++ b/src/vs/workbench/contrib/search/test/common/queryBuilder.test.ts
@@ -659,22 +659,22 @@ suite('QueryBuilder', () => {
 						}]
 					}
 				],
-				// [
-				// 	'../',
-				// 	{
-				// 		searchPaths: [{
-				// 			searchPath: getUri('/foo')
-				// 		}]
-				// 	}
-				// ],
-				// [
-				// 	'..\\bar',
-				// 	{
-				// 		searchPaths: [{
-				// 			searchPath: getUri('/foo/bar')
-				// 		}]
-				// 	}
-				// ]
+				[
+					'../',
+					{
+						searchPaths: [{
+							searchPath: getUri('/foo')
+						}]
+					}
+				],
+				[
+					'..\\bar',
+					{
+						searchPaths: [{
+							searchPath: getUri('/foo/bar')
+						}]
+					}
+				]
 			];
 			cases.forEach(testIncludesDataItem);
 		});
-- 
GitLab