npm - @codingame/monaco-vscode-search-service-override - Versions diffs - 3.2.2 → 4.0.0 - Mend

@codingame/monaco-vscode-search-service-override 3.2.2 → 4.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

package/override/vs/platform/dialogs/common/dialogs.js CHANGED Viewed

@@ -1,3 +1,5 @@
+export { AbstractDialogHandler, IDialogService, IFileDialogService, getFileNamesMessage } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 var ConfirmResult;
 ( (function(ConfirmResult) {
     ConfirmResult[ConfirmResult["SAVE"] = 0] = "SAVE";

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-search-service-override",
-  "version": "3.2.2",
+  "version": "4.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,6 +18,6 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@3.2.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@4.0.0"
   }
 }

package/vscode/src/vs/workbench/contrib/search/browser/anythingQuickAccess.js CHANGED Viewed

@@ -14,7 +14,7 @@ import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { toLocalResource, basenameOrAuthority, dirname } from 'vscode/vscode/vs/base/common/resources';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
-import { DisposableStore, MutableDisposable, Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableStore, MutableDisposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
 import { getIconClasses } from 'vscode/vscode/vs/editor/common/services/getIconClasses';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
@@ -34,7 +34,7 @@ import { IFilesConfigurationService } from 'vscode/vscode/vs/workbench/services/
 import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
 import { SymbolsQuickAccessProvider } from './symbolsQuickAccess.js';
 import { DefaultQuickAccessFilterValue, Extensions } from 'vscode/vscode/vs/platform/quickinput/common/quickAccess';
-import { EditorViewState } from 'vscode/vscode/vs/workbench/browser/quickaccess';
+import { PickerEditorState } from 'vscode/vscode/vs/workbench/browser/quickaccess';
 import { GotoSymbolQuickAccessProvider } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
 import { Event } from 'vscode/vscode/vs/base/common/event';
@@ -47,6 +47,7 @@ import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { ASK_QUICK_QUESTION_ACTION_ID } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions';
 import { IQuickChatService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 var AnythingQuickAccessProvider_1;
 function isEditorSymbolQuickPickItem(pick) {
@@ -72,7 +73,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
         }
         return undefined;
     }
-    constructor(instantiationService, searchService, contextService, pathService, environmentService, fileService, labelService, modelService, languageService, workingCopyService, configurationService, editorService, historyService, filesConfigurationService, textModelService, uriIdentityService, quickInputService, keybindingService, quickChatService) {
+    constructor(instantiationService, searchService, contextService, pathService, environmentService, fileService, labelService, modelService, languageService, workingCopyService, configurationService, editorService, historyService, filesConfigurationService, textModelService, uriIdentityService, quickInputService, keybindingService, quickChatService, logService) {
         super(AnythingQuickAccessProvider_1.PREFIX, {
             canAcceptInBackground: true,
             noResultsPick: AnythingQuickAccessProvider_1.NO_RESULTS_PICK
@@ -96,10 +97,14 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
         this.quickInputService = quickInputService;
         this.keybindingService = keybindingService;
         this.quickChatService = quickChatService;
-        this.pickState = new (class {
-            constructor(provider, editorService) {
+        this.logService = logService;
+        this.pickState = this._register(new (class extends Disposable {
+            constructor(provider, instantiationService) {
+                super();
                 this.provider = provider;
+                this.instantiationService = instantiationService;
                 this.picker = undefined;
+                this.editorViewState = this._register(this.instantiationService.createInstance(PickerEditorState));
                 this.scorerCache = Object.create(null);
                 this.fileQueryCache = undefined;
                 this.lastOriginalFilter = undefined;
@@ -107,7 +112,6 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
                 this.lastRange = undefined;
                 this.lastGlobalPicks = undefined;
                 this.isQuickNavigating = undefined;
-                this.editorViewState = ( new EditorViewState(editorService));
             }
             set(picker) {
                 this.picker = picker;
@@ -128,7 +132,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
                 this.lastGlobalPicks = undefined;
                 this.editorViewState.reset();
             }
-        })(this, this.editorService);
+        })(this, this.instantiationService));
         this.labelOnlyEditorHistoryPickAccessor = ( new QuickPickItemScorerAccessor({ skipDescription: true }));
         this.fileQueryDelayer = this._register(( new ThrottledDelayer(AnythingQuickAccessProvider_1.TYPING_SEARCH_DELAY)));
         this.fileQueryBuilder = this.instantiationService.createInstance(QueryBuilder);
@@ -210,7 +214,10 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
                 };
             }
         }
-        return this.doGetPicks(filter, { enableEditorSymbolSearch: lastWasFiltering, includeHelp: runOptions?.includeHelp, from: runOptions?.from }, disposables, token);
+        return this.doGetPicks(filter, {
+            ...runOptions,
+            enableEditorSymbolSearch: lastWasFiltering
+        }, disposables, token);
     }
     doGetPicks(filter, options, disposables, token) {
         const query = prepareQuery(filter);
@@ -225,12 +232,21 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
             return this.pickState.lastGlobalPicks;
         }
         const historyEditorPicks = this.getEditorHistoryPicks(query);
-        let picks;
+        let picks = ( new Array());
+        if (options.additionPicks) {
+            picks.push(...options.additionPicks);
+        }
         if (this.pickState.isQuickNavigating) {
+            if (picks.length > 0) {
+                picks.push({ type: 'separator', label: ( localizeWithPath(
+                    'vs/workbench/contrib/search/browser/anythingQuickAccess',
+                    'recentlyOpenedSeparator',
+                    "recently opened"
+                )) });
+            }
             picks = historyEditorPicks;
         }
         else {
-            picks = [];
             if (options.includeHelp) {
                 picks.push(...this.getHelpPicks(query, token, options));
             }
@@ -428,11 +444,14 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
         return ( fileSearchResults.results.map(result => result.resource));
     }
     doGetFileSearchResults(filePattern, token) {
+        const start = Date.now();
         return this.searchService.fileSearch(this.fileQueryBuilder.file(this.contextService.getWorkspace().folders, this.getFileQueryOptions({
             filePattern,
             cacheKey: this.pickState.fileQueryCache?.cacheKey,
             maxResults: AnythingQuickAccessProvider_1.MAX_RESULTS
-        })), token);
+        })), token).finally(() => {
+            this.logService.trace(`QuickAccess fileSearch ${Date.now() - start}ms`);
+        });
     }
     getFileQueryOptions(input) {
         return {
@@ -582,7 +601,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
     async doGetEditorSymbolPicks(activeGlobalPick, activeGlobalResource, filter, disposables, token) {
         try {
             this.pickState.editorViewState.set();
-            await this.editorService.openEditor({
+            await this.pickState.editorViewState.openTransientEditor({
                 resource: activeGlobalResource,
                 options: { preserveFocus: true, revealIfOpened: true, ignoreError: true }
             });
@@ -770,7 +789,8 @@ AnythingQuickAccessProvider = AnythingQuickAccessProvider_1 = ( __decorate([
     ( __param(15, IUriIdentityService)),
     ( __param(16, IQuickInputService)),
     ( __param(17, IKeybindingService)),
-    ( __param(18, IQuickChatService))
+    ( __param(18, IQuickChatService)),
+    ( __param(19, ILogService))
 ], AnythingQuickAccessProvider));
 export { AnythingQuickAccessProvider };

package/vscode/src/vs/workbench/contrib/search/browser/media/anythingQuickAccess.css.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".quick-input-list .quick-input-list-entry.has-actions:hover .quick-input-list-entry-action-bar .action-label.dirty-anything:before{content:\"\\ea76\"}";
+var css = ".quick-input-list .quick-input-list-entry.has-actions:hover .quick-input-list-entry-action-bar .action-label.dirty-anything:before{content:\"\\ea76\";font-family:codicon}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/workbench/contrib/search/browser/patternInputWidget.js CHANGED Viewed

@@ -11,6 +11,7 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
 import { defaultToggleStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
+import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 let PatternInputWidget = class PatternInputWidget extends Widget {
     static { this.OPTION_CHANGE = 'optionChange'; }
@@ -163,6 +164,7 @@ let IncludePatternInputWidget = class IncludePatternInputWidget extends PatternI
                 "Search only in Open Editors"
             )),
             isChecked: false,
+            hoverDelegate: getDefaultHoverDelegate('element'),
             ...defaultToggleStyles
         })));
         this._register(this.useSearchInEditorsBox.onChange(viaKeyboard => {
@@ -210,6 +212,7 @@ let ExcludePatternInputWidget = class ExcludePatternInputWidget extends PatternI
                 "Use Exclude Settings and Ignore Files"
             )),
             isChecked: true,
+            hoverDelegate: getDefaultHoverDelegate('element'),
             ...defaultToggleStyles
         })));
         this._register(this.useExcludesAndIgnoreFilesBox.onChange(viaKeyboard => {

package/vscode/src/vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess.js CHANGED Viewed

@@ -21,9 +21,8 @@ import { SIDE_GROUP, ACTIVE_GROUP, IEditorService } from 'vscode/vscode/vs/workb
 import { QueryBuilder } from 'vscode/vscode/vs/workbench/services/search/common/queryBuilder';
 import { VIEW_ID } from 'vscode/vscode/vs/workbench/services/search/common/search';
 import { Event } from 'vscode/vscode/vs/base/common/event';
-import { EditorViewState } from 'vscode/vscode/vs/workbench/browser/quickaccess';
+import { PickerEditorState } from 'vscode/vscode/vs/workbench/browser/quickaccess';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
-import { IHistoryService } from 'vscode/vscode/vs/workbench/services/history/common/history';
 import { Sequencer } from 'vscode/vscode/vs/base/common/async';
 const TEXT_SEARCH_QUICK_ACCESS_PREFIX = '%';
@@ -36,6 +35,7 @@ const DEFAULT_TEXT_QUERY_BUILDER_OPTIONS = {
 };
 const MAX_FILES_SHOWN = 30;
 const MAX_RESULTS_PER_FILE = 10;
+const DEBOUNCE_DELAY = 75;
 let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAccessProvider {
     _getTextQueryBuilderOptions(charsPerLine) {
         return {
@@ -51,7 +51,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
             }
         };
     }
-    constructor(_instantiationService, _contextService, _editorService, _labelService, _viewsService, _configurationService, _historyService) {
+    constructor(_instantiationService, _contextService, _editorService, _labelService, _viewsService, _configurationService) {
         super(TEXT_SEARCH_QUICK_ACCESS_PREFIX, { canAcceptInBackground: true, shouldSkipTrimPickFilter: true });
         this._instantiationService = _instantiationService;
         this._contextService = _contextService;
@@ -59,14 +59,13 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
         this._labelService = _labelService;
         this._viewsService = _viewsService;
         this._configurationService = _configurationService;
-        this._historyService = _historyService;
         this.currentAsyncSearch = Promise.resolve({
             results: [],
             messages: []
         });
-        this.editorViewState = ( new EditorViewState(this._editorService));
         this.queryBuilder = this._instantiationService.createInstance(QueryBuilder);
-        this.searchModel = this._instantiationService.createInstance(SearchModel);
+        this.searchModel = this._register(this._instantiationService.createInstance(SearchModel));
+        this.editorViewState = this._register(this._instantiationService.createInstance(PickerEditorState));
         this.searchModel.location = SearchModelLocation.QUICK_ACCESS;
         this.editorSequencer = ( new Sequencer());
     }
@@ -91,29 +90,26 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
             }
             picker.hide();
         }));
-        disposables.add(picker.onDidChangeActive(() => {
+        const onDidChangeActive = () => {
             const [item] = picker.activeItems;
             if (item?.match) {
                 this.editorViewState.set();
                 const itemMatch = item.match;
                 this.editorSequencer.queue(async () => {
-                    const disposable = this._historyService.suspendTracking();
-                    try {
-                        await this._editorService.openEditor({
-                            resource: itemMatch.parent().resource,
-                            options: { preserveFocus: true, revealIfOpened: true, ignoreError: true, selection: itemMatch.range() }
-                        });
-                    }
-                    finally {
-                        disposable.dispose();
-                    }
+                    await this.editorViewState.openTransientEditor({
+                        resource: itemMatch.parent().resource,
+                        options: { preserveFocus: true, revealIfOpened: true, ignoreError: true, selection: itemMatch.range() }
+                    });
                 });
             }
-        }));
-        disposables.add(Event.once(picker.onDidHide)(({ reason }) => {
+        };
+        disposables.add(Event.debounce(picker.onDidChangeActive, (last, event) => event, DEBOUNCE_DELAY, true)(onDidChangeActive));
+        disposables.add(Event.once(picker.onWillHide)(({ reason }) => {
             if (reason === QuickInputHideReason.Gesture) {
-                this.editorViewState.restore(true);
+                this.editorViewState.restore();
             }
+        }));
+        disposables.add(Event.once(picker.onDidHide)(({ reason }) => {
             this.searchModel.searchResult.toggleHighlights(false);
         }));
         disposables.add(super.provide(picker, token, runOptions));
@@ -203,7 +199,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
             picks.push({
                 label,
                 type: 'separator',
-                tooltip: description,
+                description,
                 buttons: [{
                         iconClass: ThemeIcon.asClassName(searchOpenInFileIcon),
                         tooltip: ( localizeWithPath(
@@ -212,6 +208,10 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                             "Open File"
                         ))
                     }],
+                trigger: async () => {
+                    await this.handleAccept(fileMatch, {});
+                    return TriggerAction.CLOSE_PICKER;
+                },
             });
             const results = fileMatch.matches() ?? [];
             for (let matchIndex = 0; matchIndex < results.length; matchIndex++) {
@@ -335,8 +335,7 @@ TextSearchQuickAccess = ( __decorate([
     ( __param(2, IEditorService)),
     ( __param(3, ILabelService)),
     ( __param(4, IViewsService)),
-    ( __param(5, IConfigurationService)),
-    ( __param(6, IHistoryService))
+    ( __param(5, IConfigurationService))
 ], TextSearchQuickAccess));
 export { TEXT_SEARCH_QUICK_ACCESS_PREFIX, TextSearchQuickAccess };

package/vscode/src/vs/workbench/contrib/search/browser/replaceContributions.js CHANGED Viewed

@@ -1,3 +1,4 @@
+import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ReplacePreviewContentProvider } from './replaceService.js';
 import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';

package/vscode/src/vs/workbench/contrib/search/browser/search.contribution.js CHANGED Viewed

@@ -12,10 +12,14 @@ import { Extensions } from 'vscode/vscode/vs/workbench/common/views';
 import { GotoSymbolQuickAccessProvider } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess';
 import { AnythingQuickAccessProvider } from './anythingQuickAccess.js';
 import { registerContributions } from './replaceContributions.js';
+import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import 'vscode/vscode/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchService';
 import { searchViewIcon } from './searchIcons.js';
 import { SearchView } from './searchView.js';
 import { registerContributions as registerContributions$1 } from './searchWidget.js';
 import { SymbolsQuickAccessProvider } from './symbolsQuickAccess.js';
+import 'vscode/vscode/vs/workbench/contrib/search/common/searchHistoryService';
+import 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
 import { VIEWLET_ID, VIEW_ID, SEARCH_EXCLUDE_CONFIG } from 'vscode/vscode/vs/workbench/services/search/common/search';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { assertType } from 'vscode/vscode/vs/base/common/types';
@@ -147,7 +151,7 @@ configurationRegistry.registerConfiguration({
             markdownDescription: ( localizeWithPath(
                 'vs/workbench/contrib/search/browser/search.contribution',
                 'exclude',
-                "Configure [glob patterns](https://code.visualstudio.com/docs/editor/codebasics#_advanced-search-options) for excluding files and folders in fulltext searches and quick open. Inherits all glob patterns from the `#files.exclude#` setting."
+                "Configure [glob patterns](https://code.visualstudio.com/docs/editor/codebasics#_advanced-search-options) for excluding files and folders in fulltext searches and file search in quick open. To exclude files from the recently opened list in quick open, patterns must be absolute (for example `**/node_modules/**`). Inherits all glob patterns from the `#files.exclude#` setting."
             )),
             default: { '**/node_modules': true, '**/bower_components': true, '**/*.code-search': true },
             additionalProperties: {
@@ -493,6 +497,28 @@ configurationRegistry.registerConfiguration({
                 "Configure effect of double-clicking a result in a search editor."
             ))
         },
+        'search.searchEditor.singleClickBehaviour': {
+            type: 'string',
+            enum: ['default', 'peekDefinition',],
+            default: 'default',
+            enumDescriptions: [
+                ( localizeWithPath(
+                    'vs/workbench/contrib/search/browser/search.contribution',
+                    'search.searchEditor.singleClickBehaviour.default',
+                    "Single-clicking does nothing."
+                )),
+                ( localizeWithPath(
+                    'vs/workbench/contrib/search/browser/search.contribution',
+                    'search.searchEditor.singleClickBehaviour.peekDefinition',
+                    "Single-clicking opens a Peek Definition window."
+                )),
+            ],
+            markdownDescription: ( localizeWithPath(
+                'vs/workbench/contrib/search/browser/search.contribution',
+                'search.searchEditor.singleClickBehaviour',
+                "Configure effect of single-clicking a result in a search editor."
+            ))
+        },
         'search.searchEditor.reusePriorSearchConfiguration': {
             type: 'boolean',
             default: false,

package/vscode/src/vs/workbench/contrib/search/browser/searchActionsTopBar.js CHANGED Viewed

@@ -102,7 +102,7 @@ registerAction2(class CollapseDeepestExpandedLevelAction extends Action2 {
             menu: [{
                     id: MenuId.ViewTitle,
                     group: 'navigation',
-                    order: 3,
+                    order: 4,
                     when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_ID)), ( ContextKeyExpr.or(( SearchContext.HasSearchResults.negate()), SearchContext.ViewHasSomeCollapsibleKey)))),
                 }]
         });
@@ -127,7 +127,7 @@ registerAction2(class ExpandAllAction extends Action2 {
             menu: [{
                     id: MenuId.ViewTitle,
                     group: 'navigation',
-                    order: 3,
+                    order: 4,
                     when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_ID)), SearchContext.HasSearchResults, ( SearchContext.ViewHasSomeCollapsibleKey.toNegated()))),
                 }]
         });

package/vscode/src/vs/workbench/contrib/search/browser/searchFindInput.js CHANGED Viewed

@@ -1,28 +1,68 @@
 import { ContextScopedFindInput } from 'vscode/vscode/vs/platform/history/browser/contextScopedHistoryWidget';
 import { NotebookFindInputFilterButton } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
+import { Toggle } from 'vscode/vscode/vs/base/browser/ui/toggle/toggle';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+const NLS_AI_TOGGLE_LABEL = ( localizeWithPath(
+    'vs/workbench/contrib/search/browser/searchFindInput',
+    'aiDescription',
+    "Use AI"
+));
 class SearchFindInput extends ContextScopedFindInput {
-    constructor(container, contextViewProvider, options, contextKeyService, contextMenuService, instantiationService, filters, filterStartVisiblitity) {
+    constructor(container, contextViewProvider, options, contextKeyService, contextMenuService, instantiationService, filters, _shouldShowAIButton,
+    filterStartVisiblitity) {
         super(container, contextViewProvider, options, contextKeyService);
         this.contextMenuService = contextMenuService;
         this.instantiationService = instantiationService;
         this.filters = filters;
+        this._shouldShowAIButton = _shouldShowAIButton;
         this._filterChecked = false;
         this._visible = false;
+        this._onDidChangeAIToggle = this._register(( new Emitter()));
+        this.onDidChangeAIToggle = this._onDidChangeAIToggle.event;
         this._findFilter = this._register(( new NotebookFindInputFilterButton(filters, contextMenuService, instantiationService, options, ( localizeWithPath(
             'vs/workbench/contrib/search/browser/searchFindInput',
             'searchFindInputNotebookFilter.label',
             "Notebook Find Filters"
         )))));
+        this._aiButton = this._register(( new AIToggle({
+            appendTitle: '',
+            isChecked: false,
+            ...options.toggleStyles
+        })));
+        this.setAdditionalToggles([this._aiButton]);
         this.inputBox.paddingRight = (this.caseSensitive?.width() ?? 0) + (this.wholeWords?.width() ?? 0) + (this.regex?.width() ?? 0) + this._findFilter.width;
         this.controls.appendChild(this._findFilter.container);
         this._findFilter.container.classList.add('monaco-custom-toggle');
         this.filterVisible = filterStartVisiblitity;
+        this._register(this._aiButton.onChange(() => {
+            if (this._aiButton.checked) {
+                this.regex?.disable();
+                this.wholeWords?.disable();
+                this.caseSensitive?.disable();
+                this._findFilter.disable();
+            }
+            else {
+                this.regex?.enable();
+                this.wholeWords?.enable();
+                this.caseSensitive?.enable();
+                this._findFilter.enable();
+            }
+        }));
+        this._aiButton.domNode.style.display = _shouldShowAIButton ? '' : 'none';
     }
-    set filterVisible(show) {
-        this._findFilter.container.style.display = show ? '' : 'none';
-        this._visible = show;
+    set shouldShowAIButton(visible) {
+        if (this._shouldShowAIButton !== visible) {
+            this._shouldShowAIButton = visible;
+            this._aiButton.domNode.style.display = visible ? '' : 'none';
+        }
+    }
+    set filterVisible(visible) {
+        this._findFilter.container.style.display = visible ? '' : 'none';
+        this._visible = visible;
         this.updateStyles();
     }
     setEnabled(enabled) {
@@ -42,6 +82,22 @@ class SearchFindInput extends ContextScopedFindInput {
                 !this.filters.codeOutput;
         this._findFilter.applyStyles(this._filterChecked);
     }
+    get isAIEnabled() {
+        return this._aiButton.checked;
+    }
+}
+class AIToggle extends Toggle {
+    constructor(opts) {
+        super({
+            icon: Codicon.sparkle,
+            title: NLS_AI_TOGGLE_LABEL + opts.appendTitle,
+            isChecked: opts.isChecked,
+            hoverDelegate: opts.hoverDelegate ?? getDefaultHoverDelegate('element'),
+            inputActiveOptionBorder: opts.inputActiveOptionBorder,
+            inputActiveOptionForeground: opts.inputActiveOptionForeground,
+            inputActiveOptionBackground: opts.inputActiveOptionBackground
+        });
+    }
 }
 export { SearchFindInput };

package/vscode/src/vs/workbench/contrib/search/browser/searchIcons.js CHANGED Viewed

@@ -92,5 +92,15 @@ const searchOpenInFileIcon = registerIcon('search-open-in-file', Codicon.goToFil
  'searchOpenInFile',
  'Icon for the action to go to the file of the current search result.'
 )));
+registerIcon('search-sparkle-filled', Codicon.sparkleFilled, ( localizeWithPath(
+ 'vs/workbench/contrib/search/browser/searchIcons',
+ 'searchSparkleFilled',
+ 'Icon to show AI results in search.'
+)));
+registerIcon('search-sparkle-empty', Codicon.sparkle, ( localizeWithPath(
+ 'vs/workbench/contrib/search/browser/searchIcons',
+ 'searchSparkleEmpty',
+ 'Icon to hide AI results in search.'
+)));
 export { searchActivityBarIcon, searchClearIcon, searchCollapseAllIcon, searchDetailsIcon, searchExpandAllIcon, searchHideReplaceIcon, searchNewEditorIcon, searchOpenInFileIcon, searchRefreshIcon, searchRemoveIcon, searchReplaceAllIcon, searchReplaceIcon, searchShowAsList, searchShowAsTree, searchShowContextIcon, searchShowReplaceIcon, searchStopIcon, searchViewIcon };

package/vscode/src/vs/workbench/contrib/search/browser/searchMessage.js CHANGED Viewed

@@ -1,7 +1,7 @@
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { $, append } from 'vscode/vscode/vs/base/browser/dom';
 import { parseLinkedText } from 'vscode/vscode/vs/base/common/linkedText';
-import Severity from 'vscode/vscode/vs/base/common/severity';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { SeverityIcon } from 'vscode/vscode/vs/platform/severityIcon/browser/severityIcon';
 import { TextSearchCompleteMessageType } from 'vscode/vscode/vs/workbench/services/search/common/searchExtTypes';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
@@ -13,8 +13,8 @@ const renderSearchMessage = (message, instantiationService, notificationService,
     const linkedText = parseLinkedText(message.text);
     append(div, $('.' +
         SeverityIcon.className(message.type === TextSearchCompleteMessageType.Information
-            ? Severity.Info
-            : Severity.Warning)
+            ? Severity$1.Info
+            : Severity$1.Warning)
             .split(' ')
             .join('.')));
     for (const node of linkedText.nodes) {

package/vscode/src/vs/workbench/contrib/search/browser/searchResultsView.js CHANGED Viewed

@@ -17,6 +17,8 @@ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
 import { defaultCountBadgeStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
+import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
+import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 var FolderMatchRenderer_1, FileMatchRenderer_1, MatchRenderer_1;
 class SearchDelegate {
@@ -313,7 +315,8 @@ let MatchRenderer = class MatchRenderer extends Disposable {
         templateData.match.classList.toggle('replace', replace);
         templateData.replace.textContent = replace ? match.replaceString : '';
         templateData.after.textContent = preview.after;
-        templateData.parent.title = (preview.fullBefore + (replace ? match.replaceString : preview.inside) + preview.after).trim().substr(0, 999);
+        const title = (preview.fullBefore + (replace ? match.replaceString : preview.inside) + preview.after).trim().substr(0, 999);
+        templateData.disposables.add(setupCustomHover(getDefaultHoverDelegate('mouse'), templateData.parent, title));
         SearchContext.IsEditableItemKey.bindTo(templateData.contextKeyService).set(!(match instanceof MatchInNotebook && match.isReadonly()));
         const numLines = match.range().endLineNumber - match.range().startLineNumber;
         const extraLinesStr = numLines > 0 ? `+${numLines}` : '';
@@ -321,7 +324,7 @@ let MatchRenderer = class MatchRenderer extends Disposable {
         const lineNumberStr = showLineNumbers ? `${match.range().startLineNumber}:` : '';
         templateData.lineNumber.classList.toggle('show', (numLines > 0) || showLineNumbers);
         templateData.lineNumber.textContent = lineNumberStr + extraLinesStr;
-        templateData.lineNumber.setAttribute('title', this.getMatchTitle(match, showLineNumbers));
+        templateData.disposables.add(setupCustomHover(getDefaultHoverDelegate('mouse'), templateData.lineNumber, this.getMatchTitle(match, showLineNumbers)));
         templateData.actions.context = { viewer: this.searchView.getControl(), element: match };
     }
     disposeTemplate(templateData) {

package/vscode/src/vs/workbench/contrib/search/browser/searchView.js CHANGED Viewed

@@ -15,7 +15,7 @@ import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import './media/searchview.css.js';
 import { isCodeEditor, getCodeEditor, isDiffEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
-import { EmbeddedCodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/embeddedCodeEditorWidget';
+import { EmbeddedCodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
 import { Selection } from 'vscode/vscode/vs/editor/common/core/selection';
 import { CommonFindController } from 'vscode/vscode/vs/editor/contrib/find/browser/findController';
 import { MultiCursorSelectionController } from 'vscode/vscode/vs/editor/contrib/multicursor/browser/multicursor';
@@ -68,6 +68,8 @@ import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/c
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { AccessibilitySignal, IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
+import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
+import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 import { TextSearchCompleteMessageType } from 'vscode/vscode/vs/workbench/services/search/common/searchExtTypes';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
@@ -127,6 +129,13 @@ let SearchView = class SearchView extends ViewPane {
         this.hasFilePatternKey = SearchContext.ViewHasFilePatternKey.bindTo(this.contextKeyService);
         this.hasSomeCollapsibleResultKey = SearchContext.ViewHasSomeCollapsibleKey.bindTo(this.contextKeyService);
         this.treeViewKey = SearchContext.InTreeViewKey.bindTo(this.contextKeyService);
+        this.aiResultsVisibleKey = SearchContext.AIResultsVisibleKey.bindTo(this.contextKeyService);
+        this._register(this.contextKeyService.onDidChangeContext(e => {
+            const keys = ( SearchContext.hasAIResultProvider.keys());
+            if (e.affectsSome(( new Set(keys)))) {
+                this.refreshHasAISetting();
+            }
+        }));
         this.contextKeyService = this._register(this.contextKeyService.createScoped(this.container));
         SearchContext.SearchViewFocusedKey.bindTo(this.contextKeyService).set(true);
         this.inputBoxFocused = SearchContext.InputBoxFocusedKey.bindTo(this.contextKeyService);
@@ -134,14 +143,17 @@ let SearchView = class SearchView extends ViewPane {
         this.inputPatternExclusionsFocused = SearchContext.PatternExcludesFocusedKey.bindTo(this.contextKeyService);
         this.isEditableItem = SearchContext.IsEditableItemKey.bindTo(this.contextKeyService);
         this.instantiationService = this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, this.contextKeyService])));
-        this.configurationService.onDidChangeConfiguration(e => {
+        this._register(this.configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration('search.sortOrder')) {
                 if (this.searchConfig.sortOrder === "modified" ) {
                     this.removeFileStats();
                 }
                 this.refreshTree();
             }
-        });
+            else if (e.affectsConfiguration('search.aiResults')) {
+                this.refreshHasAISetting();
+            }
+        }));
         this.viewModel = this._register(this.searchViewModelWorkbenchService.searchModel);
         this.queryBuilder = this.instantiationService.createInstance(QueryBuilder);
         this.memento = ( new Memento(this.id, storageService));
@@ -183,6 +195,12 @@ let SearchView = class SearchView extends ViewPane {
     set isTreeLayoutViewVisible(visible) {
         this.treeViewKey.set(visible);
     }
+    get aiResultsVisible() {
+        return this.aiResultsVisibleKey.get() ?? false;
+    }
+    set aiResultsVisible(visible) {
+        this.aiResultsVisibleKey.set(visible);
+    }
     setTreeView(visible) {
         if (visible === this.isTreeLayoutViewVisible) {
             return;
@@ -191,6 +209,24 @@ let SearchView = class SearchView extends ViewPane {
         this.updateIndentStyles(this.themeService.getFileIconTheme());
         this.refreshTree();
     }
+    async setAIResultsVisible(visible) {
+        if (visible === this.aiResultsVisible) {
+            return;
+        }
+        this.aiResultsVisible = visible;
+        if (this.viewModel.searchResult.isEmpty()) {
+            return;
+        }
+        this.model.cancelAISearch();
+        if (visible) {
+            await this.model.addAIResults();
+        }
+        else {
+            this.searchWidget.toggleReplace(false);
+        }
+        this.onSearchResultsChanged();
+        this.onSearchComplete(() => { }, undefined, undefined, this.viewModel.searchResult.getCachedSearchComplete(visible));
+    }
     get state() {
         return this.searchStateKey.get() ?? SearchUIState.Idle;
     }
@@ -206,6 +242,12 @@ let SearchView = class SearchView extends ViewPane {
     get model() {
         return this.viewModel;
     }
+    refreshHasAISetting() {
+        const val = this.shouldShowAIButton();
+        if (val && this.searchWidget.searchInput) {
+            this.searchWidget.searchInput.shouldShowAIButton = val;
+        }
+    }
     onDidChangeWorkbenchState() {
         if (this.contextService.getWorkbenchState() !== 1  && this.searchWithoutFolderMessageElement) {
             hide(this.searchWithoutFolderMessageElement);
@@ -248,8 +290,8 @@ let SearchView = class SearchView extends ViewPane {
             this.onSearchError(e, progressComplete, undefined, undefined);
         });
         const collapseResults = this.searchConfig.collapseResults;
-        if (collapseResults !== 'alwaysCollapse' && this.viewModel.searchResult.matches().length === 1) {
-            const onlyMatch = this.viewModel.searchResult.matches()[0];
+        if (collapseResults !== 'alwaysCollapse' && this.viewModel.searchResult.matches(this.aiResultsVisible).length === 1) {
+            const onlyMatch = this.viewModel.searchResult.matches(this.aiResultsVisible)[0];
             if (onlyMatch.count() < 50) {
                 this.tree.expand(onlyMatch);
             }
@@ -260,6 +302,7 @@ let SearchView = class SearchView extends ViewPane {
         this.container = append(parent, $$1('.search-view'));
         this.searchWidgetsContainerElement = append(this.container, $('.search-widgets-container'));
         this.createSearchWidget(this.searchWidgetsContainerElement);
+        this.refreshHasAISetting();
         const history = this.searchHistoryService.load();
         const filePatterns = this.viewletState['query.filePatterns'] || '';
         const patternExclusions = this.viewletState['query.folderExclusions'] || '';
@@ -271,11 +314,12 @@ let SearchView = class SearchView extends ViewPane {
         const useExcludesAndIgnoreFiles = typeof this.viewletState['query.useExcludesAndIgnoreFiles'] === 'boolean' ?
             this.viewletState['query.useExcludesAndIgnoreFiles'] : true;
         this.queryDetails = append(this.searchWidgetsContainerElement, $('.query-details'));
-        this.toggleQueryDetailsButton = append(this.queryDetails, $('.more' + ThemeIcon.asCSSSelector(searchDetailsIcon), { tabindex: 0, role: 'button', title: ( localizeWithPath(
+        this.toggleQueryDetailsButton = append(this.queryDetails, $('.more' + ThemeIcon.asCSSSelector(searchDetailsIcon), { tabindex: 0, role: 'button' }));
+        this._register(setupCustomHover(getDefaultHoverDelegate('element'), this.toggleQueryDetailsButton, ( localizeWithPath(
             'vs/workbench/contrib/search/browser/searchView',
             'moreSearch',
             "Toggle Search Details"
-        )) }));
+        ))));
         this._register(addDisposableListener(this.toggleQueryDetailsButton, EventType.CLICK, e => {
             EventHelper.stop(e);
             this.toggleQueryDetails(!this.accessibilityService.isScreenReaderOptimized());
@@ -424,7 +468,8 @@ let SearchView = class SearchView extends ViewPane {
                 isInNotebookMarkdownPreview,
                 isInNotebookCellInput,
                 isInNotebookCellOutput,
-            }
+            },
+            initialAIButtonVisibility: this.shouldShowAIButton()
         }));
         if (!this.searchWidget.searchInput || !this.searchWidget.replaceInput) {
             this.logService.warn(`Cannot fully create search widget. Search or replace input undefined. SearchInput: ${this.searchWidget.searchInput}, ReplaceInput: ${this.searchWidget.replaceInput}`);
@@ -435,7 +480,14 @@ let SearchView = class SearchView extends ViewPane {
         }
         this._register(this.searchWidget.onSearchSubmit(options => this.triggerQueryChange(options)));
         this._register(this.searchWidget.onSearchCancel(({ focus }) => this.cancelSearch(focus)));
-        this._register(this.searchWidget.searchInput.onDidOptionChange(() => this.triggerQueryChange()));
+        this._register(this.searchWidget.searchInput.onDidOptionChange(() => {
+            if (this.searchWidget.searchInput && this.searchWidget.searchInput.isAIEnabled !== this.aiResultsVisible) {
+                this.setAIResultsVisible(this.searchWidget.searchInput.isAIEnabled);
+            }
+            else {
+                this.triggerQueryChange();
+            }
+        }));
         this._register(this.searchWidget.getNotebookFilters().onDidChange(() => this.triggerQueryChange()));
         const updateHasPatternKey = () => this.hasSearchPatternKey.set(this.searchWidget.searchInput ? (this.searchWidget.searchInput.getValue().length > 0) : false);
         updateHasPatternKey();
@@ -464,6 +516,10 @@ let SearchView = class SearchView extends ViewPane {
         this.trackInputBox(this.searchWidget.searchInputFocusTracker);
         this.trackInputBox(this.searchWidget.replaceInputFocusTracker);
     }
+    shouldShowAIButton() {
+        const hasProvider = SearchContext.hasAIResultProvider.getValue(this.contextKeyService);
+        return !!(this.configurationService.getValue('search.aiResults') && hasProvider);
+    }
     onConfigurationUpdated(event) {
         if (event && (event.affectsConfiguration('search.decorations.colors') || event.affectsConfiguration('search.decorations.badges'))) {
             this.refreshTree();
@@ -495,7 +551,7 @@ let SearchView = class SearchView extends ViewPane {
         }
     }
     refreshAndUpdateCount(event) {
-        this.searchWidget.setReplaceAllActionState(!this.viewModel.searchResult.isEmpty());
+        this.searchWidget.setReplaceAllActionState(!this.viewModel.searchResult.isEmpty(this.aiResultsVisible));
         this.updateSearchResultCount(this.viewModel.searchResult.query.userDisabledExcludesAndIgnoreFiles, this.viewModel.searchResult.query?.onlyOpenEditors, event?.clearingAll);
         return this.refreshTree(event);
     }
@@ -524,7 +580,7 @@ let SearchView = class SearchView extends ViewPane {
         }
     }
     createResultIterator(collapseResults) {
-        const folderMatches = this.searchResult.folderMatches()
+        const folderMatches = this.searchResult.folderMatches(this.aiResultsVisible)
             .filter(fm => !fm.isEmpty())
             .sort(searchMatchComparer);
         if (folderMatches.length === 1) {
@@ -552,7 +608,10 @@ let SearchView = class SearchView extends ViewPane {
         }));
     }
     createFileIterator(fileMatch) {
-        const matches = fileMatch.matches().sort(searchMatchComparer);
+        let matches = fileMatch.matches().sort(searchMatchComparer);
+        if (!this.aiResultsVisible) {
+            matches = matches.filter(e => !e.aiContributed);
+        }
         return ( Iterable.map(matches, r => ({ element: r, incompressible: true })));
     }
     createIterator(match, collapseResults) {
@@ -1107,7 +1166,7 @@ let SearchView = class SearchView extends ViewPane {
             this.searchIncludePattern.getValue() === '';
     }
     hasSearchResults() {
-        return !this.viewModel.searchResult.isEmpty();
+        return !this.viewModel.searchResult.isEmpty(this.aiResultsVisible);
     }
     clearSearchResults(clearInput = true) {
         this.viewModel.searchResult.clear();
@@ -1385,6 +1444,7 @@ let SearchView = class SearchView extends ViewPane {
             this.inputPatternIncludes.onSearchSubmit();
         });
         this.viewModel.cancelSearch(true);
+        this.viewModel.cancelAISearch(true);
         this.currentSearchQ = this.currentSearchQ
             .then(() => this.doSearch(query, excludePatternText, includePatternText, triggeredOnType))
             .then(() => undefined, () => undefined);
@@ -1394,7 +1454,7 @@ let SearchView = class SearchView extends ViewPane {
             return;
         }
         try {
-            const fileCount = this.viewModel.searchResult.fileCount();
+            const fileCount = this.viewModel.searchResult.fileCount(this.aiResultsVisible);
             if (this._visibleMatches !== fileCount) {
                 this._visibleMatches = fileCount;
                 this.refreshAndUpdateCount();
@@ -1409,13 +1469,13 @@ let SearchView = class SearchView extends ViewPane {
         progressComplete();
         this.onSearchResultsChanged();
         const collapseResults = this.searchConfig.collapseResults;
-        if (collapseResults !== 'alwaysCollapse' && this.viewModel.searchResult.matches().length === 1) {
-            const onlyMatch = this.viewModel.searchResult.matches()[0];
+        if (collapseResults !== 'alwaysCollapse' && this.viewModel.searchResult.matches(this.aiResultsVisible).length === 1) {
+            const onlyMatch = this.viewModel.searchResult.matches(this.aiResultsVisible)[0];
             if (onlyMatch.count() < 50) {
                 this.tree.expand(onlyMatch);
             }
         }
-        const hasResults = !this.viewModel.searchResult.isEmpty();
+        const hasResults = !this.viewModel.searchResult.isEmpty(this.aiResultsVisible);
         if (completed?.exit === 1 ) {
             return;
         }
@@ -1541,7 +1601,7 @@ let SearchView = class SearchView extends ViewPane {
                 'vs/workbench/contrib/search/browser/searchView',
                 'ariaSearchResultsStatus',
                 "Search returned {0} results in {1} files",
-                this.viewModel.searchResult.count(),
+                this.viewModel.searchResult.count(this.aiResultsVisible),
                 this.viewModel.searchResult.fileCount()
             )));
         }
@@ -1589,6 +1649,16 @@ let SearchView = class SearchView extends ViewPane {
         this.tree.setFocus([]);
         this.viewModel.replaceString = this.searchWidget.getReplaceValue();
         const result = this.viewModel.search(query);
+        if (this.aiResultsVisible) {
+            const aiResult = this.viewModel.aiSearch({ ...query, contentPattern: query.contentPattern.pattern, type: 3  });
+            return result.asyncResults.then(() => aiResult.then((complete) => {
+                clearTimeout(slowTimer);
+                this.onSearchComplete(progressComplete, excludePatternText, includePatternText, complete);
+            }, (e) => {
+                clearTimeout(slowTimer);
+                this.onSearchError(e, progressComplete, excludePatternText, includePatternText);
+            }));
+        }
         return result.asyncResults.then((complete) => {
             clearTimeout(slowTimer);
             this.onSearchComplete(progressComplete, excludePatternText, includePatternText, complete);
@@ -1625,11 +1695,12 @@ let SearchView = class SearchView extends ViewPane {
         this.inputPatternIncludes.setOnlySearchInOpenEditors(false);
     }
     updateSearchResultCount(disregardExcludesAndIgnores, onlyOpenEditors, clear = false) {
-        const fileCount = this.viewModel.searchResult.fileCount();
+        const fileCount = this.viewModel.searchResult.fileCount(this.aiResultsVisible);
+        const resultCount = this.viewModel.searchResult.count(this.aiResultsVisible);
         this.hasSearchResultsKey.set(fileCount > 0);
         const msgWasHidden = this.messagesElement.style.display === 'none';
         const messageEl = this.clearMessage();
-        const resultMsg = clear ? '' : this.buildResultCountMessage(this.viewModel.searchResult.count(), fileCount);
+        const resultMsg = clear ? '' : this.buildResultCountMessage(resultCount, fileCount);
         this.tree.ariaLabel = resultMsg + ( localizeWithPath(
             'vs/workbench/contrib/search/browser/searchView',
             'forTerm',
@@ -1862,7 +1933,13 @@ let SearchView = class SearchView extends ViewPane {
         if (!this.viewModel) {
             return;
         }
-        const matches = this.viewModel.searchResult.matches();
+        let matches = this.viewModel.searchResult.matches();
+        for (let i = 0, len = matches.length; i < len; i++) {
+            if (( resource.toString()) === ( matches[i].resource.toString())) {
+                this.viewModel.searchResult.remove(matches[i]);
+            }
+        }
+        matches = this.viewModel.searchResult.matches(true);
         for (let i = 0, len = matches.length; i < len; i++) {
             if (( resource.toString()) === ( matches[i].resource.toString())) {
                 this.viewModel.searchResult.remove(matches[i]);
@@ -1957,7 +2034,7 @@ let SearchView = class SearchView extends ViewPane {
         this.searchHistoryService.save(history);
     }
     async retrieveFileStats() {
-        const files = ( this.searchResult.matches().filter(f => !f.fileStat).map(f => f.resolveFileStat(this.fileService)));
+        const files = ( this.searchResult.matches(this.aiResultsVisible).filter(f => !f.fileStat).map(f => f.resolveFileStat(this.fileService)));
         await Promise.all(files);
     }
     async updateFileStats(elements) {
@@ -1968,6 +2045,9 @@ let SearchView = class SearchView extends ViewPane {
         for (const fileMatch of this.searchResult.matches()) {
             fileMatch.fileStat = undefined;
         }
+        for (const fileMatch of this.searchResult.matches(true)) {
+            fileMatch.fileStat = undefined;
+        }
     }
     dispose() {
         this.isDisposed = true;
@@ -2008,7 +2088,8 @@ SearchView = SearchView_1 = ( __decorate([
 class SearchLinkButton extends Disposable {
     constructor(label, handler, tooltip) {
         super();
-        this.element = $('a.pointer', { tabindex: 0, title: tooltip }, label);
+        this.element = $('a.pointer', { tabindex: 0 }, label);
+        this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), this.element, tooltip));
         this.addEventHandlers(handler);
     }
     addEventHandlers(handler) {

package/vscode/src/vs/workbench/contrib/search/browser/searchWidget.js CHANGED Viewed

@@ -32,6 +32,8 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { NotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { SearchFindInput } from './searchFindInput.js';
+import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
+import { MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 var SearchWidget_1;
 const SingleLineInputHeight = 26;
@@ -132,18 +134,19 @@ let SearchWidget = class SearchWidget extends Widget {
             notebookOptions.isInNotebookCellOutput
         )));
         this._register(this._notebookFilters.onDidChange(() => {
-            if (this.searchInput instanceof SearchFindInput) {
+            if (this.searchInput) {
                 this.searchInput.updateStyles();
             }
         }));
         this._register(this.editorService.onDidEditorsChange((e) => {
-            if (this.searchInput instanceof SearchFindInput &&
+            if (this.searchInput &&
                 e.event.editor instanceof NotebookEditorInput &&
                 ((e.event.kind === 4  || e.event.kind === 5) )) {
                 this.searchInput.filterVisible = this._hasNotebookOpen();
             }
         }));
         this._replaceHistoryDelayer = ( new Delayer(500));
+        this._toggleReplaceButtonListener = this._register(( new MutableDisposable()));
         this.render(container, options);
         this.configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration('editor.accessibilitySupport')) {
@@ -266,18 +269,19 @@ let SearchWidget = class SearchWidget extends Widget {
             buttonSecondaryBackground: undefined,
             buttonSecondaryForeground: undefined,
             buttonSecondaryHoverBackground: undefined,
-            buttonSeparator: undefined
+            buttonSeparator: undefined,
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/search/browser/searchWidget',
+                'search.replace.toggle.button.title',
+                "Toggle Replace"
+            )),
+            hoverDelegate: getDefaultHoverDelegate('element'),
         };
         this.toggleReplaceButton = this._register(( new Button(parent, opts)));
         this.toggleReplaceButton.element.setAttribute('aria-expanded', 'false');
         this.toggleReplaceButton.element.classList.add('toggle-replace-button');
         this.toggleReplaceButton.icon = searchHideReplaceIcon;
-        this.toggleReplaceButton.onDidClick(() => this.onToggleReplaceButton());
-        this.toggleReplaceButton.element.title = ( localizeWithPath(
-            'vs/workbench/contrib/search/browser/searchWidget',
-            'search.replace.toggle.button.title',
-            "Toggle Replace"
-        ));
+        this._toggleReplaceButtonListener.value = this.toggleReplaceButton.onDidClick(() => this.onToggleReplaceButton());
     }
     renderSearchInput(parent, options) {
         const inputOptions = {
@@ -312,6 +316,7 @@ let SearchWidget = class SearchWidget extends Widget {
             this.contextMenuService,
             this.instantiationService,
             this._notebookFilters,
+            options.initialAIButtonVisibility ?? false,
             this._hasNotebookOpen()
         )));
         this.searchInput.onKeyDown((keyboardEvent) => this.onSearchInputKeyDown(keyboardEvent));
@@ -350,6 +355,7 @@ let SearchWidget = class SearchWidget extends Widget {
                 "Toggle Context Lines"
             )), this.keybindingService.lookupKeybinding(ToggleSearchEditorContextLinesCommandId)),
             icon: searchShowContextIcon,
+            hoverDelegate: getDefaultHoverDelegate('element'),
             ...defaultToggleStyles
         }));
         this._register(this.showContextToggle.onChange(() => this.onContextLinesChanged()));
@@ -482,6 +488,7 @@ let SearchWidget = class SearchWidget extends Widget {
         this.searchInput?.clearMessage();
         this.setReplaceAllActionState(false);
         if (this.searchConfiguration.searchOnType) {
+            const delayMultiplierFromAISearch = (this.searchInput && this.searchInput.isAIEnabled) ? 5 : 1;
             if (this.searchInput?.getRegex()) {
                 try {
                     const regex = ( new RegExp(this.searchInput.getValue(), 'ug'));
@@ -497,13 +504,13 @@ let SearchWidget = class SearchWidget extends Widget {
                     const delayMultiplier = matchienessHeuristic < 50 ? 1 :
                         matchienessHeuristic < 100 ? 5 :
                             10;
-                    this.submitSearch(true, this.searchConfiguration.searchOnTypeDebouncePeriod * delayMultiplier);
+                    this.submitSearch(true, this.searchConfiguration.searchOnTypeDebouncePeriod * delayMultiplier * delayMultiplierFromAISearch);
                 }
                 catch {
                 }
             }
             else {
-                this.submitSearch(true, this.searchConfiguration.searchOnTypeDebouncePeriod);
+                this.submitSearch(true, this.searchConfiguration.searchOnTypeDebouncePeriod * delayMultiplierFromAISearch);
             }
         }
     }

package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.js CHANGED Viewed

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { isEqual, extname } from 'vscode/vscode/vs/base/common/resources';
+import { extname, isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { ToggleCaseSensitiveKeybinding, ToggleWholeWordKeybinding, ToggleRegexKeybinding } from 'vscode/vscode/vs/editor/contrib/find/browser/findModel';
 import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
@@ -20,7 +20,7 @@ import { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/
 import { InSearchEditor, OpenNewEditorCommandId, OpenEditorCommandId, SearchEditorID, ToggleSearchEditorContextLinesCommandId, SearchEditorScheme } from 'vscode/vscode/vs/workbench/contrib/searchEditor/browser/constants';
 import { SearchEditor } from './searchEditor.js';
 import { openNewSearchEditor, createEditorFromSearchResult, toggleSearchEditorCaseSensitiveCommand, toggleSearchEditorWholeWordCommand, toggleSearchEditorRegexCommand, toggleSearchEditorContextLinesCommand, modifySearchEditorContextLinesCommand, selectAllSearchEditorMatchesCommand, openSearchEditor } from './searchEditorActions.js';
-import { SearchEditorInput, getOrMakeSearchEditorInput, SEARCH_EDITOR_EXT } from './searchEditorInput.js';
+import { SearchEditorInput, SEARCH_EDITOR_EXT, getOrMakeSearchEditorInput } from './searchEditorInput.js';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { VIEW_ID } from 'vscode/vscode/vs/workbench/services/search/common/search';
 import { RegisteredEditorPriority, IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';

package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditor.js CHANGED Viewed

@@ -23,7 +23,17 @@ import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
 import { LongRunningOperation, IEditorProgressService } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
-import { registerColor, inputBorder } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import { registerColor } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
+import { inputBorder } from 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/listColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
@@ -47,6 +57,8 @@ import { UnusualLineTerminatorsDetector } from 'vscode/vscode/vs/editor/contrib/
 import { getInputBoxStyle, defaultToggleStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
+import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
+import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 var SearchEditor_1;
 const RESULT_LINE_REGEX = /^(\s+)(\d+)(: |  )(\s*)(.*)$/;
@@ -56,8 +68,8 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
     static { this.ID = SearchEditorID; }
     static { this.SEARCH_EDITOR_VIEW_STATE_PREFERENCE_KEY = 'searchEditorViewState'; }
     get searchResultEditor() { return this.editorControl; }
-    constructor(telemetryService, themeService, storageService, modelService, contextService, labelService, instantiationService, contextViewService, commandService, openerService, notificationService, progressService, textResourceService, editorGroupService, editorService, configurationService, fileService, logService) {
-        super(SearchEditor_1.ID, telemetryService, instantiationService, storageService, textResourceService, themeService, editorService, editorGroupService, fileService);
+    constructor(group, telemetryService, themeService, storageService, modelService, contextService, labelService, instantiationService, contextViewService, commandService, openerService, notificationService, progressService, textResourceService, editorGroupService, editorService, configurationService, fileService, logService) {
+        super(SearchEditor_1.ID, group, telemetryService, instantiationService, storageService, textResourceService, themeService, editorService, editorGroupService, fileService);
         this.modelService = modelService;
         this.contextService = contextService;
         this.labelService = labelService;
@@ -102,11 +114,12 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
         }
         this._register(this.queryEditorWidget.onDidToggleContext(() => this.triggerSearch({ resetCursor: false })));
         this.includesExcludesContainer = append(container, $('.includes-excludes'));
-        this.toggleQueryDetailsButton = append(this.includesExcludesContainer, $('.expand' + ThemeIcon.asCSSSelector(searchDetailsIcon), { tabindex: 0, role: 'button', title: ( localizeWithPath(
+        this.toggleQueryDetailsButton = append(this.includesExcludesContainer, $('.expand' + ThemeIcon.asCSSSelector(searchDetailsIcon), { tabindex: 0, role: 'button' }));
+        this._register(setupCustomHover(getDefaultHoverDelegate('element'), this.toggleQueryDetailsButton, ( localizeWithPath(
             'vs/workbench/contrib/searchEditor/browser/searchEditor',
             'moreSearch',
             "Toggle Search Details"
-        )) }));
+        ))));
         this._register(addDisposableListener(this.toggleQueryDetailsButton, EventType.CLICK, e => {
             EventHelper.stop(e);
             this.toggleIncludesExcludes();
@@ -198,7 +211,18 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
     }
     registerEditorListeners() {
         this.searchResultEditor.onMouseUp(e => {
-            if (e.event.detail === 2) {
+            if (e.event.detail === 1) {
+                const behaviour = this.searchConfig.searchEditor.singleClickBehaviour;
+                const position = e.target.position;
+                if (position && behaviour === 'peekDefinition') {
+                    const line = this.searchResultEditor.getModel()?.getLineContent(position.lineNumber) ?? '';
+                    if (line.match(FILE_LINE_REGEX) || line.match(RESULT_LINE_REGEX)) {
+                        this.searchResultEditor.setSelection(Range.fromPositions(position));
+                        this.commandService.executeCommand('editor.action.peekDefinition');
+                    }
+                }
+            }
+            else if (e.event.detail === 2) {
                 const behaviour = this.searchConfig.searchEditor.doubleClickBehaviour;
                 const position = e.target.position;
                 if (position && behaviour !== 'selectWord') {
@@ -573,7 +597,7 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
         }
     }
     getInput() {
-        return this._input;
+        return this.input;
     }
     setSearchConfig(config) {
         this.priorConfig = config;
@@ -689,24 +713,24 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
     }
 };
 SearchEditor = SearchEditor_1 = ( __decorate([
-    ( __param(0, ITelemetryService)),
-    ( __param(1, IThemeService)),
-    ( __param(2, IStorageService)),
-    ( __param(3, IModelService)),
-    ( __param(4, IWorkspaceContextService)),
-    ( __param(5, ILabelService)),
-    ( __param(6, IInstantiationService)),
-    ( __param(7, IContextViewService)),
-    ( __param(8, ICommandService)),
-    ( __param(9, IOpenerService)),
-    ( __param(10, INotificationService)),
-    ( __param(11, IEditorProgressService)),
-    ( __param(12, ITextResourceConfigurationService)),
-    ( __param(13, IEditorGroupsService)),
-    ( __param(14, IEditorService)),
-    ( __param(15, IConfigurationService)),
-    ( __param(16, IFileService)),
-    ( __param(17, ILogService))
+    ( __param(1, ITelemetryService)),
+    ( __param(2, IThemeService)),
+    ( __param(3, IStorageService)),
+    ( __param(4, IModelService)),
+    ( __param(5, IWorkspaceContextService)),
+    ( __param(6, ILabelService)),
+    ( __param(7, IInstantiationService)),
+    ( __param(8, IContextViewService)),
+    ( __param(9, ICommandService)),
+    ( __param(10, IOpenerService)),
+    ( __param(11, INotificationService)),
+    ( __param(12, IEditorProgressService)),
+    ( __param(13, ITextResourceConfigurationService)),
+    ( __param(14, IEditorGroupsService)),
+    ( __param(15, IEditorService)),
+    ( __param(16, IConfigurationService)),
+    ( __param(17, IFileService)),
+    ( __param(18, ILogService))
 ], SearchEditor));
 const searchEditorTextInputBorder = registerColor('searchEditor.textInputBorder', { dark: inputBorder, light: inputBorder, hcDark: inputBorder, hcLight: inputBorder }, ( localizeWithPath(
     'vs/workbench/contrib/searchEditor/browser/searchEditor',

package/vscode/src/vs/workbench/services/search/common/searchService.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { coalesce, flatten, uniqueFilter } from 'vscode/vscode/vs/base/common/arrays';
-import { DeferredPromise } from 'vscode/vscode/vs/base/common/async';
+import { raceCancellationError, DeferredPromise } from 'vscode/vscode/vs/base/common/async';
 import { CancellationError } from 'vscode/vscode/vs/base/common/errors';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ResourceMap, ResourceSet } from 'vscode/vscode/vs/base/common/map';
@@ -30,8 +30,10 @@ let SearchService = class SearchService extends Disposable {
         this.uriIdentityService = uriIdentityService;
         this.fileSearchProviders = ( new Map());
         this.textSearchProviders = ( new Map());
+        this.aiTextSearchProviders = ( new Map());
         this.deferredFileSearchesByScheme = ( new Map());
         this.deferredTextSearchesByScheme = ( new Map());
+        this.deferredAITextSearchesByScheme = ( new Map());
         this.loggedSchemesMissingProviders = ( new Set());
     }
     registerSearchResultProvider(scheme, type, provider) {
@@ -45,6 +47,10 @@ let SearchService = class SearchService extends Disposable {
             list = this.textSearchProviders;
             deferredMap = this.deferredTextSearchesByScheme;
         }
+        else if (type === 2 ) {
+            list = this.aiTextSearchProviders;
+            deferredMap = this.deferredAITextSearchesByScheme;
+        }
         else {
             throw new Error('Unknown SearchProviderType');
         }
@@ -67,6 +73,22 @@ let SearchService = class SearchService extends Disposable {
             messages: [...otherResults.messages, ...openEditorResults.messages]
         };
     }
+    async aiTextSearch(query, token, onProgress) {
+        const onProviderProgress = (progress) => {
+            if (onProgress) {
+                if (isFileMatch(progress)) {
+                    onProgress(progress);
+                }
+                else {
+                    onProgress(progress);
+                }
+            }
+            if (isProgressMessage(progress)) {
+                this.logService.debug('SearchService#search', progress.message);
+            }
+        };
+        return this.doSearch(query, token, onProviderProgress);
+    }
     textSearchSplitSyncAsync(query, token, onProgress, notebookFilesToIgnore, asyncNotebookFilesToIgnore) {
         const openEditorResults = this.getOpenEditorResults(query);
         if (onProgress) {
@@ -138,14 +160,7 @@ let SearchService = class SearchService extends Disposable {
                 results: flatten(( completes.map((c) => c.results)))
             };
         })();
-        return ( new Promise((resolve, reject) => {
-            if (token) {
-                token.onCancellationRequested(() => {
-                    reject(( new CancellationError()));
-                });
-            }
-            providerPromise.then(resolve, reject);
-        }));
+        return token ? raceCancellationError(providerPromise, token) : providerPromise;
     }
     getSchemesInQuery(query) {
         const schemes = ( new Set());
@@ -154,9 +169,7 @@ let SearchService = class SearchService extends Disposable {
         return schemes;
     }
     async waitForProvider(queryType, scheme) {
-        const deferredMap = queryType === 1  ?
-            this.deferredFileSearchesByScheme :
-            this.deferredTextSearchesByScheme;
+        const deferredMap = this.getDeferredTextSearchesByScheme(queryType);
         if (( deferredMap.has(scheme))) {
             return deferredMap.get(scheme).p;
         }
@@ -166,20 +179,43 @@ let SearchService = class SearchService extends Disposable {
             return deferred.p;
         }
     }
+    getSearchProvider(type) {
+        switch (type) {
+            case 1 :
+                return this.fileSearchProviders;
+            case 2 :
+                return this.textSearchProviders;
+            case 3 :
+                return this.aiTextSearchProviders;
+            default:
+                throw new Error(`Unknown query type: ${type}`);
+        }
+    }
+    getDeferredTextSearchesByScheme(type) {
+        switch (type) {
+            case 1 :
+                return this.deferredFileSearchesByScheme;
+            case 2 :
+                return this.deferredTextSearchesByScheme;
+            case 3 :
+                return this.deferredAITextSearchesByScheme;
+            default:
+                throw new Error(`Unknown query type: ${type}`);
+        }
+    }
     async searchWithProviders(query, onProviderProgress, token) {
         const e2eSW = StopWatch.create(false);
         const searchPs = [];
         const fqs = this.groupFolderQueriesByScheme(query);
         const someSchemeHasProvider = ( [...( fqs.keys())].some(scheme => {
-            return query.type === 1  ?
-                ( this.fileSearchProviders.has(scheme)) :
-                ( this.textSearchProviders.has(scheme));
+            return ( this.getSearchProvider(query.type).has(scheme));
         }));
+        if (query.type === 3  && !someSchemeHasProvider) {
+            return [];
+        }
         await Promise.all(( [...( fqs.keys())].map(async (scheme) => {
             const schemeFQs = fqs.get(scheme);
-            let provider = query.type === 1  ?
-                this.fileSearchProviders.get(scheme) :
-                this.textSearchProviders.get(scheme);
+            let provider = this.getSearchProvider(query.type).get(scheme);
             if (!provider) {
                 if (someSchemeHasProvider) {
                     if (!( this.loggedSchemesMissingProviders.has(scheme))) {
@@ -202,9 +238,17 @@ let SearchService = class SearchService extends Disposable {
                     folderQueries: schemeFQs
                 }
             };
-            searchPs.push(query.type === 1  ?
-                provider.fileSearch(oneSchemeQuery, token) :
-                provider.textSearch(oneSchemeQuery, onProviderProgress, token));
+            const doProviderSearch = () => {
+                switch (query.type) {
+                    case 1 :
+                        return provider.fileSearch(oneSchemeQuery, token);
+                    case 2 :
+                        return provider.textSearch(oneSchemeQuery, onProviderProgress, token);
+                    default:
+                        return provider.textSearch(oneSchemeQuery, onProviderProgress, token);
+                }
+            };
+            searchPs.push(doProviderSearch());
         })));
         return Promise.all(searchPs).then(completes => {
             const endToEndTime = e2eSW.elapsed();