development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #146641

Browse source
This commit is contained in:
Jackson Kearl 2022-04-05 16:18:37 -07:00
parent fd46d7191c
commit a4ff080324
No known key found for this signature in database
GPG key ID: DA09A59C409FC400
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/vs/workbench/services/search/worker/localFileSearch.ts
View file

@ -190,7 +190,7 @@ export class LocalFileSearchSimpleWorker implements ILocalFileSearchSimpleWorker
const isFileIncluded = (path: string, basename: string, hasSibling: (query: string) => boolean) => {
path = path.slice(1);
if (folderExcludes(path, basename, hasSibling)) { return false; }
if (!pathIncludedInQuery(queryProps, URI.file(path), extUri)) { return false; }
if (!pathIncludedInQuery(queryProps, path, extUri)) { return false; }
return true;
};
@ -325,13 +325,13 @@ function pathExcludedInQuery(queryProps: ICommonQueryProps<URI>, fsPath: string)
return false;
}
function pathIncludedInQuery(queryProps: ICommonQueryProps<URI>, path: URI, extUri: ExtUri): boolean {
if (queryProps.excludePattern && glob.match(queryProps.excludePattern, path.fsPath)) {
function pathIncludedInQuery(queryProps: ICommonQueryProps<URI>, path: string, extUri: ExtUri): boolean {
if (queryProps.excludePattern && glob.match(queryProps.excludePattern, path)) {
return false;
}
if (queryProps.includePattern || queryProps.usingSearchPaths) {
if (queryProps.includePattern && glob.match(queryProps.includePattern, path.fsPath)) {
if (queryProps.includePattern && glob.match(queryProps.includePattern, path)) {
return true;
}
@ -340,8 +340,9 @@ function pathIncludedInQuery(queryProps: ICommonQueryProps<URI>, path: URI, extU
return !!queryProps.folderQueries && queryProps.folderQueries.some(fq => {
const searchPath = fq.folder;
if (extUri.isEqualOrParent(path, searchPath)) {
const relPath = paths.relative(searchPath.path, path.path);
const uri = URI.file(path);
if (extUri.isEqualOrParent(uri, searchPath)) {
const relPath = paths.relative(searchPath.path, uri.path);
return !fq.includePattern || !!glob.match(fq.includePattern, relPath);
} else {
return false;