Skip to content

Commit 7a52269

Browse files
authored
Merge pull request microsoft#250664 from microsoft/osortega/fix-pending-promise
Fix for pending promise of aisearch
2 parents 3c102f8 + ad3e494 commit 7a52269

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

src/vs/workbench/contrib/search/browser/searchTreeModel/searchModel.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ export class SearchModelImpl extends Disposable implements ISearchModel {
115115
return this._searchResult;
116116
}
117117

118-
aiSearch(onResult: (result: ISearchProgressItem) => void): Promise<ISearchComplete> {
118+
aiSearch(onResult: (result: ISearchProgressItem | undefined) => void): Promise<ISearchComplete> {
119119
if (this.hasAIResults) {
120120
// already has matches or pending matches
121121
throw Error('AI results already exist');
@@ -138,6 +138,10 @@ export class SearchModelImpl extends Disposable implements ISearchModel {
138138
tokenSource.dispose(true);
139139
}).then(
140140
value => {
141+
if (value.results.length === 0) {
142+
// alert of no results since onProgress won't be called
143+
onResult(undefined);
144+
}
141145
this.onSearchCompleted(value, Date.now() - start, searchInstanceID, true);
142146
return value;
143147
},

src/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ export interface ISearchModel {
9797
replaceString: string;
9898
preserveCase: boolean;
9999
searchResult: ISearchResult;
100-
aiSearch(onResultReported: (result: ISearchProgressItem) => void): Promise<ISearchComplete>;
100+
aiSearch(onResultReported: (result: ISearchProgressItem | undefined) => void): Promise<ISearchComplete>;
101101
hasAIResults: boolean;
102102
hasPlainResults: boolean;
103103
search(query: ITextQuery, onProgress?: (result: ISearchProgressItem) => void, callerToken?: CancellationToken): {

src/vs/workbench/contrib/search/browser/searchView.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2095,7 +2095,7 @@ export class SearchView extends ViewPane {
20952095
if (!aiSearchPromise) {
20962096
this.viewModel.searchResult.setAIQueryUsingTextQuery();
20972097
aiSearchPromise = this._pendingSemanticSearchPromise = this.viewModel.aiSearch(result => {
2098-
if (isAIKeyword(result)) {
2098+
if (result && isAIKeyword(result)) {
20992099
this.updateKeywordSuggestionUI(result);
21002100
return;
21012101
}

0 commit comments

Comments
 (0)