daohualiuxiang
/
vscode
mirror of https://github.com/microsoft/vscode.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add extra type check in `findFiles2` (#235692) 

For https://github.com/microsoft/vscode-copilot-release/issues/2493

Looking at the code I'm still not sure how this can happen but it seems like we end up trying to call `.map` on a value that is not an array. Adding a more explicit exception here to hopefully track this down
pull/235791/head
Matt Bierner 2024-12-10 15:10:10 -08:00 committed by GitHub
parent 253145591b
commit 75e8699bf9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/vs/workbench/api/common/extHostWorkspace.ts
View File

@ -468,7 +468,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
}
// todo: consider exclude baseURI if available
return this._findFilesImpl(include, undefined, {
return this._findFilesImpl({ type: 'include', value: include }, {
exclude: [excludeString],
maxResults,
useExcludeSettings: useFileExcludes ? ExcludeSettingOptions.FilesExclude : ExcludeSettingOptions.None,
@ -484,23 +484,26 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
extensionId: ExtensionIdentifier,
token: vscode.CancellationToken = CancellationToken.None): Promise<vscode.Uri[]> {
this._logService.trace(`extHostWorkspace#findFiles2New: fileSearch, extension: ${extensionId.value}, entryPoint: findFiles2New`);
return this._findFilesImpl(undefined, filePatterns, options, token);
return this._findFilesImpl({ type: 'filePatterns', value: filePatterns }, options, token);
}
private async _findFilesImpl(
// the old `findFiles` used `include` to query, but the new `findFiles2` uses `filePattern` to query.
// `filePattern` is the proper way to handle this, since it takes less precedence than the ignore files.
include: vscode.GlobPattern | undefined,
filePatterns: vscode.GlobPattern[] | undefined,
query: { type: 'include'; value: vscode.GlobPattern | undefined } | { type: 'filePatterns'; value: vscode.GlobPattern[] },
options: vscode.FindFiles2Options,
token: vscode.CancellationToken = CancellationToken.None): Promise<vscode.Uri[]> {
if (token && token.isCancellationRequested) {
token: vscode.CancellationToken
): Promise<vscode.Uri[]> {
if (token.isCancellationRequested) {
return Promise.resolve([]);
}
const filePatternsToUse = query.type === 'include' ? [query.value] : query.value ?? [];
if (!Array.isArray(filePatternsToUse)) {
throw new Error(`Invalid file pattern provided ${filePatternsToUse}`);
}
const filePatternsToUse = include !== undefined ? [include] : filePatterns;
const queryOptions: QueryOptions<IFileQueryBuilderOptions>[] = filePatternsToUse?.map(filePattern => {
const queryOptions: QueryOptions<IFileQueryBuilderOptions>[] = filePatternsToUse.map(filePattern => {
const excludePatterns = globsToISearchPatternBuilder(options.exclude);
@ -514,21 +517,22 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
maxResults: options.maxResults,
excludePattern: excludePatterns.length > 0 ? excludePatterns : undefined,
_reason: 'startFileSearch',
shouldGlobSearch: include ? undefined : true,
shouldGlobSearch: query.type === 'include' ? undefined : true,
};
const parseInclude = parseSearchExcludeInclude(GlobPattern.from(filePattern));
const folderToUse = parseInclude?.folder;
if (include) {
if (query.type === 'include') {
fileQueries.includePattern = parseInclude?.pattern;
} else {
fileQueries.filePattern = parseInclude?.pattern;
}
return {
folder: folderToUse,
options: fileQueries
};
}) ?? [];
});
return this._findFilesBase(queryOptions, token);
}