support for fastAndSlow picks #191002
support for fastAndSlow picks #191002
Conversation
src/vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess.ts
Outdated
Show resolved
Hide resolved
| return { | ||
| picks: [], | ||
| additionalPicks: Promise.resolve([]) | ||
| }; |
src/vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess.ts
Outdated
Show resolved
Hide resolved
src/vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess.ts
Outdated
Show resolved
Hide resolved
| return this.searchModel.searchResult.matches().filter(e => result.syncResults.indexOf(e) === -1); | ||
| }; | ||
| return { | ||
| syncResults: this.searchModel.searchResult.matches(), |
There was a problem hiding this comment.
Why not return result.syncResults here?
There was a problem hiding this comment.
matches() in the searchresult are the non-raw matches
| @@ -2046,11 +2075,21 @@ export class SearchModel extends Disposable { | |||
| // In search on type case, delay the streaming of results just a bit, so that we don't flash the only "local results" fast path | |||
| this._startStreamDelay = new Promise(resolve => setTimeout(resolve, this.searchConfig.searchOnType ? 150 : 0)); | |||
|
|
|||
| const currentRequest = this.doSearch(query, progressEmitter, this._searchQuery, searchInstanceID, onProgress); | |||
| const req = this.doSearch(query, progressEmitter, this._searchQuery, searchInstanceID, onProgress, callerTokenSource); | |||
There was a problem hiding this comment.
Webview results in notebooks needs an owner ID so that we can add and remove decorations properly
There was a problem hiding this comment.
I know it's not part of this PR but I'd think you could do that without exposing this webview thing all the way up at this layer
There was a problem hiding this comment.
The reason why it needs to be at the search model layer is because FileMatches that are part of the same search need to know the searchInstanceID to correctly remove webview decorations. Saying "I send a command from the search view to remove decorations from the webview" did not work, as there was a race condition with the new search starting to add its decorations before the old search instance began to dispose. I created #191106 to track the polish of this work, as I agree it's strange to have this so far away from the webview work.
Fixes #190767
Mostly refactors search to support sync results. This uses the
FastAndSlowPicksAPI in quick access to return synchronous results before async results. Thesearchfunction in theSearchModelshould now return a sync and async result (two results), where the async result should resolve at the same point that the original singlesearchreturn value resolved.Sync results -> open text editors
Async results -> closed text editors, notebook (open editors and closed)
Related polish items:
ISearchCompleteresult field #191023NotebookSearchServiceto be called withISearchServiceor related service #191024