@codingame/monaco-vscode-search-service-override 2.0.3 → 2.1.0

package/package.json

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

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

@@ -34,10 +34,10 @@ 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 { 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';
-import { getIEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
@@ -99,9 +99,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
         this.pickState = new (class {
             constructor(provider, editorService) {
                 this.provider = provider;
-                this.editorService = editorService;
                 this.picker = undefined;
-                this.editorViewState = undefined;
                 this.scorerCache = Object.create(null);
                 this.fileQueryCache = undefined;
                 this.lastOriginalFilter = undefined;
@@ -109,6 +107,7 @@ 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;
@@ -127,29 +126,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
                 this.lastFilter = undefined;
                 this.lastRange = undefined;
                 this.lastGlobalPicks = undefined;
-                this.editorViewState = undefined;
-            }
-            rememberEditorViewState() {
-                if (this.editorViewState) {
-                    return;
-                }
-                const activeEditorPane = this.editorService.activeEditorPane;
-                if (activeEditorPane) {
-                    this.editorViewState = {
-                        group: activeEditorPane.group,
-                        editor: activeEditorPane.input,
-                        state: getIEditor(activeEditorPane.getControl())?.saveViewState() ?? undefined,
-                    };
-                }
-            }
-            async restoreEditorViewState() {
-                if (this.editorViewState) {
-                    const options = {
-                        viewState: this.editorViewState.state,
-                        preserveFocus: true
-                    };
-                    await this.editorViewState.group.openEditor(this.editorViewState.editor, options);
-                }
+                this.editorViewState.reset();
             }
         })(this, this.editorService);
         this.labelOnlyEditorHistoryPickAccessor = ( new QuickPickItemScorerAccessor({ skipDescription: true }));
@@ -169,7 +146,6 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
             includeSymbols: searchConfig?.quickOpen.includeSymbols,
             includeHistory: searchConfig?.quickOpen.includeHistory,
             historyFilterSortOrder: searchConfig?.quickOpen.history.filterSortOrder,
-            shortAutoSaveDelay: this.filesConfigurationService.getAutoSaveMode() === 1 ,
             preserveInput: quickAccessConfig.preserveInput
         };
     }
@@ -186,7 +162,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
         }));
         disposables.add(Event.once(picker.onDidHide)(({ reason }) => {
             if (reason === QuickInputHideReason.Gesture) {
-                this.pickState.restoreEditorViewState();
+                this.pickState.editorViewState.restore();
             }
         }));
         disposables.add(super.provide(picker, token, runOptions));
@@ -201,7 +177,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
         if (!activeEditorControl) {
             return Disposable.None;
         }
-        this.pickState.rememberEditorViewState();
+        this.pickState.editorViewState.set();
         activeEditorControl.revealRangeInCenter(pick.range.selection, 0 );
         this.addDecorations(activeEditorControl, pick.range.decoration);
         return toDisposable(() => this.clearDecorations(activeEditorControl));
@@ -605,7 +581,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
     }
     async doGetEditorSymbolPicks(activeGlobalPick, activeGlobalResource, filter, disposables, token) {
         try {
-            this.pickState.rememberEditorViewState();
+            this.pickState.editorViewState.set();
             await this.editorService.openEditor({
                 resource: activeGlobalResource,
                 options: { preserveFocus: true, revealIfOpened: true, ignoreError: true }
@@ -663,23 +639,25 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
         let description = undefined;
         let isDirty = undefined;
         let extraClasses;
+        let icon = undefined;
         if (isEditorInput(resourceOrEditor)) {
             resource = EditorResourceAccessor.getOriginalUri(resourceOrEditor);
             label = resourceOrEditor.getName();
             description = resourceOrEditor.getDescription();
             isDirty = resourceOrEditor.isDirty() && !resourceOrEditor.isSaving();
             extraClasses = resourceOrEditor.getLabelExtraClasses();
+            icon = resourceOrEditor.getIcon();
         }
         else {
             resource = URI.isUri(resourceOrEditor) ? resourceOrEditor : resourceOrEditor.resource;
             label = basenameOrAuthority(resource);
             description = this.labelService.getUriLabel(dirname(resource), { relative: true });
-            isDirty = this.workingCopyService.isDirty(resource) && !configuration.shortAutoSaveDelay;
+            isDirty = this.workingCopyService.isDirty(resource) && !this.filesConfigurationService.hasShortAutoSaveDelay(resource);
             extraClasses = [];
         }
         const labelAndDescription = description ? `${label} ${description}` : label;
         const iconClassesValue = ( new Lazy(
-            () => getIconClasses(this.modelService, this.languageService, resource).concat(extraClasses)
+            () => getIconClasses(this.modelService, this.languageService, resource, undefined, icon).concat(extraClasses)
         ));
         const buttonsValue = ( new Lazy(() => {
             const openSideBySideDirection = configuration.openSideBySideDirection;
@@ -747,7 +725,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
         };
         const targetGroup = options.keyMods?.alt || (this.configuration.openEditorPinned && options.keyMods?.ctrlCmd) || options.forceOpenSideBySide ? SIDE_GROUP : ACTIVE_GROUP;
         if (targetGroup === SIDE_GROUP) {
-            await this.pickState.restoreEditorViewState();
+            await this.pickState.editorViewState.restore();
         }
         if (isEditorInput(resourceOrEditor)) {
             await this.editorService.openEditor(resourceOrEditor, editorOptions, targetGroup);

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

@@ -1,4 +1,5 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
+import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ResourceSet } from 'vscode/vscode/vs/base/common/map';
 import { basenameOrAuthority, dirname } from 'vscode/vscode/vs/base/common/resources';
@@ -8,17 +9,20 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
 import { getSelectionKeyboardEvent } from 'vscode/vscode/vs/platform/list/browser/listService';
-import { PickerQuickAccessProvider } from 'vscode/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
+import { PickerQuickAccessProvider, TriggerAction } from 'vscode/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
 import { DefaultQuickAccessFilterValue } from 'vscode/vscode/vs/platform/quickinput/common/quickAccess';
+import { QuickInputHideReason } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
-import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
-import { searchDetailsIcon, searchOpenInFileIcon } from '../searchIcons.js';
-import { SearchModel, searchComparer } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
+import { searchDetailsIcon, searchOpenInFileIcon, searchActivityBarIcon } from '../searchIcons.js';
+import { SearchModel, SearchModelLocation, searchComparer } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
 import { getEditorSelectionFromMatch } from '../searchView.js';
 import { getOutOfWorkspaceEditorResources } from 'vscode/vscode/vs/workbench/contrib/search/common/search';
 import { SIDE_GROUP, ACTIVE_GROUP, IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 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 { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
 
 const TEXT_SEARCH_QUICK_ACCESS_PREFIX = '%';
 const DEFAULT_TEXT_QUERY_BUILDER_OPTIONS = {
@@ -46,15 +50,21 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
         };
     }
     constructor(_instantiationService, _contextService, _editorService, _labelService, _viewsService, _configurationService) {
-        super(TEXT_SEARCH_QUICK_ACCESS_PREFIX, { canAcceptInBackground: true });
+        super(TEXT_SEARCH_QUICK_ACCESS_PREFIX, { canAcceptInBackground: true, shouldSkipTrimPickFilter: true });
         this._instantiationService = _instantiationService;
         this._contextService = _contextService;
         this._editorService = _editorService;
         this._labelService = _labelService;
         this._viewsService = _viewsService;
         this._configurationService = _configurationService;
+        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.location = SearchModelLocation.QUICK_ACCESS;
     }
     dispose() {
         this.searchModel.dispose();
@@ -65,8 +75,35 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
         if (TEXT_SEARCH_QUICK_ACCESS_PREFIX.length < picker.value.length) {
             picker.valueSelection = [TEXT_SEARCH_QUICK_ACCESS_PREFIX.length, picker.value.length];
         }
+        picker.customButton = true;
+        picker.customLabel = '$(link-external)';
+        this.editorViewState.reset();
+        disposables.add(picker.onDidCustom(() => {
+            if (this.searchModel.searchResult.count() > 0) {
+                this.moveToSearchViewlet(undefined);
+            }
+            else {
+                this._viewsService.openView(VIEW_ID, true);
+            }
+            picker.hide();
+        }));
+        disposables.add(picker.onDidChangeActive(() => {
+            const [item] = picker.activeItems;
+            if (item?.match) {
+                this.editorViewState.set();
+                this._editorService.openEditor({
+                    resource: item.match.parent().resource,
+                    options: { preserveFocus: true, revealIfOpened: true, ignoreError: true, selection: item.match.range() }
+                });
+            }
+        }));
+        disposables.add(Event.once(picker.onDidHide)(({ reason }) => {
+            if (reason === QuickInputHideReason.Gesture) {
+                this.editorViewState.restore();
+            }
+            this.searchModel.searchResult.toggleHighlights(false);
+        }));
         disposables.add(super.provide(picker, token, runOptions));
-        disposables.add(picker.onDidHide(() => this.searchModel.searchResult.toggleHighlights(false)));
         disposables.add(picker.onDidAccept(() => this.searchModel.searchResult.toggleHighlights(false)));
         return disposables;
     }
@@ -94,10 +131,12 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
         const content = {
             pattern: contentPattern,
         };
+        this.searchModel.searchResult.toggleHighlights(false);
         const charsPerLine = content.isRegExp ? 10000 : 1000;
         const query = this.queryBuilder.text(content, ( folderResources.map(folder => folder.uri)), this._getTextQueryBuilderOptions(charsPerLine));
         const result = this.searchModel.search(query, undefined, token);
         const getAsyncResults = async () => {
+            this.currentAsyncSearch = result.asyncResults;
             await result.asyncResults;
             const syncResultURIs = ( new ResourceSet(( result.syncResults.map(e => e.resource))));
             return this.searchModel.searchResult.matches().filter(e => !( syncResultURIs.has(e.resource)));
@@ -107,14 +146,21 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
             asyncResults: getAsyncResults()
         };
     }
-    moveToSearchViewlet(model, currentElem) {
+    moveToSearchViewlet(currentElem) {
         this._viewsService.openView(VIEW_ID, false);
         const viewlet = this._viewsService.getActiveViewWithId(VIEW_ID);
-        viewlet.importSearchResult(model);
+        viewlet.replaceSearchModel(this.searchModel, this.currentAsyncSearch);
+        this.searchModel = this._instantiationService.createInstance(SearchModel);
+        this.searchModel.location = SearchModelLocation.QUICK_ACCESS;
         const viewer = viewlet?.getControl();
-        viewer.setFocus([currentElem], getSelectionKeyboardEvent());
-        viewer.setSelection([currentElem], getSelectionKeyboardEvent());
-        viewer.reveal(currentElem);
+        if (currentElem) {
+            viewer.setFocus([currentElem], getSelectionKeyboardEvent());
+            viewer.setSelection([currentElem], getSelectionKeyboardEvent());
+            viewer.reveal(currentElem);
+        }
+        else {
+            viewlet.searchAndReplaceWidget.focus();
+        }
     }
     _getPicksFromMatches(matches, limit) {
         matches = matches.sort(searchComparer);
@@ -133,7 +179,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                     )),
                     iconClass: ThemeIcon.asClassName(searchDetailsIcon),
                     accept: async () => {
-                        this.moveToSearchViewlet(this.searchModel, matches[limit]);
+                        this.moveToSearchViewlet(matches[limit]);
                     }
                 });
                 break;
@@ -166,7 +212,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                         )),
                         iconClass: ThemeIcon.asClassName(searchDetailsIcon),
                         accept: async () => {
-                            this.moveToSearchViewlet(this.searchModel, element);
+                            this.moveToSearchViewlet(element);
                         }
                     });
                     break;
@@ -182,6 +228,14 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                     highlights: {
                         label: match
                     },
+                    buttons: [{
+                            iconClass: ThemeIcon.asClassName(searchActivityBarIcon),
+                            tooltip: ( localizeWithPath(
+                                'vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess',
+                                'showMore',
+                                "See in Search Panel"
+                            )),
+                        }],
                     ariaLabel: `Match at location ${element.range().startLineNumber}:${element.range().startColumn} - ${previewText}`,
                     accept: async (keyMods, event) => {
                         await this.handleAccept(fileMatch, {
@@ -190,7 +244,12 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                             preserveFocus: event.inBackground,
                             forcePinned: event.inBackground
                         });
-                    }
+                    },
+                    trigger: () => {
+                        this.moveToSearchViewlet(element);
+                        return TriggerAction.CLOSE_PICKER;
+                    },
+                    match: element
                 });
             }
         }
@@ -209,11 +268,24 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
         }, targetGroup);
     }
     _getPicks(contentPattern, disposables, token) {
+        const searchModelAtTimeOfSearch = this.searchModel;
         if (contentPattern === '') {
             this.searchModel.searchResult.clear();
-            return [];
+            return [{
+                    label: ( localizeWithPath(
+                        'vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess',
+                        'enterSearchTerm',
+                        "Enter a term to search for across your files."
+                    ))
+                }];
         }
-        const allMatches = this.doSearch(contentPattern, token);
+        const conditionalTokenCts = disposables.add(( new CancellationTokenSource()));
+        disposables.add(token.onCancellationRequested(() => {
+            if (searchModelAtTimeOfSearch.location === SearchModelLocation.QUICK_ACCESS) {
+                conditionalTokenCts.cancel();
+            }
+        }));
+        const allMatches = this.doSearch(contentPattern, conditionalTokenCts.token);
         if (!allMatches) {
             return null;
         }

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

@@ -1,7 +1,7 @@
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
-import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
 import { CopyMatchCommandId, FileMatchOrMatchFocusKey, CopyPathCommandId, FileMatchOrFolderMatchWithResourceFocusKey, CopyAllCommandId, HasSearchResults } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { FileMatch, FolderMatchWithResource, Match, FolderMatch, searchMatchComparer } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';

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

@@ -1,7 +1,7 @@
 import { isMacintosh } from 'vscode/vscode/vs/base/common/platform';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
 import { ToggleQueryDetailsActionId, SearchViewFocusedKey, CloseReplaceWidgetActionId, SearchViewVisibleKey, ReplaceInputBoxFocusedKey, ToggleCaseSensitiveCommandId, FileMatchOrFolderMatchFocusKey, ToggleWholeWordCommandId, ToggleRegexCommandId, TogglePreserveCaseId, OpenMatch, FileMatchOrMatchFocusKey, OpenMatchToSide, AddCursorsAtSearchResults, FocusNextInputActionId, InputBoxFocusedKey, FocusPreviousInputActionId, SearchInputBoxFocusedKey, FocusSearchFromResults, FirstMatchFocusKey, ToggleSearchOnTypeActionId, FocusSearchListCommandID, FocusNextSearchResultActionId, HasSearchResults, FocusPreviousSearchResultActionId, ReplaceInFilesActionId } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { InSearchEditor } from 'vscode/vscode/vs/workbench/contrib/searchEditor/browser/constants';
 import { FolderMatch } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';

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

@@ -1,7 +1,7 @@
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { getSelectionKeyboardEvent } from 'vscode/vscode/vs/platform/list/browser/listService';
-import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
 import { searchRemoveIcon, searchReplaceIcon } from './searchIcons.js';
 import { RemoveActionId, SearchViewVisibleKey, FileMatchOrMatchFocusKey, ReplaceActionId, ReplaceActiveKey, MatchFocusKey, IsEditableItemKey, ReplaceAllInFileActionId, FileFocusKey, ReplaceAllInFolderActionId, FolderFocusKey } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { IReplaceService } from 'vscode/vscode/vs/workbench/contrib/search/browser/replace';

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

@@ -16,9 +16,9 @@ registerAction2(class TextSearchQuickAccessAction extends Action2 {
                 value: ( localizeWithPath(
                     'vs/workbench/contrib/search/browser/searchActionsTextQuickAccess',
                     'quickTextSearch',
-                    "Quick Text Search (Experimental)"
+                    "Quick Search (Experimental)"
                 )),
-                original: 'Quick Text Search (Experimental)'
+                original: 'Quick Search (Experimental)'
             },
             category,
             f1: true

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

@@ -1,6 +1,6 @@
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { WorkbenchListFocusContextKey } from 'vscode/vscode/vs/platform/list/browser/listService';
-import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
 import { searchStopIcon, searchRefreshIcon, searchCollapseAllIcon, searchExpandAllIcon, searchClearIcon, searchShowAsList, searchShowAsTree } from './searchIcons.js';
 import { ClearSearchHistoryCommandId, CancelSearchActionId, SearchViewVisibleKey, RefreshSearchResultsActionId, ViewHasSearchPatternKey, CollapseSearchResultsActionId, HasSearchResults, ViewHasSomeCollapsibleKey, ExpandSearchResultsActionId, ClearSearchResultsActionId, ViewHasReplacePatternKey, ViewHasFilePatternKey, ViewAsTreeActionId, InTreeViewKey, ViewAsListActionId } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { ISearchHistoryService } from 'vscode/vscode/vs/workbench/contrib/search/common/searchHistoryService';

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

@@ -7,6 +7,11 @@ const searchDetailsIcon = registerIcon('search-details', Codicon.ellipsis, ( loc
  'searchDetailsIcon',
  'Icon to make search details visible.'
 )));
+const searchActivityBarIcon = registerIcon('search-see-more', Codicon.linkExternal, ( localizeWithPath(
+ 'vs/workbench/contrib/search/browser/searchIcons',
+ 'searchSeeMoreIcon',
+ 'Icon to view more context in the search view.'
+)));
 const searchShowContextIcon = registerIcon('search-show-context', Codicon.listSelection, ( localizeWithPath(
  'vs/workbench/contrib/search/browser/searchIcons',
  'searchShowContextIcon',
@@ -88,4 +93,4 @@ const searchOpenInFileIcon = registerIcon('search-open-in-file', Codicon.goToFil
  'Icon for the action to go to the file of the current search result.'
 )));
 
-export { searchClearIcon, searchCollapseAllIcon, searchDetailsIcon, searchExpandAllIcon, searchHideReplaceIcon, searchNewEditorIcon, searchOpenInFileIcon, searchRefreshIcon, searchRemoveIcon, searchReplaceAllIcon, searchReplaceIcon, searchShowAsList, searchShowAsTree, searchShowContextIcon, searchShowReplaceIcon, searchStopIcon, searchViewIcon };
+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/searchResultsView.js

@@ -254,9 +254,8 @@ FileMatchRenderer = FileMatchRenderer_1 = ( __decorate([
 let MatchRenderer = class MatchRenderer extends Disposable {
     static { MatchRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'match'; }
-    constructor(searchModel, searchView, contextService, configurationService, instantiationService, contextKeyService) {
+    constructor(searchView, contextService, configurationService, instantiationService, contextKeyService) {
         super();
-        this.searchModel = searchModel;
         this.searchView = searchView;
         this.contextService = contextService;
         this.configurationService = configurationService;
@@ -306,15 +305,15 @@ let MatchRenderer = class MatchRenderer extends Disposable {
     renderElement(node, index, templateData) {
         const match = node.element;
         const preview = match.preview();
-        const replace = this.searchModel.isReplaceActive() &&
-            !!this.searchModel.replaceString &&
+        const replace = this.searchView.model.isReplaceActive() &&
+            !!this.searchView.model.replaceString &&
             !(match instanceof MatchInNotebook && match.isReadonly());
         templateData.before.textContent = preview.before;
         templateData.match.textContent = preview.inside;
         templateData.match.classList.toggle('replace', replace);
         templateData.replace.textContent = replace ? match.replaceString : '';
         templateData.after.textContent = preview.after;
-        templateData.parent.title = (preview.before + (replace ? match.replaceString : preview.inside) + preview.after).trim().substr(0, 999);
+        templateData.parent.title = (preview.fullBefore + (replace ? match.replaceString : preview.inside) + preview.after).trim().substr(0, 999);
         IsEditableItemKey.bindTo(templateData.contextKeyService).set(!(match instanceof MatchInNotebook && match.isReadonly()));
         const numLines = match.range().endLineNumber - match.range().startLineNumber;
         const extraLinesStr = numLines > 0 ? `+${numLines}` : '';
@@ -352,14 +351,14 @@ let MatchRenderer = class MatchRenderer extends Disposable {
     }
 };
 MatchRenderer = MatchRenderer_1 = ( __decorate([
-    ( __param(2, IWorkspaceContextService)),
-    ( __param(3, IConfigurationService)),
-    ( __param(4, IInstantiationService)),
-    ( __param(5, IContextKeyService))
+    ( __param(1, IWorkspaceContextService)),
+    ( __param(2, IConfigurationService)),
+    ( __param(3, IInstantiationService)),
+    ( __param(4, IContextKeyService))
 ], MatchRenderer));
 let SearchAccessibilityProvider = class SearchAccessibilityProvider {
-    constructor(searchModel, labelService) {
-        this.searchModel = searchModel;
+    constructor(searchView, labelService) {
+        this.searchView = searchView;
         this.labelService = labelService;
     }
     getWidgetAriaLabel() {
@@ -400,7 +399,7 @@ let SearchAccessibilityProvider = class SearchAccessibilityProvider {
         }
         if (element instanceof Match) {
             const match = element;
-            const searchModel = this.searchModel;
+            const searchModel = this.searchView.model;
             const replace = searchModel.isReplaceActive() && !!searchModel.replaceString;
             const matchString = match.getMatchString();
             const range = match.range();

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

@@ -4,7 +4,7 @@ import { StandardKeyboardEvent } from 'vscode/vscode/vs/base/browser/keyboardEve
 import { status } from 'vscode/vscode/vs/base/browser/ui/aria/aria';
 import { ObjectTreeElementCollapseState } from 'vscode/vscode/vs/base/browser/ui/tree/tree';
 import { Delayer, RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
-import { onUnexpectedError, isCancellationError } from 'vscode/vscode/vs/base/common/errors';
+import { isCancellationError, onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 import { DisposableStore, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -20,7 +20,7 @@ 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';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { IAccessibilityService, IAccessibleNotificationService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
+import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
 import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
@@ -58,7 +58,7 @@ import { SearchViewVisibleKey, FirstMatchFocusKey, FileMatchOrMatchFocusKey, Fil
 import { IReplaceService } from 'vscode/vscode/vs/workbench/contrib/search/browser/replace';
 import { SearchStateKey, SearchUIState, getOutOfWorkspaceEditorResources } from 'vscode/vscode/vs/workbench/contrib/search/common/search';
 import { SearchHistoryService, ISearchHistoryService } from 'vscode/vscode/vs/workbench/contrib/search/common/searchHistoryService';
-import { searchMatchComparer, FileMatch, SearchResult, FolderMatch, Match, FolderMatchWithResource, MatchInNotebook, ISearchViewModelWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
+import { SearchModelLocation, searchMatchComparer, FileMatch, SearchResult, FolderMatch, Match, FolderMatchWithResource, MatchInNotebook, ISearchViewModelWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
 import { createEditorFromSearchResult } from '../../searchEditor/browser/searchEditorActions.js';
 import { SIDE_GROUP, ACTIVE_GROUP, IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/preferences/common/preferences';
@@ -67,6 +67,7 @@ import 'vscode/vscode/vs/workbench/services/search/common/search';
 import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { AudioCue, IAudioCueService } from 'vscode/vscode/vs/platform/audioCues/browser/audioCueService';
 import { TextSearchCompleteMessageType } from 'vscode/vscode/vs/workbench/services/search/common/searchExtTypes';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
@@ -81,7 +82,7 @@ const DEBOUNCE_DELAY = 75;
 let SearchView = class SearchView extends ViewPane {
     static { SearchView_1 = this; }
     static { this.ACTIONS_RIGHT_CLASS_NAME = 'actions-right'; }
-    constructor(options, fileService, editorService, codeEditorService, progressService, notificationService, dialogService, commandService, contextViewService, instantiationService, viewDescriptorService, configurationService, contextService, searchViewModelWorkbenchService, contextKeyService, replaceService, textFileService, preferencesService, themeService, searchHistoryService, contextMenuService, accessibilityService, keybindingService, storageService, openerService, telemetryService, notebookService, logService, accessibleNotificationService) {
+    constructor(options, fileService, editorService, codeEditorService, progressService, notificationService, dialogService, commandService, contextViewService, instantiationService, viewDescriptorService, configurationService, contextService, searchViewModelWorkbenchService, contextKeyService, replaceService, textFileService, preferencesService, themeService, searchHistoryService, contextMenuService, accessibilityService, keybindingService, storageService, openerService, telemetryService, notebookService, logService, audioCueService) {
         super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
         this.fileService = fileService;
         this.editorService = editorService;
@@ -101,7 +102,7 @@ let SearchView = class SearchView extends ViewPane {
         this.storageService = storageService;
         this.notebookService = notebookService;
         this.logService = logService;
-        this.accessibleNotificationService = accessibleNotificationService;
+        this.audioCueService = audioCueService;
         this.isDisposed = false;
         this.lastFocusState = 'input';
         this.messageDisposables = ( new DisposableStore());
@@ -154,7 +155,7 @@ let SearchView = class SearchView extends ViewPane {
         this.addToSearchHistoryDelayer = this._register(( new Delayer(2000)));
         this.toggleCollapseStateDelayer = this._register(( new Delayer(100)));
         this.triggerQueryDelayer = this._register(( new Delayer(0)));
-        this.treeAccessibilityProvider = this.instantiationService.createInstance(SearchAccessibilityProvider, this.viewModel);
+        this.treeAccessibilityProvider = this.instantiationService.createInstance(SearchAccessibilityProvider, this);
         this.isTreeLayoutViewVisible = this.viewletState['view.treeLayout'] ?? ((this.searchConfig.defaultViewMode === "tree") );
         this._refreshResultsScheduler = this._register(( new RunOnceScheduler(this._updateResults.bind(this), 80)));
         this._register(this.storageService.onWillSaveState(() => {
@@ -202,6 +203,9 @@ let SearchView = class SearchView extends ViewPane {
     get searchResult() {
         return this.viewModel && this.viewModel.searchResult;
     }
+    get model() {
+        return this.viewModel;
+    }
     onDidChangeWorkbenchState() {
         if (this.contextService.getWorkbenchState() !== 1  && this.searchWithoutFolderMessageElement) {
             hide(this.searchWithoutFolderMessageElement);
@@ -218,10 +222,31 @@ let SearchView = class SearchView extends ViewPane {
         this.searchExcludePattern.setValue('');
         this.pauseSearching = false;
     }
-    async importSearchResult(searchModel) {
-        searchModel.transferSearchResult(this.viewModel);
+    async replaceSearchModel(searchModel, asyncResults) {
+        let progressComplete;
+        this.progressService.withProgress({ location: this.getProgressLocation(), delay: 0 }, _progress => {
+            return ( new Promise(resolve => progressComplete = resolve));
+        });
+        const slowTimer = setTimeout(() => {
+            this.state = SearchUIState.SlowSearch;
+        }, 2000);
+        this._refreshResultsScheduler.schedule();
+        searchModel.location = SearchModelLocation.PANEL;
+        searchModel.replaceActive = this.viewModel.isReplaceActive();
+        searchModel.replaceString = this.searchWidget.getReplaceValue();
+        this._onSearchResultChangedDisposable?.dispose();
+        this._onSearchResultChangedDisposable = this._register(searchModel.onSearchResultChanged((event) => this.onSearchResultsChanged(event)));
+        this.searchViewModelWorkbenchService.searchModel = searchModel;
+        this.viewModel = searchModel;
         this.onSearchResultsChanged();
         this.refreshInputs();
+        asyncResults.then((complete) => {
+            clearTimeout(slowTimer);
+            this.onSearchComplete(progressComplete, undefined, undefined, complete);
+        }, (e) => {
+            clearTimeout(slowTimer);
+            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];
@@ -338,7 +363,7 @@ let SearchView = class SearchView extends ViewPane {
         if (filePatterns !== '' || patternExclusions !== '' || patternIncludes !== '' || queryDetailsExpanded !== '' || !useExcludesAndIgnoreFiles) {
             this.toggleQueryDetails(true, true, true);
         }
-        this._register(this.viewModel.onSearchResultChanged((event) => this.onSearchResultsChanged(event)));
+        this._onSearchResultChangedDisposable = this._register(this.viewModel.onSearchResultChanged((event) => this.onSearchResultsChanged(event)));
         this._register(this.onDidChangeBodyVisibility(visible => this.onVisibilityChanged(visible)));
         this.updateIndentStyles(this.themeService.getFileIconTheme());
         this._register(this.themeService.onDidFileIconThemeChange(this.updateIndentStyles, this));
@@ -756,7 +781,7 @@ let SearchView = class SearchView extends ViewPane {
         this.tree = this._register(this.instantiationService.createInstance(WorkbenchCompressibleObjectTree, 'SearchView', this.resultsElement, delegate, [
             this._register(this.instantiationService.createInstance(FolderMatchRenderer, this, this.treeLabels)),
             this._register(this.instantiationService.createInstance(FileMatchRenderer, this, this.treeLabels)),
-            this._register(this.instantiationService.createInstance(MatchRenderer, this.viewModel, this)),
+            this._register(this.instantiationService.createInstance(MatchRenderer, this)),
         ], {
             identityProvider,
             accessibilityProvider: this.treeAccessibilityProvider,
@@ -779,7 +804,6 @@ let SearchView = class SearchView extends ViewPane {
         this._register(this.tree.onContextMenu(e => this.onContextMenu(e)));
         const updateHasSomeCollapsible = () => this.toggleCollapseStateDelayer.trigger(() => this.hasSomeCollapsibleResultKey.set(this.hasSomeCollapsible()));
         updateHasSomeCollapsible();
-        this._register(this.viewModel.onSearchResultChanged(() => updateHasSomeCollapsible()));
         this._register(this.tree.onDidChangeCollapseState(() => updateHasSomeCollapsible()));
         this._register(Event.debounce(this.tree.onDidOpen, (last, event) => event, DEBOUNCE_DELAY, true)(options => {
             if (options.element instanceof Match) {
@@ -1102,7 +1126,7 @@ let SearchView = class SearchView extends ViewPane {
             'emptySearch',
             "Empty Search"
         ));
-        this.accessibleNotificationService.notify("clear" );
+        this.audioCueService.playAudioCue(AudioCue.clear);
         this.reLayout();
     }
     clearFilePatternFields() {
@@ -1379,194 +1403,198 @@ let SearchView = class SearchView extends ViewPane {
             this._refreshResultsScheduler.schedule();
         }
     }
-    doSearch(query, excludePatternText, includePatternText, triggeredOnType) {
-        let progressComplete;
-        this.progressService.withProgress({ location: this.getProgressLocation(), delay: triggeredOnType ? 300 : 0 }, _progress => {
-            return ( new Promise(resolve => progressComplete = resolve));
-        });
-        this.searchWidget.searchInput?.clearMessage();
-        this.state = SearchUIState.Searching;
-        this.showEmptyStage();
-        const slowTimer = setTimeout(() => {
-            this.state = SearchUIState.SlowSearch;
-        }, 2000);
-        const onComplete = (completed) => {
-            clearTimeout(slowTimer);
-            this.state = SearchUIState.Idle;
-            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 (onlyMatch.count() < 50) {
-                    this.tree.expand(onlyMatch);
-                }
+    onSearchComplete(progressComplete, excludePatternText, includePatternText, completed) {
+        this.state = SearchUIState.Idle;
+        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 (onlyMatch.count() < 50) {
+                this.tree.expand(onlyMatch);
             }
-            this.viewModel.replaceString = this.searchWidget.getReplaceValue();
-            const hasResults = !this.viewModel.searchResult.isEmpty();
-            if (completed?.exit === 1 ) {
-                return;
+        }
+        const hasResults = !this.viewModel.searchResult.isEmpty();
+        if (completed?.exit === 1 ) {
+            return;
+        }
+        if (!hasResults) {
+            const hasExcludes = !!excludePatternText;
+            const hasIncludes = !!includePatternText;
+            let message;
+            if (!completed) {
+                message = SEARCH_CANCELLED_MESSAGE;
             }
-            if (!hasResults) {
-                const hasExcludes = !!excludePatternText;
-                const hasIncludes = !!includePatternText;
-                let message;
-                if (!completed) {
-                    message = SEARCH_CANCELLED_MESSAGE;
+            else if (this.inputPatternIncludes.onlySearchInOpenEditors()) {
+                if (hasIncludes && hasExcludes) {
+                    message = ( localizeWithPath(
+                        'vs/workbench/contrib/search/browser/searchView',
+                        'noOpenEditorResultsIncludesExcludes',
+                        "No results found in open editors matching '{0}' excluding '{1}' - ",
+                        includePatternText,
+                        excludePatternText
+                    ));
                 }
-                else if (this.inputPatternIncludes.onlySearchInOpenEditors()) {
-                    if (hasIncludes && hasExcludes) {
-                        message = ( localizeWithPath(
-                            'vs/workbench/contrib/search/browser/searchView',
-                            'noOpenEditorResultsIncludesExcludes',
-                            "No results found in open editors matching '{0}' excluding '{1}' - ",
-                            includePatternText,
-                            excludePatternText
-                        ));
-                    }
-                    else if (hasIncludes) {
-                        message = ( localizeWithPath(
-                            'vs/workbench/contrib/search/browser/searchView',
-                            'noOpenEditorResultsIncludes',
-                            "No results found in open editors matching '{0}' - ",
-                            includePatternText
-                        ));
-                    }
-                    else if (hasExcludes) {
-                        message = ( localizeWithPath(
-                            'vs/workbench/contrib/search/browser/searchView',
-                            'noOpenEditorResultsExcludes',
-                            "No results found in open editors excluding '{0}' - ",
-                            excludePatternText
-                        ));
-                    }
-                    else {
-                        message = ( localizeWithPath(
-                            'vs/workbench/contrib/search/browser/searchView',
-                            'noOpenEditorResultsFound',
-                            "No results found in open editors. Review your settings for configured exclusions and check your gitignore files - "
-                        ));
-                    }
+                else if (hasIncludes) {
+                    message = ( localizeWithPath(
+                        'vs/workbench/contrib/search/browser/searchView',
+                        'noOpenEditorResultsIncludes',
+                        "No results found in open editors matching '{0}' - ",
+                        includePatternText
+                    ));
                 }
-                else {
-                    if (hasIncludes && hasExcludes) {
-                        message = ( localizeWithPath(
-                            'vs/workbench/contrib/search/browser/searchView',
-                            'noResultsIncludesExcludes',
-                            "No results found in '{0}' excluding '{1}' - ",
-                            includePatternText,
-                            excludePatternText
-                        ));
-                    }
-                    else if (hasIncludes) {
-                        message = ( localizeWithPath(
-                            'vs/workbench/contrib/search/browser/searchView',
-                            'noResultsIncludes',
-                            "No results found in '{0}' - ",
-                            includePatternText
-                        ));
-                    }
-                    else if (hasExcludes) {
-                        message = ( localizeWithPath(
-                            'vs/workbench/contrib/search/browser/searchView',
-                            'noResultsExcludes',
-                            "No results found excluding '{0}' - ",
-                            excludePatternText
-                        ));
-                    }
-                    else {
-                        message = ( localizeWithPath(
-                            'vs/workbench/contrib/search/browser/searchView',
-                            'noResultsFound',
-                            "No results found. Review your settings for configured exclusions and check your gitignore files - "
-                        ));
-                    }
+                else if (hasExcludes) {
+                    message = ( localizeWithPath(
+                        'vs/workbench/contrib/search/browser/searchView',
+                        'noOpenEditorResultsExcludes',
+                        "No results found in open editors excluding '{0}' - ",
+                        excludePatternText
+                    ));
                 }
-                status(message);
-                const messageEl = this.clearMessage();
-                append(messageEl, message);
-                if (!completed) {
-                    const searchAgainButton = this.messageDisposables.add(( new SearchLinkButton(( localizeWithPath(
+                else {
+                    message = ( localizeWithPath(
                         'vs/workbench/contrib/search/browser/searchView',
-                        'rerunSearch.message',
-                        "Search again"
-                    )), () => this.triggerQueryChange({ preserveFocus: false }))));
-                    append(messageEl, searchAgainButton.element);
+                        'noOpenEditorResultsFound',
+                        "No results found in open editors. Review your settings for configured exclusions and check your gitignore files - "
+                    ));
                 }
-                else if (hasIncludes || hasExcludes) {
-                    const searchAgainButton = this.messageDisposables.add(( new SearchLinkButton(( localizeWithPath(
+            }
+            else {
+                if (hasIncludes && hasExcludes) {
+                    message = ( localizeWithPath(
                         'vs/workbench/contrib/search/browser/searchView',
-                        'rerunSearchInAll.message',
-                        "Search again in all files"
-                    )), this.onSearchAgain.bind(this))));
-                    append(messageEl, searchAgainButton.element);
+                        'noResultsIncludesExcludes',
+                        "No results found in '{0}' excluding '{1}' - ",
+                        includePatternText,
+                        excludePatternText
+                    ));
                 }
-                else {
-                    const openSettingsButton = this.messageDisposables.add(( new SearchLinkButton(( localizeWithPath(
+                else if (hasIncludes) {
+                    message = ( localizeWithPath(
                         'vs/workbench/contrib/search/browser/searchView',
-                        'openSettings.message',
-                        "Open Settings"
-                    )), this.onOpenSettings.bind(this))));
-                    append(messageEl, openSettingsButton.element);
+                        'noResultsIncludes',
+                        "No results found in '{0}' - ",
+                        includePatternText
+                    ));
                 }
-                if (completed) {
-                    append(messageEl, $('span', undefined, ' - '));
-                    const learnMoreButton = this.messageDisposables.add(( new SearchLinkButton(( localizeWithPath(
+                else if (hasExcludes) {
+                    message = ( localizeWithPath(
                         'vs/workbench/contrib/search/browser/searchView',
-                        'openSettings.learnMore',
-                        "Learn More"
-                    )), this.onLearnMore.bind(this))));
-                    append(messageEl, learnMoreButton.element);
+                        'noResultsExcludes',
+                        "No results found excluding '{0}' - ",
+                        excludePatternText
+                    ));
                 }
-                if (this.contextService.getWorkbenchState() === 1 ) {
-                    this.showSearchWithoutFolderMessage();
+                else {
+                    message = ( localizeWithPath(
+                        'vs/workbench/contrib/search/browser/searchView',
+                        'noResultsFound',
+                        "No results found. Review your settings for configured exclusions and check your gitignore files - "
+                    ));
                 }
-                this.reLayout();
+            }
+            status(message);
+            const messageEl = this.clearMessage();
+            append(messageEl, message);
+            if (!completed) {
+                const searchAgainButton = this.messageDisposables.add(( new SearchLinkButton(( localizeWithPath(
+                    'vs/workbench/contrib/search/browser/searchView',
+                    'rerunSearch.message',
+                    "Search again"
+                )), () => this.triggerQueryChange({ preserveFocus: false }))));
+                append(messageEl, searchAgainButton.element);
+            }
+            else if (hasIncludes || hasExcludes) {
+                const searchAgainButton = this.messageDisposables.add(( new SearchLinkButton(( localizeWithPath(
+                    'vs/workbench/contrib/search/browser/searchView',
+                    'rerunSearchInAll.message',
+                    "Search again in all files"
+                )), this.onSearchAgain.bind(this))));
+                append(messageEl, searchAgainButton.element);
             }
             else {
-                this.viewModel.searchResult.toggleHighlights(this.isVisible());
-                status(( localizeWithPath(
+                const openSettingsButton = this.messageDisposables.add(( new SearchLinkButton(( localizeWithPath(
                     'vs/workbench/contrib/search/browser/searchView',
-                    'ariaSearchResultsStatus',
-                    "Search returned {0} results in {1} files",
-                    this.viewModel.searchResult.count(),
-                    this.viewModel.searchResult.fileCount()
-                )));
-            }
-            if (completed && completed.limitHit) {
-                completed.messages.push({ type: TextSearchCompleteMessageType.Warning, text: ( localizeWithPath(
+                    'openSettings.message',
+                    "Open Settings"
+                )), this.onOpenSettings.bind(this))));
+                append(messageEl, openSettingsButton.element);
+            }
+            if (completed) {
+                append(messageEl, $('span', undefined, ' - '));
+                const learnMoreButton = this.messageDisposables.add(( new SearchLinkButton(( localizeWithPath(
                     'vs/workbench/contrib/search/browser/searchView',
-                    'searchMaxResultsWarning',
-                    "The result set only contains a subset of all matches. Be more specific in your search to narrow down the results."
-                )) });
+                    'openSettings.learnMore',
+                    "Learn More"
+                )), this.onLearnMore.bind(this))));
+                append(messageEl, learnMoreButton.element);
             }
-            if (completed && completed.messages) {
-                for (const message of completed.messages) {
-                    this.addMessage(message);
-                }
+            if (this.contextService.getWorkbenchState() === 1 ) {
+                this.showSearchWithoutFolderMessage();
             }
             this.reLayout();
-        };
-        const onError = (e) => {
-            clearTimeout(slowTimer);
-            this.state = SearchUIState.Idle;
-            if (isCancellationError(e)) {
-                return onComplete(undefined);
-            }
-            else {
-                progressComplete();
-                this.searchWidget.searchInput?.showMessage({ content: e.message, type: 3  });
-                this.viewModel.searchResult.clear();
-                return Promise.resolve();
+        }
+        else {
+            this.viewModel.searchResult.toggleHighlights(this.isVisible());
+            status(( localizeWithPath(
+                'vs/workbench/contrib/search/browser/searchView',
+                'ariaSearchResultsStatus',
+                "Search returned {0} results in {1} files",
+                this.viewModel.searchResult.count(),
+                this.viewModel.searchResult.fileCount()
+            )));
+        }
+        if (completed && completed.limitHit) {
+            completed.messages.push({ type: TextSearchCompleteMessageType.Warning, text: ( localizeWithPath(
+                'vs/workbench/contrib/search/browser/searchView',
+                'searchMaxResultsWarning',
+                "The result set only contains a subset of all matches. Be more specific in your search to narrow down the results."
+            )) });
+        }
+        if (completed && completed.messages) {
+            for (const message of completed.messages) {
+                this.addMessage(message);
             }
-        };
+        }
+        this.reLayout();
+    }
+    onSearchError(e, progressComplete, excludePatternText, includePatternText, completed) {
+        this.state = SearchUIState.Idle;
+        if (isCancellationError(e)) {
+            return this.onSearchComplete(progressComplete, excludePatternText, includePatternText, completed);
+        }
+        else {
+            progressComplete();
+            this.searchWidget.searchInput?.showMessage({ content: e.message, type: 3  });
+            this.viewModel.searchResult.clear();
+            return Promise.resolve();
+        }
+    }
+    doSearch(query, excludePatternText, includePatternText, triggeredOnType) {
+        let progressComplete;
+        this.progressService.withProgress({ location: this.getProgressLocation(), delay: triggeredOnType ? 300 : 0 }, _progress => {
+            return ( new Promise(resolve => progressComplete = resolve));
+        });
+        this.searchWidget.searchInput?.clearMessage();
+        this.state = SearchUIState.Searching;
+        this.showEmptyStage();
+        const slowTimer = setTimeout(() => {
+            this.state = SearchUIState.SlowSearch;
+        }, 2000);
         this._visibleMatches = 0;
         this._refreshResultsScheduler.schedule();
         this.searchWidget.setReplaceAllActionState(false);
         this.tree.setSelection([]);
         this.tree.setFocus([]);
+        this.viewModel.replaceString = this.searchWidget.getReplaceValue();
         const result = this.viewModel.search(query);
-        return result.asyncResults.then(onComplete, onError);
+        return result.asyncResults.then((complete) => {
+            clearTimeout(slowTimer);
+            this.onSearchComplete(progressComplete, excludePatternText, includePatternText, complete);
+        }, (e) => {
+            clearTimeout(slowTimer);
+            this.onSearchError(e, progressComplete, excludePatternText, includePatternText);
+        });
     }
     onOpenSettings(e) {
         EventHelper.stop(e, false);
@@ -1974,7 +2002,7 @@ SearchView = SearchView_1 = ( __decorate([
     ( __param(25, ITelemetryService)),
     ( __param(26, INotebookService)),
     ( __param(27, ILogService)),
-    ( __param(28, IAccessibleNotificationService))
+    ( __param(28, IAudioCueService))
 ], SearchView));
 class SearchLinkButton extends Disposable {
     constructor(label, handler, tooltip) {

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

@@ -22,7 +22,7 @@ import { ReplaceActiveKey, SearchInputBoxFocusedKey, ReplaceInputBoxFocusedKey,
 import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
 import { isMacintosh } from 'vscode/vscode/vs/base/common/platform';
 import { Toggle } from 'vscode/vscode/vs/base/browser/ui/toggle/toggle';
-import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
 import { searchReplaceAllIcon, searchHideReplaceIcon, searchShowContextIcon, searchShowReplaceIcon } from './searchIcons.js';
 import { ToggleSearchEditorContextLinesCommandId } from 'vscode/vscode/vs/workbench/contrib/searchEditor/browser/constants';
 import { showHistoryKeybindingHint } from 'vscode/vscode/vs/platform/history/browser/historyWidgetKeybindingHint';

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

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 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 } from 'vscode/vscode/vs/nls';
+import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { IContextKeyService, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
@@ -13,7 +13,7 @@ import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor'
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { EditorExtensions, DEFAULT_EDITOR_ASSOCIATION } from 'vscode/vscode/vs/workbench/common/editor';
 import { ActiveEditorContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
-import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
 import { getSearchView } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsBase';
 import { searchRefreshIcon, searchNewEditorIcon } from '../../search/browser/searchIcons.js';
 import { HasSearchResults, SearchViewFocusedKey, SearchInputBoxFocusedKey } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
@@ -121,11 +121,11 @@ CommandsRegistry.registerCommand(CleanSearchEditorStateCommandId, (accessor) =>
         activeEditorPane.cleanState();
     }
 });
-const category = { value: ( localizeWithPath(
+const category = ( localize2WithPath(
     'vs/workbench/contrib/searchEditor/browser/searchEditor.contribution',
     'search',
-    "Search Editor"
-)), original: 'Search Editor' };
+    'Search Editor'
+));
 const translateLegacyConfig = (legacyConfig = {}) => {
     const config = {};
     const overrides = {
@@ -167,11 +167,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'search.searchEditor.action.deleteFileResults',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/searchEditor/browser/searchEditor.contribution',
                 'searchEditor.deleteResultBlock',
-                "Delete File Results"
-            )), original: 'Delete File Results' },
+                'Delete File Results'
+            )),
             keybinding: {
                 weight: 100 ,
                 primary: 2048  | 1024  | 1 ,
@@ -192,11 +192,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: OpenNewEditorCommandId,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/searchEditor/browser/searchEditor.contribution',
                 'search.openNewSearchEditor',
-                "New Search Editor"
-            )), original: 'New Search Editor' },
+                'New Search Editor'
+            )),
             category,
             f1: true,
             metadata: openArgMetadata
@@ -210,11 +210,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: OpenEditorCommandId,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/searchEditor/browser/searchEditor.contribution',
                 'search.openSearchEditor',
-                "Open Search Editor"
-            )), original: 'Open Search Editor' },
+                'Open Search Editor'
+            )),
             category,
             f1: true,
             metadata: openArgMetadata
@@ -228,11 +228,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: OpenNewEditorToSideCommandId,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/searchEditor/browser/searchEditor.contribution',
                 'search.openNewEditorToSide',
-                "Open New Search Editor to the Side"
-            )), original: 'Open new Search Editor to the Side' },
+                'Open New Search Editor to the Side'
+            )),
             category,
             f1: true,
             metadata: openArgMetadata
@@ -246,11 +246,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: OpenInEditorCommandId,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/searchEditor/browser/searchEditor.contribution',
                 'search.openResultsInEditor',
-                "Open Results in Editor"
-            )), original: 'Open Results in Editor' },
+                'Open Results in Editor'
+            )),
             category,
             f1: true,
             keybinding: {
@@ -276,11 +276,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: RerunSearchEditorSearchCommandId,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/searchEditor/browser/searchEditor.contribution',
                 'search.rerunSearchInEditor',
-                "Search Again"
-            )), original: 'Search Again' },
+                'Search Again'
+            )),
             category,
             keybinding: {
                 primary: 2048  | 1024  | 48 ,
@@ -311,11 +311,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: FocusQueryEditorWidgetCommandId,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/searchEditor/browser/searchEditor.contribution',
                 'search.action.focusQueryEditorWidget',
-                "Focus Search Editor Input"
-            )), original: 'Focus Search Editor Input' },
+                'Focus Search Editor Input'
+            )),
             category,
             f1: true,
             precondition: InSearchEditor,
@@ -337,11 +337,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: FocusQueryEditorFilesToIncludeCommandId,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/searchEditor/browser/searchEditor.contribution',
                 'search.action.focusFilesToInclude',
-                "Focus Search Editor Files to Include"
-            )), original: 'Focus Search Editor Files to Include' },
+                'Focus Search Editor Files to Include'
+            )),
             category,
             f1: true,
             precondition: InSearchEditor,
@@ -359,11 +359,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: FocusQueryEditorFilesToExcludeCommandId,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/searchEditor/browser/searchEditor.contribution',
                 'search.action.focusFilesToExclude',
-                "Focus Search Editor Files to Exclude"
-            )), original: 'Focus Search Editor Files to Exclude' },
+                'Focus Search Editor Files to Exclude'
+            )),
             category,
             f1: true,
             precondition: InSearchEditor,
@@ -381,11 +381,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: ToggleSearchEditorCaseSensitiveCommandId,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/searchEditor/browser/searchEditor.contribution',
                 'searchEditor.action.toggleSearchEditorCaseSensitive',
-                "Toggle Match Case"
-            )), original: 'Toggle Match Case' },
+                'Toggle Match Case'
+            )),
             category,
             f1: true,
             precondition: InSearchEditor,
@@ -403,11 +403,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: ToggleSearchEditorWholeWordCommandId,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/searchEditor/browser/searchEditor.contribution',
                 'searchEditor.action.toggleSearchEditorWholeWord',
-                "Toggle Match Whole Word"
-            )), original: 'Toggle Match Whole Word' },
+                'Toggle Match Whole Word'
+            )),
             category,
             f1: true,
             precondition: InSearchEditor,

package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.js

@@ -6,7 +6,7 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
-import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
 import { getSearchView } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsBase';
 import { SearchEditorInput, getOrMakeSearchEditorInput } from './searchEditorInput.js';
 import { serializeSearchResultForEditor } from './searchEditorSerialization.js';

package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditorInput.js

@@ -21,10 +21,17 @@ import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/working
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { bufferToReadable, VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { EditorInput } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
 import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
 var SearchEditorInput_1;
 const SEARCH_EDITOR_EXT = '.code-search';
+const SearchEditorIcon = registerIcon('search-editor-label-icon', Codicon.search, ( localizeWithPath(
+    'vs/workbench/contrib/searchEditor/browser/searchEditorInput',
+    'searchEditorLabelIcon',
+    'Icon of the search editor label.'
+)));
 let SearchEditorInput = class SearchEditorInput extends EditorInput {
     static { SearchEditorInput_1 = this; }
     static { this.ID = SearchEditorInputTypeId; }
@@ -34,6 +41,9 @@ let SearchEditorInput = class SearchEditorInput extends EditorInput {
     get editorId() {
         return this.typeId;
     }
+    getIcon() {
+        return SearchEditorIcon;
+    }
     get capabilities() {
         let capabilities = 8 ;
         if (!this.backingUri) {