Fix results lost from FileSearchProvider when maxResults is returned

roblourens · roblourens · commit 86571ec5a50b · 2018-12-06T21:44:50.000-08:00
diff --git a/src/vs/workbench/services/search/node/fileSearchManager.ts b/src/vs/workbench/services/search/node/fileSearchManager.ts
@@ -33,7 +33,6 @@ export interface IDirectoryTree {
 	pathToEntries: { [relativePath: string]: IDirectoryEntry[] };
 }
 
-
 class FileSearchEngine {
 	private filePattern?: string;
 	private includePattern?: glob.ParsedExpression;
@@ -132,7 +131,7 @@ class FileSearchEngine {
 					const providerTime = providerSW.elapsed();
 					const postProcessSW = StopWatch.create();
 
-					if (this.isCanceled) {
+					if (this.isCanceled && !this.isLimitHit) {
 						return null;
 					}
 
@@ -153,7 +152,7 @@ class FileSearchEngine {
 					}
 
 					this.activeCancellationTokens.delete(cancellation);
-					if (this.isCanceled) {
+					if (this.isCanceled && !this.isLimitHit) {
 						return null;
 					}
 

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ export interface IDirectoryTree {`
`33`	`33`	`pathToEntries: { [relativePath: string]: IDirectoryEntry[] };`
`34`	`34`	`}`
`35`	`35`
`36`		`-`
`37`	`36`	`class FileSearchEngine {`
`38`	`37`	`private filePattern?: string;`
`39`	`38`	`private includePattern?: glob.ParsedExpression;`
`@@ -132,7 +131,7 @@ class FileSearchEngine {`
`132`	`131`	`const providerTime = providerSW.elapsed();`
`133`	`132`	`const postProcessSW = StopWatch.create();`
`134`	`133`
`135`		`- if (this.isCanceled) {`
	`134`	`+ if (this.isCanceled && !this.isLimitHit) {`
`136`	`135`	`return null;`
`137`	`136`	`}`
`138`	`137`
`@@ -153,7 +152,7 @@ class FileSearchEngine {`
`153`	`152`	`}`
`154`	`153`
`155`	`154`	`this.activeCancellationTokens.delete(cancellation);`
`156`		`- if (this.isCanceled) {`
	`155`	`+ if (this.isCanceled && !this.isLimitHit) {`
`157`	`156`	`return null;`
`158`	`157`	`}`
`159`	`158`