Fix #31825, not handling 'false' excludes correctly

src/vs/workbench/services/search/node/fileSearch.ts

@@ -692,15 +692,17 @@ class AbsoluteAndRelativeParsedExpression {
 	private init(expr: glob.IExpression): void {
 		let absoluteGlobExpr: glob.IExpression;
 		let relativeGlobExpr: glob.IExpression;
-		Object.keys(expr).forEach(key => {
-			if (path.isAbsolute(key)) {
-				absoluteGlobExpr = absoluteGlobExpr || glob.getEmptyExpression();
-				absoluteGlobExpr[key] = true;
-			} else {
-				relativeGlobExpr = relativeGlobExpr || glob.getEmptyExpression();
-				relativeGlobExpr[key] = true;
-			}
-		});
+		Object.keys(expr)
+			.filter(key => expr[key])
+			.forEach(key => {
+				if (path.isAbsolute(key)) {
+					absoluteGlobExpr = absoluteGlobExpr || glob.getEmptyExpression();
+					absoluteGlobExpr[key] = true;
+				} else {
+					relativeGlobExpr = relativeGlobExpr || glob.getEmptyExpression();
+					relativeGlobExpr[key] = true;
+				}
+			});
 
 		this.absoluteParsedExpr = absoluteGlobExpr && glob.parse(absoluteGlobExpr, { trimForExclusions: true });
 		this.relativeParsedExpr = relativeGlobExpr && glob.parse(relativeGlobExpr, { trimForExclusions: true });

src/vs/workbench/services/search/node/ripgrepTextSearch.ts

@@ -373,7 +373,7 @@ function foldersToRgExcludeGlobs(folderQueries: IFolderSearch[], globalExclude:
 	const globArgs: string[] = [];
 	let siblingClauses: glob.IExpression = {};
 	folderQueries.forEach(folderQuery => {
-		const totalExcludePattern = objects.assign({}, globalExclude || {}, folderQuery.excludePattern || {});
+		const totalExcludePattern = objects.assign({}, folderQuery.excludePattern || {}, globalExclude || {});
 		const result = globExprsToRgGlobs(totalExcludePattern, folderQuery.folder);
 		globArgs.push(...result.globArgs);
 		if (result.siblingClauses) {

src/vs/workbench/services/search/node/searchService.ts

@@ -59,8 +59,6 @@ export class SearchService implements ISearchService {
 	}
 
 	public search(query: ISearchQuery): PPromise<ISearchComplete, ISearchProgressItem> {
-		this.extendQuery(query);
-
 		let rawSearchQuery: PPromise<void, ISearchProgressItem>;
 		return new PPromise<ISearchComplete, ISearchProgressItem>((onComplete, onError, onProgress) => {
 
@@ -198,7 +196,8 @@ export class DiskSearch {
 					AMD_ENTRYPOINT: 'vs/workbench/services/search/node/searchApp',
 					PIPE_LOGGING: 'true',
 					VERBOSE_LOGGING: verboseLogging
-				}
+				},
+				debug: 7890
 			}
 		);