maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge 863e359295 into 7dfcd74e63

Browse source
This commit is contained in:
John Murray 2021-11-26 13:18:42 -08:00 committed by GitHub
parent 7dfcd74e63 863e359295
commit 3af82d93ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/vs/workbench/contrib/search/common/queryBuilder.ts
View file

@ -595,15 +595,15 @@ export function resolveResourcesForSearchIncludes(resources: URI[], contextServi
} else {
const owningFolder = contextService.getWorkspaceFolder(resource);
if (owningFolder) {
const owningRootName = owningFolder.name;
const owningRootBasename = basename(owningFolder.uri);
// If this root is the only one with its basename, use a relative ./ path. If there is another, use an absolute path
const isUniqueFolder = workspace.folders.filter(folder => folder.name === owningRootName).length === 1;
const isUniqueFolder = workspace.folders.filter(folder => basename(folder.uri) === owningRootBasename).length === 1;
if (isUniqueFolder) {
const relPath = relativePath(owningFolder.uri, resource); // always uses forward slashes
if (relPath === '') {
folderPath = `./${owningFolder.name}`;
folderPath = `./${owningRootBasename}`;
} else {
folderPath = `./${owningFolder.name}/${relPath}`;
folderPath = `./${owningRootBasename}/${relPath}`;
}
} else {
folderPath = resource.fsPath; // TODO rob: handle non-file URIs