@codingame/monaco-vscode-api 3.2.3 → 4.0.0

package/vscode/src/vs/workbench/contrib/search/browser/searchModel.js

@@ -13,15 +13,26 @@ import { lcut } from '../../../../base/common/strings.js';
 import { TernarySearchTree } from '../../../../base/common/ternarySearchTree.js';
 import { URI } from '../../../../base/common/uri.js';
 import { Range } from '../../../../editor/common/core/range.js';
-import { OverviewRulerLane, MinimapPosition, FindMatch } from '../../../../editor/common/model.js';
+import { OverviewRulerLane, FindMatch } from '../../../../editor/common/model.js';
 import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IInstantiationService, createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { ILabelService } from '../../../../platform/label/common/label.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
+import { IProgressService } from '../../../../platform/progress/common/progress.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
-import { overviewRulerFindMatchForeground, minimapFindMatch } from '../../../../platform/theme/common/colorRegistry.js';
+import '../../../../platform/theme/common/colorUtils.js';
+import '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { overviewRulerFindMatchForeground } from '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import { minimapFindMatch } from '../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 import { FindMatchDecorationModel } from '../../notebook/browser/contrib/find/findMatchDecorationModel.js';
@@ -33,15 +44,16 @@ import { isINotebookFileMatchWithModel, contentMatchesToTextSearchMatches, webvi
 import { INotebookSearchService } from '../common/notebookSearch.js';
 import { isINotebookFileMatchNoModel, rawCellPrefix } from '../common/searchNotebookHelpers.js';
 import { ReplacePattern } from '../../../services/search/common/replace.js';
-import { resultIsMatch, OneLineRange, ISearchService } from '../../../services/search/common/search.js';
+import { OneLineRange, resultIsMatch, ISearchService } from '../../../services/search/common/search.js';
 import { editorMatchesToTextSearchResults, getTextSearchMatchWithModelContext } from '../../../services/search/common/searchHelpers.js';
 import { CellSearchModel } from '../common/cellSearchModel.js';
 var FileMatch_1, FolderMatch_1, RangeHighlightDecorations_1;
 class Match {
     static { this.MAX_PREVIEW_CHARS = 250; }
-    constructor(_parent, _fullPreviewLines, _fullPreviewRange, _documentRange) {
+    constructor(_parent, _fullPreviewLines, _fullPreviewRange, _documentRange, aiContributed) {
         this._parent = _parent;
         this._fullPreviewLines = _fullPreviewLines;
+        this.aiContributed = aiContributed;
         this._oneLinePreviewText = _fullPreviewLines[_fullPreviewRange.startLineNumber];
         const adjustedEndCol = _fullPreviewRange.startLineNumber === _fullPreviewRange.endLineNumber ?
             _fullPreviewRange.endColumn :
@@ -221,7 +233,7 @@ class CellMatch {
 }
 class MatchInNotebook extends Match {
     constructor(_cellParent, _fullPreviewLines, _fullPreviewRange, _documentRange, webviewIndex) {
-        super(_cellParent.parent, _fullPreviewLines, _fullPreviewRange, _documentRange);
+        super(_cellParent.parent, _fullPreviewLines, _fullPreviewRange, _documentRange, false);
         this._cellParent = _cellParent;
         this._id = this._parent.id() + '>' + this._cellParent.cellIndex + (webviewIndex ? '_' + webviewIndex : '') + '_' + this.notebookMatchTypeString() + this._range + this.getMatchString();
         this._webviewIndex = webviewIndex;
@@ -264,7 +276,7 @@ let FileMatch = class FileMatch extends Disposable {
         },
         minimap: {
             color: themeColorFromId(minimapFindMatch),
-            position: MinimapPosition.Inline
+            position: 1
         }
     }); }
     static { this._FIND_MATCH = ModelDecorationOptions.register({
@@ -277,7 +289,7 @@ let FileMatch = class FileMatch extends Disposable {
         },
         minimap: {
             color: themeColorFromId(minimapFindMatch),
-            position: MinimapPosition.Inline
+            position: 1
         }
     }); }
     static getDecorationOption(selected) {
@@ -325,7 +337,6 @@ let FileMatch = class FileMatch extends Disposable {
         this._name = ( new Lazy(() => labelService.getUriBasenameLabel(this.resource)));
         this._cellMatches = ( new Map());
         this._notebookUpdateScheduler = ( new RunOnceScheduler(this.updateMatchesForEditorWidget.bind(this), 250));
-        this.createMatches();
     }
     addWebviewMatchesToCell(cellID, webviewMatches) {
         const cellMatch = this.getCellMatch(cellID);
@@ -358,9 +369,9 @@ let FileMatch = class FileMatch extends Disposable {
     hasReadonlyMatches() {
         return ( this.matches().some(m => m instanceof MatchInNotebook && m.isReadonly()));
     }
-    createMatches() {
+    createMatches(isAiContributed) {
         const model = this.modelService.getModel(this._resource);
-        if (model) {
+        if (model && !isAiContributed) {
             this.bindModel(model);
             this.updateMatchesForModel();
         }
@@ -373,7 +384,7 @@ let FileMatch = class FileMatch extends Disposable {
                 this.rawMatch.results
                     .filter(resultIsMatch)
                     .forEach(rawMatch => {
-                    textSearchResultToMatches(rawMatch, this)
+                    textSearchResultToMatches(rawMatch, this, isAiContributed)
                         .forEach(m => this.add(m));
                 });
             }
@@ -415,7 +426,7 @@ let FileMatch = class FileMatch extends Disposable {
         const wordSeparators = this._query.isWordMatch && this._query.wordSeparators ? this._query.wordSeparators : null;
         const matches = this._model
             .findMatches(this._query.pattern, this._model.getFullModelRange(), !!this._query.isRegExp, !!this._query.isCaseSensitive, wordSeparators, false, this._maxResults ?? Number.MAX_SAFE_INTEGER);
-        this.updateMatches(matches, true, this._model);
+        this.updateMatches(matches, true, this._model, false);
     }
     async updatesMatchesForLineAfterReplace(lineNumber, modelChange) {
         if (!this._model) {
@@ -431,12 +442,12 @@ let FileMatch = class FileMatch extends Disposable {
         oldMatches.forEach(match => this._textMatches.delete(match.id()));
         const wordSeparators = this._query.isWordMatch && this._query.wordSeparators ? this._query.wordSeparators : null;
         const matches = this._model.findMatches(this._query.pattern, range, !!this._query.isRegExp, !!this._query.isCaseSensitive, wordSeparators, false, this._maxResults ?? Number.MAX_SAFE_INTEGER);
-        this.updateMatches(matches, modelChange, this._model);
+        this.updateMatches(matches, modelChange, this._model, false);
     }
-    updateMatches(matches, modelChange, model) {
+    updateMatches(matches, modelChange, model, isAiContributed) {
         const textSearchResults = editorMatchesToTextSearchResults(matches, model, this._previewOptions);
         textSearchResults.forEach(textSearchResult => {
-            textSearchResultToMatches(textSearchResult, this).forEach(match => {
+            textSearchResultToMatches(textSearchResult, this, isAiContributed).forEach(match => {
                 if (!( this._removedTextMatches.has(match.id()))) {
                     this.add(match);
                     if (this.isMatchSelected(match)) {
@@ -918,7 +929,7 @@ let FolderMatch = FolderMatch_1 = class FolderMatch extends Disposable {
     get query() {
         return this._query;
     }
-    addFileMatch(raw, silent, searchInstanceID) {
+    addFileMatch(raw, silent, searchInstanceID, isAiContributed) {
         const added = [];
         const updated = [];
         raw.forEach(rawFileMatch => {
@@ -929,7 +940,7 @@ let FolderMatch = FolderMatch_1 = class FolderMatch extends Disposable {
                         .results
                         .filter(resultIsMatch)
                         .forEach(m => {
-                        textSearchResultToMatches(m, existingFileMatch)
+                        textSearchResultToMatches(m, existingFileMatch, isAiContributed)
                             .forEach(m => existingFileMatch.add(m));
                     });
                 }
@@ -1104,8 +1115,9 @@ FolderMatchWithResource = ( __decorate([
     ( __param(10, IUriIdentityService))
 ], FolderMatchWithResource));
 let FolderMatchWorkspaceRoot = class FolderMatchWorkspaceRoot extends FolderMatchWithResource {
-    constructor(_resource, _id, _index, _query, _parent, replaceService, instantiationService, labelService, uriIdentityService) {
+    constructor(_resource, _id, _index, _query, _parent, _ai, replaceService, instantiationService, labelService, uriIdentityService) {
         super(_resource, _id, _index, _query, _parent, _parent, null, replaceService, instantiationService, labelService, uriIdentityService);
+        this._ai = _ai;
     }
     normalizedUriParent(uri) {
         return this.uriIdentityService.extUri.normalizePath(this.uriIdentityService.extUri.dirname(uri));
@@ -1115,6 +1127,7 @@ let FolderMatchWorkspaceRoot = class FolderMatchWorkspaceRoot extends FolderMatc
     }
     createFileMatch(query, previewOptions, maxResults, parent, rawFileMatch, closestRoot, searchInstanceID) {
         const fileMatch = this.instantiationService.createInstance(FileMatch, query, previewOptions, maxResults, parent, rawFileMatch, closestRoot, searchInstanceID);
+        fileMatch.createMatches(this._ai);
         parent.doAddFile(fileMatch);
         const disposable = fileMatch.onChange(({ didRemove }) => parent.onFileChange(fileMatch, didRemove));
         this._register(fileMatch.onDispose(() => disposable.dispose()));
@@ -1147,10 +1160,10 @@ let FolderMatchWorkspaceRoot = class FolderMatchWorkspaceRoot extends FolderMatc
     }
 };
 FolderMatchWorkspaceRoot = ( __decorate([
-    ( __param(5, IReplaceService)),
-    ( __param(6, IInstantiationService)),
-    ( __param(7, ILabelService)),
-    ( __param(8, IUriIdentityService))
+    ( __param(6, IReplaceService)),
+    ( __param(7, IInstantiationService)),
+    ( __param(8, ILabelService)),
+    ( __param(9, IUriIdentityService))
 ], FolderMatchWorkspaceRoot));
 let FolderMatchNoRoot = class FolderMatchNoRoot extends FolderMatch {
     constructor(_id, _index, _query, _parent, replaceService, instantiationService, labelService, uriIdentityService) {
@@ -1158,6 +1171,7 @@ let FolderMatchNoRoot = class FolderMatchNoRoot extends FolderMatch {
     }
     createAndConfigureFileMatch(rawFileMatch, searchInstanceID) {
         const fileMatch = this._register(this.instantiationService.createInstance(FileMatch, this._query.contentPattern, this._query.previewOptions, this._query.maxResults, this, rawFileMatch, null, searchInstanceID));
+        fileMatch.createMatches(false);
         this.doAddFile(fileMatch);
         const disposable = fileMatch.onChange(({ didRemove }) => this.onFileChange(fileMatch, didRemove));
         this._register(fileMatch.onDispose(() => disposable.dispose()));
@@ -1299,8 +1313,10 @@ let SearchResult = class SearchResult extends Disposable {
         })));
         this.onChange = this._onChange.event;
         this._folderMatches = [];
+        this._aiFolderMatches = [];
         this._otherFilesMatch = null;
         this._folderMatchesMap = TernarySearchTree.forUris(key => this.uriIdentityService.extUri.ignorePathCasing(key));
+        this._aiFolderMatchesMap = TernarySearchTree.forUris(key => this.uriIdentityService.extUri.ignorePathCasing(key));
         this._showHighlights = false;
         this._query = null;
         this.disposePastResults = () => Promise.resolve();
@@ -1315,7 +1331,7 @@ let SearchResult = class SearchResult extends Disposable {
         }));
         this._register(this.onChange(e => {
             if (e.removed) {
-                this._isDirty = !this.isEmpty();
+                this._isDirty = !this.isEmpty() || !this.isEmpty(true);
             }
         }));
     }
@@ -1370,18 +1386,36 @@ let SearchResult = class SearchResult extends Disposable {
             oldFolderMatches.forEach(match => match.dispose());
             this._isDirty = false;
         };
+        this._cachedSearchComplete = undefined;
+        this._aiCachedSearchComplete = undefined;
         this._rangeHighlightDecorations.removeHighlightRange();
         this._folderMatchesMap = TernarySearchTree.forUris(key => this.uriIdentityService.extUri.ignorePathCasing(key));
+        this._aiFolderMatchesMap = TernarySearchTree.forUris(key => this.uriIdentityService.extUri.ignorePathCasing(key));
         if (!query) {
             return;
         }
         this._folderMatches = ( ( (query && query.folderQueries || [])
             .map(fq => fq.folder))
-            .map((resource, index) => this._createBaseFolderMatch(resource, ( resource.toString()), index, query)));
+            .map((resource, index) => this._createBaseFolderMatch(resource, ( resource.toString()), index, query, false)));
         this._folderMatches.forEach(fm => this._folderMatchesMap.set(fm.resource, fm));
-        this._otherFilesMatch = this._createBaseFolderMatch(null, 'otherFiles', this._folderMatches.length + 1, query);
+        this._aiFolderMatches = ( ( (query && query.folderQueries || [])
+            .map(fq => fq.folder))
+            .map((resource, index) => this._createBaseFolderMatch(resource, ( resource.toString()), index, query, true)));
+        this._aiFolderMatches.forEach(fm => this._aiFolderMatchesMap.set(fm.resource, fm));
+        this._otherFilesMatch = this._createBaseFolderMatch(null, 'otherFiles', this._folderMatches.length + this._aiFolderMatches.length + 1, query, false);
         this._query = query;
     }
+    setCachedSearchComplete(cachedSearchComplete, ai) {
+        if (ai) {
+            this._aiCachedSearchComplete = cachedSearchComplete;
+        }
+        else {
+            this._cachedSearchComplete = cachedSearchComplete;
+        }
+    }
+    getCachedSearchComplete(ai) {
+        return ai ? this._aiCachedSearchComplete : this._cachedSearchComplete;
+    }
     onDidAddNotebookEditorWidget(widget) {
         this._onWillChangeModelListener?.dispose();
         this._onWillChangeModelListener = widget.onWillChangeModel((model) => {
@@ -1408,10 +1442,10 @@ let SearchResult = class SearchResult extends Disposable {
         const folderMatch = this._folderMatchesMap.findSubstr(resource);
         folderMatch?.unbindNotebookEditorWidget(editor, resource);
     }
-    _createBaseFolderMatch(resource, id, index, query) {
+    _createBaseFolderMatch(resource, id, index, query, ai) {
         let folderMatch;
         if (resource) {
-            folderMatch = this._register(this.instantiationService.createInstance(FolderMatchWorkspaceRoot, resource, id, index, query, this));
+            folderMatch = this._register(this.instantiationService.createInstance(FolderMatchWorkspaceRoot, resource, id, index, query, this, ai));
         }
         else {
             folderMatch = this._register(this.instantiationService.createInstance(FolderMatchNoRoot, id, index, query, this));
@@ -1420,25 +1454,29 @@ let SearchResult = class SearchResult extends Disposable {
         this._register(folderMatch.onDispose(() => disposable.dispose()));
         return folderMatch;
     }
-    add(allRaw, searchInstanceID, silent = false) {
-        const { byFolder, other } = this.groupFilesByFolder(allRaw);
+    add(allRaw, searchInstanceID, ai, silent = false) {
+        const { byFolder, other } = this.groupFilesByFolder(allRaw, ai);
         byFolder.forEach(raw => {
             if (!raw.length) {
                 return;
             }
-            const folderMatch = this.getFolderMatch(raw[0].resource);
-            folderMatch?.addFileMatch(raw, silent, searchInstanceID);
+            const folderMatch = ai ? this.getAIFolderMatch(raw[0].resource) : this.getFolderMatch(raw[0].resource);
+            folderMatch?.addFileMatch(raw, silent, searchInstanceID, ai);
         });
-        this._otherFilesMatch?.addFileMatch(other, silent, searchInstanceID);
+        if (!ai) {
+            this._otherFilesMatch?.addFileMatch(other, silent, searchInstanceID, false);
+        }
         this.disposePastResults();
     }
     clear() {
         this.folderMatches().forEach((folderMatch) => folderMatch.clear(true));
+        this.folderMatches(true);
         this.disposeMatches();
         this._folderMatches = [];
+        this._aiFolderMatches = [];
         this._otherFilesMatch = null;
     }
-    remove(matches) {
+    remove(matches, ai = false) {
         if (!Array.isArray(matches)) {
             matches = [matches];
         }
@@ -1448,7 +1486,7 @@ let SearchResult = class SearchResult extends Disposable {
             }
         });
         const fileMatches = matches.filter(m => m instanceof FileMatch);
-        const { byFolder, other } = this.groupFilesByFolder(fileMatches);
+        const { byFolder, other } = this.groupFilesByFolder(fileMatches, ai);
         byFolder.forEach(matches => {
             if (!matches.length) {
                 return;
@@ -1472,7 +1510,10 @@ let SearchResult = class SearchResult extends Disposable {
             this.replacingAll = false;
         });
     }
-    folderMatches() {
+    folderMatches(ai = false) {
+        if (ai) {
+            return this._aiFolderMatches;
+        }
         return this._otherFilesMatch ?
             [
                 ...this._folderMatches,
@@ -1482,21 +1523,21 @@ let SearchResult = class SearchResult extends Disposable {
                 ...this._folderMatches
             ];
     }
-    matches() {
+    matches(ai = false) {
         const matches = [];
-        this.folderMatches().forEach(folderMatch => {
+        this.folderMatches(ai).forEach(folderMatch => {
             matches.push(folderMatch.allDownstreamFileMatches());
         });
         return [].concat(...matches);
     }
-    isEmpty() {
-        return this.folderMatches().every((folderMatch) => folderMatch.isEmpty());
+    isEmpty(ai = false) {
+        return this.folderMatches(ai).every((folderMatch) => folderMatch.isEmpty());
     }
-    fileCount() {
-        return this.folderMatches().reduce((prev, match) => prev + match.recursiveFileCount(), 0);
+    fileCount(ai = false) {
+        return this.folderMatches(ai).reduce((prev, match) => prev + match.recursiveFileCount(), 0);
     }
-    count() {
-        return this.matches().reduce((prev, match) => prev + match.count(), 0);
+    count(ai = false) {
+        return this.matches(ai).reduce((prev, match) => prev + match.count(), 0);
     }
     get showHighlights() {
         return this._showHighlights;
@@ -1528,17 +1569,21 @@ let SearchResult = class SearchResult extends Disposable {
         const folderMatch = this._folderMatchesMap.findSubstr(resource);
         return folderMatch ? folderMatch : this._otherFilesMatch;
     }
+    getAIFolderMatch(resource) {
+        const folderMatch = this._aiFolderMatchesMap.findSubstr(resource);
+        return folderMatch;
+    }
     set replacingAll(running) {
         this.folderMatches().forEach((folderMatch) => {
             folderMatch.replacingAll = running;
         });
     }
-    groupFilesByFolder(fileMatches) {
+    groupFilesByFolder(fileMatches, ai) {
         const rawPerFolder = ( new ResourceMap());
         const otherFileMatches = [];
-        this._folderMatches.forEach(fm => rawPerFolder.set(fm.resource, []));
+        (ai ? this._aiFolderMatches : this._folderMatches).forEach(fm => rawPerFolder.set(fm.resource, []));
         fileMatches.forEach(rawFileMatch => {
-            const folderMatch = this.getFolderMatch(rawFileMatch.resource);
+            const folderMatch = ai ? this.getAIFolderMatch(rawFileMatch.resource) : this.getFolderMatch(rawFileMatch.resource);
             if (!folderMatch) {
                 return;
             }
@@ -1557,8 +1602,11 @@ let SearchResult = class SearchResult extends Disposable {
     }
     disposeMatches() {
         this.folderMatches().forEach(folderMatch => folderMatch.dispose());
+        this.folderMatches(true).forEach(folderMatch => folderMatch.dispose());
         this._folderMatches = [];
+        this._aiFolderMatches = [];
         this._folderMatchesMap = TernarySearchTree.forUris(key => this.uriIdentityService.extUri.ignorePathCasing(key));
+        this._aiFolderMatchesMap = TernarySearchTree.forUris(key => this.uriIdentityService.extUri.ignorePathCasing(key));
         this._rangeHighlightDecorations.removeHighlightRange();
     }
     async dispose() {
@@ -1583,7 +1631,7 @@ var SearchModelLocation;
     SearchModelLocation[SearchModelLocation["QUICK_ACCESS"] = 1] = "QUICK_ACCESS";
 })(SearchModelLocation || (SearchModelLocation = {})));
 let SearchModel = class SearchModel extends Disposable {
-    constructor(searchService, telemetryService, configurationService, instantiationService, logService, notebookSearchService) {
+    constructor(searchService, telemetryService, configurationService, instantiationService, logService, notebookSearchService, progressService) {
         super();
         this.searchService = searchService;
         this.telemetryService = telemetryService;
@@ -1591,6 +1639,7 @@ let SearchModel = class SearchModel extends Disposable {
         this.instantiationService = instantiationService;
         this.logService = logService;
         this.notebookSearchService = notebookSearchService;
+        this.progressService = progressService;
         this._searchQuery = null;
         this._replaceActive = false;
         this._replaceString = null;
@@ -1598,6 +1647,7 @@ let SearchModel = class SearchModel extends Disposable {
         this._preserveCase = false;
         this._startStreamDelay = Promise.resolve();
         this._resultQueue = [];
+        this._aiResultQueue = [];
         this._onReplaceTermChanged = this._register(( new Emitter()));
         this.onReplaceTermChanged = this._onReplaceTermChanged.event;
         this._onSearchResultChanged = this._register(( new PauseableEmitter({
@@ -1605,7 +1655,9 @@ let SearchModel = class SearchModel extends Disposable {
         })));
         this.onSearchResultChanged = this._onSearchResultChanged.event;
         this.currentCancelTokenSource = null;
+        this.currentAICancelTokenSource = null;
         this.searchCancelledForNewSearch = false;
+        this.aiSearchCancelledForNewSearch = false;
         this.location = SearchModelLocation.PANEL;
         this._searchResult = this.instantiationService.createInstance(SearchResult, this);
         this._register(this._searchResult.onChange((e) => this._onSearchResultChanged.fire(e)));
@@ -1638,10 +1690,48 @@ let SearchModel = class SearchModel extends Disposable {
     get searchResult() {
         return this._searchResult;
     }
+    async addAIResults(onProgress) {
+        if (this.searchResult.count(true)) {
+            return;
+        }
+        else {
+            if (this._searchQuery) {
+                await this.aiSearch({ ...this._searchQuery, contentPattern: this._searchQuery.contentPattern.pattern, type: 3  }, onProgress, this.currentCancelTokenSource?.token);
+            }
+        }
+    }
+    async doAISearchWithModal(searchQuery, searchInstanceID, token, onProgress) {
+        const promise = this.searchService.aiTextSearch(searchQuery, token, async (p) => {
+            this.onSearchProgress(p, searchInstanceID, false, true);
+            onProgress?.(p);
+        });
+        return this.progressService.withProgress({
+            location: 15 ,
+            type: 'syncing',
+            title: 'Searching for AI results...',
+        }, async (_) => promise);
+    }
+    aiSearch(query, onProgress, callerToken) {
+        const searchInstanceID = ( Date.now().toString());
+        const tokenSource = this.currentAICancelTokenSource = ( new CancellationTokenSource(callerToken));
+        const start = Date.now();
+        const asyncAIResults = this.doAISearchWithModal(query, searchInstanceID, this.currentAICancelTokenSource.token, async (p) => {
+            this.onSearchProgress(p, searchInstanceID, false, true);
+            onProgress?.(p);
+        })
+            .then(value => {
+            this.onSearchCompleted(value, Date.now() - start, searchInstanceID, true);
+            return value;
+        }, e => {
+            this.onSearchError(e, Date.now() - start, true);
+            throw e;
+        }).finally(() => tokenSource.dispose());
+        return asyncAIResults;
+    }
     doSearch(query, progressEmitter, searchQuery, searchInstanceID, onProgress, callerToken) {
         const asyncGenerateOnProgress = async (p) => {
             progressEmitter.fire();
-            this.onSearchProgress(p, searchInstanceID, false);
+            this.onSearchProgress(p, searchInstanceID, false, false);
             onProgress?.(p);
         };
         const syncGenerateOnProgress = (p) => {
@@ -1711,10 +1801,10 @@ let SearchModel = class SearchModel extends Disposable {
         try {
             return {
                 asyncResults: asyncResults.then(value => {
-                    this.onSearchCompleted(value, Date.now() - start, searchInstanceID);
+                    this.onSearchCompleted(value, Date.now() - start, searchInstanceID, false);
                     return value;
                 }, e => {
-                    this.onSearchError(e, Date.now() - start);
+                    this.onSearchError(e, Date.now() - start, false);
                     throw e;
                 }),
                 syncResults
@@ -1724,12 +1814,19 @@ let SearchModel = class SearchModel extends Disposable {
             this.telemetryService.publicLog('searchResultsFinished', { duration: Date.now() - start });
         }
     }
-    onSearchCompleted(completed, duration, searchInstanceID) {
+    onSearchCompleted(completed, duration, searchInstanceID, ai) {
         if (!this._searchQuery) {
             throw new Error('onSearchCompleted must be called after a search is started');
         }
-        this._searchResult.add(this._resultQueue, searchInstanceID);
-        this._resultQueue.length = 0;
+        if (ai) {
+            this._searchResult.add(this._aiResultQueue, searchInstanceID, true);
+            this._aiResultQueue.length = 0;
+        }
+        else {
+            this._searchResult.add(this._resultQueue, searchInstanceID, false);
+            this._resultQueue.length = 0;
+        }
+        this.searchResult.setCachedSearchComplete(completed, ai);
         const options = Object.assign({}, this._searchQuery.contentPattern);
         delete options.pattern;
         const stats = completed && completed.stats;
@@ -1749,28 +1846,34 @@ let SearchModel = class SearchModel extends Disposable {
         });
         return completed;
     }
-    onSearchError(e, duration) {
+    onSearchError(e, duration, ai) {
         if (isCancellationError(e)) {
-            this.onSearchCompleted(this.searchCancelledForNewSearch
+            this.onSearchCompleted((ai ? this.aiSearchCancelledForNewSearch : this.searchCancelledForNewSearch)
                 ? { exit: 1 , results: [], messages: [] }
-                : undefined, duration, '');
-            this.searchCancelledForNewSearch = false;
+                : undefined, duration, '', ai);
+            if (ai) {
+                this.aiSearchCancelledForNewSearch = false;
+            }
+            else {
+                this.searchCancelledForNewSearch = false;
+            }
         }
     }
-    onSearchProgress(p, searchInstanceID, sync = true) {
+    onSearchProgress(p, searchInstanceID, sync = true, ai = false) {
+        const targetQueue = ai ? this._aiResultQueue : this._resultQueue;
         if (p.resource) {
-            this._resultQueue.push(p);
+            targetQueue.push(p);
             if (sync) {
-                if (this._resultQueue.length) {
-                    this._searchResult.add(this._resultQueue, searchInstanceID, true);
-                    this._resultQueue.length = 0;
+                if (targetQueue.length) {
+                    this._searchResult.add(targetQueue, searchInstanceID, false, true);
+                    targetQueue.length = 0;
                 }
             }
             else {
                 this._startStreamDelay.then(() => {
-                    if (this._resultQueue.length) {
-                        this._searchResult.add(this._resultQueue, searchInstanceID, true);
-                        this._resultQueue.length = 0;
+                    if (targetQueue.length) {
+                        this._searchResult.add(targetQueue, searchInstanceID, ai, true);
+                        targetQueue.length = 0;
                     }
                 });
             }
@@ -1787,8 +1890,17 @@ let SearchModel = class SearchModel extends Disposable {
         }
         return false;
     }
+    cancelAISearch(cancelledForNewSearch = false) {
+        if (this.currentAICancelTokenSource) {
+            this.aiSearchCancelledForNewSearch = cancelledForNewSearch;
+            this.currentAICancelTokenSource.cancel();
+            return true;
+        }
+        return false;
+    }
     dispose() {
         this.cancelSearch();
+        this.cancelAISearch();
         this.searchResult.dispose();
         super.dispose();
     }
@@ -1799,7 +1911,8 @@ SearchModel = ( __decorate([
     ( __param(2, IConfigurationService)),
     ( __param(3, IInstantiationService)),
     ( __param(4, ILogService)),
-    ( __param(5, INotebookSearchService))
+    ( __param(5, INotebookSearchService)),
+    ( __param(6, IProgressService))
 ], SearchModel));
 let SearchViewModelWorkbenchService = class SearchViewModelWorkbenchService {
     constructor(instantiationService) {
@@ -1893,17 +2006,17 @@ let RangeHighlightDecorations = class RangeHighlightDecorations {
 RangeHighlightDecorations = RangeHighlightDecorations_1 = ( __decorate([
     ( __param(0, IModelService))
 ], RangeHighlightDecorations));
-function textSearchResultToMatches(rawMatch, fileMatch) {
+function textSearchResultToMatches(rawMatch, fileMatch, isAiContributed) {
     const previewLines = rawMatch.preview.text.split('\n');
     if (Array.isArray(rawMatch.ranges)) {
         return ( rawMatch.ranges.map((r, i) => {
             const previewRange = rawMatch.preview.matches[i];
-            return ( new Match(fileMatch, previewLines, previewRange, r));
+            return ( new Match(fileMatch, previewLines, previewRange, r, isAiContributed));
         }));
     }
     else {
         const previewRange = rawMatch.preview.matches;
-        const match = ( new Match(fileMatch, previewLines, previewRange, rawMatch.ranges));
+        const match = ( new Match(fileMatch, previewLines, previewRange, rawMatch.ranges, isAiContributed));
         return [match];
     }
 }

package/vscode/src/vs/workbench/contrib/search/common/constants.js

@@ -23,5 +23,7 @@ const SearchContext = {
     ViewHasFilePatternKey: ( new RawContextKey('viewHasFilePattern', false)),
     ViewHasSomeCollapsibleKey: ( new RawContextKey('viewHasSomeCollapsibleResult', false)),
     InTreeViewKey: ( new RawContextKey('inTreeView', false)),
+    AIResultsVisibleKey: ( new RawContextKey('AIResultsVisibleKey', false)),
+    hasAIResultProvider: ( new RawContextKey('hasAIResultProviderKey', false)),
 };
 export { SearchContext };