Fix #71120 - incorrectly formatted uris in liveshare

anthonydresser · Mar 25, 2019 · 966b87d · 966b87d
1 parent 03bdc72
commit 966b87d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/vs/workbench/services/search/node/fileSearchManager.ts b/src/vs/workbench/services/search/node/fileSearchManager.ts
@@ -136,10 +136,10 @@ class FileSearchEngine {
 
 					if (results) {
 						results.forEach(result => {
-							const relativePath = path.relative(fq.folder.fsPath, result.fsPath);
+							const relativePath = path.posix.relative(fq.folder.path, result.path);
 
 							if (noSiblingsClauses) {
-								const basename = path.basename(result.fsPath);
+								const basename = path.basename(result.path);
 								this.matchFile(onResult, { base: fq.folder, relativePath, basename });
 
 								return;

diff --git a/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts b/src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts
@@ -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'),
 
 			];