Revert "Revert "Fix rawSearchService to handle maxResults=0 correctly""

Benjamin Pasero · Benjamin Pasero · commit 33f336c612e3 · 2019-09-05T11:16:09.000+02:00
This reverts commit 191ecb9.
diff --git a/src/vs/workbench/services/search/node/rawSearchService.ts b/src/vs/workbench/services/search/node/rawSearchService.ts
@@ -254,7 +254,7 @@ export class SearchService implements IRawSearchService {
 		const query = prepareQuery(config.filePattern || '');
 		const compare = (matchA: IRawFileMatch, matchB: IRawFileMatch) => compareItemsByScore(matchA, matchB, query, true, FileMatchItemAccessor, scorerCache);
 
-		const maxResults = config.maxResults || Number.MAX_VALUE;
+		const maxResults = typeof config.maxResults === 'number' ? config.maxResults : Number.MAX_VALUE;
 		return arrays.topAsync(results, compare, maxResults, 10000, token);
 	}
 
diff --git a/src/vs/workbench/services/search/test/node/rawSearchService.test.ts b/src/vs/workbench/services/search/test/node/rawSearchService.test.ts
@@ -185,6 +185,25 @@ suite('RawSearchService', () => {
 		assert.strictEqual(result.results.length, 1, 'Result');
 	});
 
+	test('Handles maxResults=0 correctly', async function () {
+		this.timeout(testTimeout);
+		const service = new RawSearchService();
+
+		const query: IFileQuery = {
+			type: QueryType.File,
+			folderQueries: MULTIROOT_QUERIES,
+			maxResults: 0,
+			sortByScore: true,
+			includePattern: {
+				'*.txt': true,
+				'*.js': true
+			},
+		};
+
+		const result = await DiskSearch.collectResultsFromEvent(service.fileSearch(query));
+		assert.strictEqual(result.results.length, 0, 'Result');
+	});
+
 	test('Multi-root with include pattern and exists', async function () {
 		this.timeout(testTimeout);
 		const service = new RawSearchService();

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ export class SearchService implements IRawSearchService {`
`254`	`254`	`const query = prepareQuery(config.filePattern \|\| '');`
`255`	`255`	`const compare = (matchA: IRawFileMatch, matchB: IRawFileMatch) => compareItemsByScore(matchA, matchB, query, true, FileMatchItemAccessor, scorerCache);`
`256`	`256`
`257`		`- const maxResults = config.maxResults \|\| Number.MAX_VALUE;`
	`257`	`+ const maxResults = typeof config.maxResults === 'number' ? config.maxResults : Number.MAX_VALUE;`
`258`	`258`	`return arrays.topAsync(results, compare, maxResults, 10000, token);`
`259`	`259`	`}`
`260`	`260`