diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts index 21c791c6d07..d378593816e 100644 --- a/src/vs/vscode.proposed.d.ts +++ b/src/vs/vscode.proposed.d.ts @@ -190,8 +190,8 @@ declare module 'vscode' { } export interface FindTextInFilesOptions { - includes?: GlobPattern[]; - excludes?: GlobPattern[]; + include?: GlobPattern; + exclude?: GlobPattern; maxResults?: number; useIgnoreFiles?: boolean; followSymlinks?: boolean; diff --git a/src/vs/workbench/api/node/extHostWorkspace.ts b/src/vs/workbench/api/node/extHostWorkspace.ts index 536b4e58f9e..2afd565ed8a 100644 --- a/src/vs/workbench/api/node/extHostWorkspace.ts +++ b/src/vs/workbench/api/node/extHostWorkspace.ts @@ -386,12 +386,12 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape { const queryOptions: IQueryOptions = { ignoreSymlinks: typeof options.followSymlinks === 'boolean' ? !options.followSymlinks : undefined, disregardIgnoreFiles: typeof options.useIgnoreFiles === 'boolean' ? !options.useIgnoreFiles : undefined, - disregardExcludeSettings: options.excludes === null, + disregardExcludeSettings: options.exclude === null, fileEncoding: options.encoding, maxResults: options.maxResults, - includePattern: options.includes && options.includes.map(include => globPatternToString(include)).join(', '), - excludePattern: options.excludes && options.excludes.map(exclude => globPatternToString(exclude)).join(', ') + includePattern: options.include && globPatternToString(options.include), + excludePattern: options.exclude && globPatternToString(options.exclude) }; this._activeSearchCallbacks[requestId] = p => {