findTextInFiles - 'null' skipes configured excludes

roblourens · roblourens · commit f666f0be0a7e · 2018-07-01T15:34:14.000-07:00
diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
@@ -62,8 +62,6 @@ declare module 'vscode' {
 
 	export namespace workspace {
 		export function registerSearchProvider(scheme: string, provider: SearchProvider): Disposable;
-
-		// Maybe keep includes and excludes separate to mirror findFiles and make it more natural to pass 'null' to disable excludes
 		export function findTextInFiles(query: TextSearchQuery, options: FindTextInFilesOptions, callback: (result: TextSearchResult) => void, token?: CancellationToken): Thenable<void>;
 	}
 
diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts
@@ -501,7 +501,7 @@ export function createApiFactory(
 				return extHostWorkspace.findFiles(typeConverters.GlobPattern.from(include), typeConverters.GlobPattern.from(exclude), maxResults, extension.id, token);
 			},
 			findTextInFiles: (query: vscode.TextSearchQuery, options: vscode.FindTextInFilesOptions, callback: (result: vscode.TextSearchResult) => void, token?: vscode.CancellationToken) => {
-				return extHostWorkspace.findTextInFiles(query, options, callback, extension.id, token);
+				return extHostWorkspace.findTextInFiles(query, options || {}, callback, extension.id, token);
 			},
 			saveAll: (includeUntitled?) => {
 				return extHostWorkspace.saveAll(includeUntitled);
diff --git a/src/vs/workbench/api/node/extHostWorkspace.ts b/src/vs/workbench/api/node/extHostWorkspace.ts
@@ -386,6 +386,7 @@ 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,
 			fileEncoding: options.encoding,
 			maxResults: options.maxResults,
 

Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,6 @@ declare module 'vscode' {`
`62`	`62`
`63`	`63`	`export namespace workspace {`
`64`	`64`	`export function registerSearchProvider(scheme: string, provider: SearchProvider): Disposable;`
`65`		`-`
`66`		`- // Maybe keep includes and excludes separate to mirror findFiles and make it more natural to pass 'null' to disable excludes`
`67`	`65`	`export function findTextInFiles(query: TextSearchQuery, options: FindTextInFilesOptions, callback: (result: TextSearchResult) => void, token?: CancellationToken): Thenable<void>;`
`68`	`66`	`}`
`69`	`67`