From 966b87dd4013be1a9c06e2b8334522ec61905cc2 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Mon, 25 Mar 2019 23:37:52 +0000 Subject: [PATCH] Fix #71120 - incorrectly formatted uris in liveshare --- src/vs/workbench/services/search/node/fileSearchManager.ts | 4 ++-- .../workbench/test/electron-browser/api/extHostSearch.test.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/services/search/node/fileSearchManager.ts b/src/vs/workbench/services/search/node/fileSearchManager.ts index d78ded834d1..2543bc9e0f4 100644 --- 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 index 0f1f053faf2..7200e234fac 100644 --- 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'), ]; -- GitLab