Merge pull request microsoft#226913 from microsoft/andreamah/issue226859

Closed notebook search blocks text search

Author: andreamah

src/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchService.ts

@@ -117,22 +117,21 @@ export class NotebookSearchService implements INotebookSearchService {
 	}
 
 	private async doesFileExist(includes: string[], folderQueries: IFolderQuery<URI>[], token: CancellationToken): Promise<boolean> {
-		const promises: Promise<void>[] = includes.map(async includePattern => {
+		const promises: Promise<boolean>[] = includes.map(async includePattern => {
 			const query = this.queryBuilder.file(folderQueries.map(e => e.folder), {
 				includePattern: includePattern.startsWith('/') ? includePattern : '**/' + includePattern, // todo: find cleaner way to ensure that globs match all appropriate filetypes
-				exists: true
+				exists: true,
+				onlyFileScheme: true,
 			});
 			return this.searchService.fileSearch(
 				query,
 				token
 			).then((ret) => {
-				if (!ret.limitHit) {
-					throw Error('File not found');
-				}
+				return !!ret.limitHit;
 			});
 		});
 
-		return Promise.any(promises).then(() => true).catch(() => false);
+		return Promise.any(promises);
 	}
 
 	private async getClosedNotebookResults(textQuery: ITextQuery, scannedFiles: ResourceSet, token: CancellationToken): Promise<IClosedNotebookSearchResults> {

src/vs/workbench/services/search/common/queryBuilder.ts

@@ -92,6 +92,7 @@ interface ICommonQueryBuilderOptions {
 	disregardSearchExcludeSettings?: boolean;
 	ignoreSymlinks?: boolean;
 	onlyOpenEditors?: boolean;
+	onlyFileScheme?: boolean;
 }
 
 export interface IFileQueryBuilderOptions extends ICommonQueryBuilderOptions {
@@ -260,7 +261,8 @@ export class QueryBuilder {
 			excludePattern: excludeSearchPathsInfo.pattern,
 			includePattern: includeSearchPathsInfo.pattern,
 			onlyOpenEditors: options.onlyOpenEditors,
-			maxResults: options.maxResults
+			maxResults: options.maxResults,
+			onlyFileScheme: options.onlyFileScheme
 		};
 
 		if (options.onlyOpenEditors) {

src/vs/workbench/services/search/common/search.ts

@@ -100,6 +100,7 @@ export interface ICommonQueryProps<U extends UriComponents> {
 
 	maxResults?: number;
 	usingSearchPaths?: boolean;
+	onlyFileScheme?: boolean;
 }
 
 export interface IFileQueryProps<U extends UriComponents> extends ICommonQueryProps<U> {

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

@@ -271,6 +271,9 @@ export class SearchService extends Disposable implements ISearchService {
 			return [];
 		}
 		await Promise.all([...fqs.keys()].map(async scheme => {
+			if (query.onlyFileScheme && scheme !== Schemas.file) {
+				return;
+			}
 			const schemeFQs = fqs.get(scheme)!;
 			let provider = this.getSearchProvider(query.type).get(scheme);