'async' breaks onCancel chain (fixes microsoft#44740)

chrmarti · chrmarti · commit 95d415b7ca1f · 2018-02-28T16:34:58.000+01:00
diff --git a/src/vs/base/node/pfs.ts b/src/vs/base/node/pfs.ts
@@ -19,7 +19,7 @@ export function readdir(path: string): TPromise<string[]> {
 }
 
 export function exists(path: string): TPromise<boolean> {
-	return new TPromise(c => fs.exists(path, c));
+	return new TPromise(c => fs.exists(path, c), () => { });
 }
 
 export function chmod(path: string, mode: number): TPromise<boolean> {
diff --git a/src/vs/workbench/services/search/node/searchService.ts b/src/vs/workbench/services/search/node/searchService.ts
@@ -10,7 +10,7 @@ import objects = require('vs/base/common/objects');
 import strings = require('vs/base/common/strings');
 import { getNextTickChannel } from 'vs/base/parts/ipc/common/ipc';
 import { Client, IIPCOptions } from 'vs/base/parts/ipc/node/ipc.cp';
-import { IProgress, LineMatch, FileMatch, ISearchComplete, ISearchProgressItem, QueryType, IFileMatch, ISearchQuery, ISearchConfiguration, ISearchService, pathIncludedInQuery, ISearchResultProvider } from 'vs/platform/search/common/search';
+import { IProgress, LineMatch, FileMatch, ISearchComplete, ISearchProgressItem, QueryType, IFileMatch, ISearchQuery, IFolderQuery, ISearchConfiguration, ISearchService, pathIncludedInQuery, ISearchResultProvider } from 'vs/platform/search/common/search';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -268,9 +268,25 @@ export class DiskSearch implements ISearchResultProvider {
 		this.raw = new SearchChannelClient(channel);
 	}
 
-	public async search(query: ISearchQuery): PPromise<ISearchComplete, ISearchProgressItem> {
-		let request: PPromise<ISerializedSearchComplete, ISerializedSearchProgressItem>;
+	public search(query: ISearchQuery): PPromise<ISearchComplete, ISearchProgressItem> {
+		const folderQueries = query.folderQueries || [];
+		return TPromise.join(folderQueries.map(q => q.folder.scheme === Schemas.file && pfs.exists(q.folder.fsPath)))
+			.then(exists => {
+				const existingFolders = folderQueries.filter((q, index) => exists[index]);
+				const rawSearch = this.rawSearchQuery(query, existingFolders);
+
+				let request: PPromise<ISerializedSearchComplete, ISerializedSearchProgressItem>;
+				if (query.type === QueryType.File) {
+					request = this.raw.fileSearch(rawSearch);
+				} else {
+					request = this.raw.textSearch(rawSearch);
+				}
+
+				return DiskSearch.collectResults(request);
+			});
+	}
 
+	private rawSearchQuery(query: ISearchQuery, existingFolders: IFolderQuery[]) {
 		let rawSearch: IRawSearch = {
 			folderQueries: [],
 			extraFiles: [],
@@ -286,18 +302,14 @@ export class DiskSearch implements ISearchResultProvider {
 			ignoreSymlinks: query.ignoreSymlinks
 		};
 
-		if (query.folderQueries) {
-			for (const q of query.folderQueries) {
-				if (q.folder.scheme === Schemas.file && await pfs.exists(q.folder.fsPath)) {
-					rawSearch.folderQueries.push({
-						excludePattern: q.excludePattern,
-						includePattern: q.includePattern,
-						fileEncoding: q.fileEncoding,
-						disregardIgnoreFiles: q.disregardIgnoreFiles,
-						folder: q.folder.fsPath
-					});
-				}
-			}
+		for (const q of existingFolders) {
+			rawSearch.folderQueries.push({
+				excludePattern: q.excludePattern,
+				includePattern: q.includePattern,
+				fileEncoding: q.fileEncoding,
+				disregardIgnoreFiles: q.disregardIgnoreFiles,
+				folder: q.folder.fsPath
+			});
 		}
 
 		if (query.extraFileResources) {
@@ -312,13 +324,7 @@ export class DiskSearch implements ISearchResultProvider {
 			rawSearch.contentPattern = query.contentPattern;
 		}
 
-		if (query.type === QueryType.File) {
-			request = this.raw.fileSearch(rawSearch);
-		} else {
-			request = this.raw.textSearch(rawSearch);
-		}
-
-		return DiskSearch.collectResults(request);
+		return rawSearch;
 	}
 
 	public static collectResults(request: PPromise<ISerializedSearchComplete, ISerializedSearchProgressItem>): PPromise<ISearchComplete, ISearchProgressItem> {

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ export function readdir(path: string): TPromise<string[]> {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`export function exists(path: string): TPromise<boolean> {`
`22`		`- return new TPromise(c => fs.exists(path, c));`
	`22`	`+ return new TPromise(c => fs.exists(path, c), () => { });`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`export function chmod(path: string, mode: number): TPromise<boolean> {`