development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-28 23:42:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #229765 from microsoft/dreadful-leopard

Browse source 
fix async references to global token
This commit is contained in:
Andrea Mah 2024-09-25 15:04:28 -07:00 committed by GitHub
parent cdf61bc5be b2a7b8ba52
commit b83e4d8842
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/vs/workbench/contrib/search/browser/searchModel.ts
View file

@ -2289,7 +2289,7 @@ export class SearchModel extends Disposable {
this.onSearchProgress(p, searchInstanceID, false, true);
onProgress?.(p);
}).finally(() => {
this.currentAICancelTokenSource?.dispose(true);
tokenSource.dispose(true);
}).then(
value => {
this.onSearchCompleted(value, Date.now() - start, searchInstanceID, true);
@ -2322,7 +2322,7 @@ export class SearchModel extends Disposable {
const notebookResult = this.notebookSearchService.notebookSearch(query, tokenSource.token, searchInstanceID, asyncGenerateOnProgress);
const textResult = this.searchService.textSearchSplitSyncAsync(
searchQuery,
this.currentCancelTokenSource.token, asyncGenerateOnProgress,
tokenSource.token, asyncGenerateOnProgress,
notebookResult.openFilesToScan,
notebookResult.allScannedFiles,
);
@ -2336,7 +2336,6 @@ export class SearchModel extends Disposable {
// resolve async parts of search
const allClosedEditorResults = await textResult.asyncResults;
const resolvedNotebookResults = await notebookResult.completeData;
tokenSource.dispose();
const searchLength = Date.now() - searchStart;
const resolvedResult: ISearchComplete = {
results: [...allClosedEditorResults.results, ...resolvedNotebookResults.results],
@ -2349,7 +2348,8 @@ export class SearchModel extends Disposable {
return resolvedResult;
};
return {
asyncResults: getAsyncResults(),
asyncResults: getAsyncResults()
.finally(() => tokenSource.dispose(true)),
syncResults
};
}
@ -2423,8 +2423,6 @@ export class SearchModel extends Disposable {
e => {
this.onSearchError(e, Date.now() - start, false);
throw e;
}).finally(() => {
this.currentCancelTokenSource?.dispose(true);
}),
syncResults
};