maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix unhandled cancel warnings from text search

Browse source
This commit is contained in:
Rob Lourens 2018-08-21 11:31:41 -07:00
parent 670d8bb7c5
commit 57f13b7f26
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/vs/workbench/services/search/node/rawSearchService.ts
View file

@ -67,14 +67,21 @@ export class SearchService implements IRawSearchService {
}
public textSearch(config: IRawSearch): Event<ISerializedSearchProgressItem | ISerializedSearchComplete> {
let promise: CancelablePromise<void>;
let promise: CancelablePromise<ISerializedSearchComplete>;
const emitter = new Emitter<ISerializedSearchProgressItem | ISerializedSearchComplete>({
onFirstListenerDidAdd: () => {
promise = createCancelablePromise(token => {
return (config.useRipgrep ? this.ripgrepTextSearch(config, p => emitter.fire(p), token) : this.legacyTextSearch(config, p => emitter.fire(p), token))
.then(c => emitter.fire(c), err => emitter.fire({ type: 'error', error: { message: err.message, stack: err.stack } }));
return (config.useRipgrep ? this.ripgrepTextSearch(config, p => emitter.fire(p), token) : this.legacyTextSearch(config, p => emitter.fire(p), token));
});
promise.then(
c => emitter.fire(c),
err => {
if (!isPromiseCanceledError(err)) {
emitter.fire({ type: 'error', error: { message: err.message, stack: err.stack } });
}
});
},
onLastListenerRemove: () => {
promise.cancel();