@codingame/monaco-vscode-search-service-override 2.2.2 → 3.1.0

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

@@ -54,7 +54,7 @@ import { searchDetailsIcon } from './searchIcons.js';
 import { renderSearchMessage } from './searchMessage.js';
 import { SearchAccessibilityProvider, SearchDelegate, FolderMatchRenderer, FileMatchRenderer, MatchRenderer } from './searchResultsView.js';
 import { SearchWidget } from './searchWidget.js';
-import { SearchViewVisibleKey, FirstMatchFocusKey, FileMatchOrMatchFocusKey, FileMatchOrFolderMatchFocusKey, FileMatchOrFolderMatchWithResourceFocusKey, FileFocusKey, FolderFocusKey, ResourceFolderFocusKey, HasSearchResults, MatchFocusKey, ViewHasSearchPatternKey, ViewHasReplacePatternKey, ViewHasFilePatternKey, ViewHasSomeCollapsibleKey, InTreeViewKey, SearchViewFocusedKey, InputBoxFocusedKey, PatternIncludesFocusedKey, PatternExcludesFocusedKey, IsEditableItemKey, OpenInEditorCommandId } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
+import { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 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';
@@ -67,7 +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 { AccessibilitySignal, IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 import { TextSearchCompleteMessageType } from 'vscode/vscode/vs/workbench/services/search/common/searchExtTypes';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
@@ -82,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, audioCueService) {
+    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, accessibilitySignalService) {
         super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
         this.fileService = fileService;
         this.editorService = editorService;
@@ -102,7 +102,7 @@ let SearchView = class SearchView extends ViewPane {
         this.storageService = storageService;
         this.notebookService = notebookService;
         this.logService = logService;
-        this.audioCueService = audioCueService;
+        this.accessibilitySignalService = accessibilitySignalService;
         this.isDisposed = false;
         this.lastFocusState = 'input';
         this.messageDisposables = ( new DisposableStore());
@@ -111,28 +111,28 @@ let SearchView = class SearchView extends ViewPane {
         this.pauseSearching = false;
         this._visibleMatches = 0;
         this.container = $$1('.search-view');
-        this.viewletVisible = SearchViewVisibleKey.bindTo(this.contextKeyService);
-        this.firstMatchFocused = FirstMatchFocusKey.bindTo(this.contextKeyService);
-        this.fileMatchOrMatchFocused = FileMatchOrMatchFocusKey.bindTo(this.contextKeyService);
-        this.fileMatchOrFolderMatchFocus = FileMatchOrFolderMatchFocusKey.bindTo(this.contextKeyService);
-        this.fileMatchOrFolderMatchWithResourceFocus = FileMatchOrFolderMatchWithResourceFocusKey.bindTo(this.contextKeyService);
-        this.fileMatchFocused = FileFocusKey.bindTo(this.contextKeyService);
-        this.folderMatchFocused = FolderFocusKey.bindTo(this.contextKeyService);
-        this.folderMatchWithResourceFocused = ResourceFolderFocusKey.bindTo(this.contextKeyService);
-        this.hasSearchResultsKey = HasSearchResults.bindTo(this.contextKeyService);
-        this.matchFocused = MatchFocusKey.bindTo(this.contextKeyService);
+        this.viewletVisible = SearchContext.SearchViewVisibleKey.bindTo(this.contextKeyService);
+        this.firstMatchFocused = SearchContext.FirstMatchFocusKey.bindTo(this.contextKeyService);
+        this.fileMatchOrMatchFocused = SearchContext.FileMatchOrMatchFocusKey.bindTo(this.contextKeyService);
+        this.fileMatchOrFolderMatchFocus = SearchContext.FileMatchOrFolderMatchFocusKey.bindTo(this.contextKeyService);
+        this.fileMatchOrFolderMatchWithResourceFocus = SearchContext.FileMatchOrFolderMatchWithResourceFocusKey.bindTo(this.contextKeyService);
+        this.fileMatchFocused = SearchContext.FileFocusKey.bindTo(this.contextKeyService);
+        this.folderMatchFocused = SearchContext.FolderFocusKey.bindTo(this.contextKeyService);
+        this.folderMatchWithResourceFocused = SearchContext.ResourceFolderFocusKey.bindTo(this.contextKeyService);
+        this.hasSearchResultsKey = SearchContext.HasSearchResults.bindTo(this.contextKeyService);
+        this.matchFocused = SearchContext.MatchFocusKey.bindTo(this.contextKeyService);
         this.searchStateKey = SearchStateKey.bindTo(this.contextKeyService);
-        this.hasSearchPatternKey = ViewHasSearchPatternKey.bindTo(this.contextKeyService);
-        this.hasReplacePatternKey = ViewHasReplacePatternKey.bindTo(this.contextKeyService);
-        this.hasFilePatternKey = ViewHasFilePatternKey.bindTo(this.contextKeyService);
-        this.hasSomeCollapsibleResultKey = ViewHasSomeCollapsibleKey.bindTo(this.contextKeyService);
-        this.treeViewKey = InTreeViewKey.bindTo(this.contextKeyService);
+        this.hasSearchPatternKey = SearchContext.ViewHasSearchPatternKey.bindTo(this.contextKeyService);
+        this.hasReplacePatternKey = SearchContext.ViewHasReplacePatternKey.bindTo(this.contextKeyService);
+        this.hasFilePatternKey = SearchContext.ViewHasFilePatternKey.bindTo(this.contextKeyService);
+        this.hasSomeCollapsibleResultKey = SearchContext.ViewHasSomeCollapsibleKey.bindTo(this.contextKeyService);
+        this.treeViewKey = SearchContext.InTreeViewKey.bindTo(this.contextKeyService);
         this.contextKeyService = this._register(this.contextKeyService.createScoped(this.container));
-        SearchViewFocusedKey.bindTo(this.contextKeyService).set(true);
-        this.inputBoxFocused = InputBoxFocusedKey.bindTo(this.contextKeyService);
-        this.inputPatternIncludesFocused = PatternIncludesFocusedKey.bindTo(this.contextKeyService);
-        this.inputPatternExclusionsFocused = PatternExcludesFocusedKey.bindTo(this.contextKeyService);
-        this.isEditableItem = IsEditableItemKey.bindTo(this.contextKeyService);
+        SearchContext.SearchViewFocusedKey.bindTo(this.contextKeyService).set(true);
+        this.inputBoxFocused = SearchContext.InputBoxFocusedKey.bindTo(this.contextKeyService);
+        this.inputPatternIncludesFocused = SearchContext.PatternIncludesFocusedKey.bindTo(this.contextKeyService);
+        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 => {
             if (e.affectsConfiguration('search.sortOrder')) {
@@ -805,6 +805,7 @@ let SearchView = class SearchView extends ViewPane {
         const updateHasSomeCollapsible = () => this.toggleCollapseStateDelayer.trigger(() => this.hasSomeCollapsibleResultKey.set(this.hasSomeCollapsible()));
         updateHasSomeCollapsible();
         this._register(this.tree.onDidChangeCollapseState(() => updateHasSomeCollapsible()));
+        this._register(this.tree.onDidChangeModel(() => updateHasSomeCollapsible()));
         this._register(Event.debounce(this.tree.onDidOpen, (last, event) => event, DEBOUNCE_DELAY, true)(options => {
             if (options.element instanceof Match) {
                 const selectedMatch = options.element;
@@ -991,7 +992,7 @@ let SearchView = class SearchView extends ViewPane {
     }
     updateTextFromSelection({ allowUnselectedWord = true, allowSearchOnType = true }, editor) {
         const seedSearchStringFromSelection = this.configurationService.getValue('editor').find.seedSearchStringFromSelection;
-        if (!seedSearchStringFromSelection) {
+        if (!seedSearchStringFromSelection || seedSearchStringFromSelection === 'never') {
             return false;
         }
         let selectedText = this.getSearchTextFromEditor(allowUnselectedWord, editor);
@@ -1126,7 +1127,7 @@ let SearchView = class SearchView extends ViewPane {
             'emptySearch',
             "Empty Search"
         ));
-        this.audioCueService.playAudioCue(AudioCue.clear);
+        this.accessibilitySignalService.playSignal(AccessibilitySignal.clear);
         this.reLayout();
     }
     clearFilePatternFields() {
@@ -1676,7 +1677,7 @@ let SearchView = class SearchView extends ViewPane {
                 'vs/workbench/contrib/search/browser/searchView',
                 'openInEditor.tooltip',
                 "Copy current search results to an editor"
-            )), this.keybindingService.lookupKeybinding(OpenInEditorCommandId));
+            )), this.keybindingService.lookupKeybinding("search.action.openInEditor" ));
             const openInEditorButton = this.messageDisposables.add(( new SearchLinkButton(( localizeWithPath(
                 'vs/workbench/contrib/search/browser/searchView',
                 'openInEditor.message',
@@ -2002,7 +2003,7 @@ SearchView = SearchView_1 = ( __decorate([
     ( __param(25, ITelemetryService)),
     ( __param(26, INotebookService)),
     ( __param(27, ILogService)),
-    ( __param(28, IAudioCueService))
+    ( __param(28, IAccessibilitySignalService))
 ], SearchView));
 class SearchLinkButton extends Disposable {
     constructor(label, handler, tooltip) {

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

@@ -18,7 +18,7 @@ import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { ContextScopedReplaceInput } from 'vscode/vscode/vs/platform/history/browser/contextScopedHistoryWidget';
 import { appendKeyBindingLabel, isSearchViewFocused, getSearchView } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsBase';
-import { ReplaceActiveKey, SearchInputBoxFocusedKey, ReplaceInputBoxFocusedKey, ToggleCaseSensitiveCommandId, ToggleWholeWordCommandId, ToggleRegexCommandId, TogglePreserveCaseId, SearchViewVisibleKey } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
+import { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 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';
@@ -115,9 +115,9 @@ let SearchWidget = class SearchWidget extends Widget {
         this.onDidHeightChange = this._onDidHeightChange.event;
         this._onDidToggleContext = ( new Emitter());
         this.onDidToggleContext = this._onDidToggleContext.event;
-        this.replaceActive = ReplaceActiveKey.bindTo(this.contextKeyService);
-        this.searchInputBoxFocused = SearchInputBoxFocusedKey.bindTo(this.contextKeyService);
-        this.replaceInputBoxFocused = ReplaceInputBoxFocusedKey.bindTo(this.contextKeyService);
+        this.replaceActive = SearchContext.ReplaceActiveKey.bindTo(this.contextKeyService);
+        this.searchInputBoxFocused = SearchContext.SearchInputBoxFocusedKey.bindTo(this.contextKeyService);
+        this.replaceInputBoxFocused = SearchContext.ReplaceInputBoxFocusedKey.bindTo(this.contextKeyService);
         const notebookOptions = options.notebookOptions ??
             {
                 isInNotebookMarkdownInput: true,
@@ -292,9 +292,9 @@ let SearchWidget = class SearchWidget extends Widget {
                 'search.placeHolder',
                 "Search"
             )),
-            appendCaseSensitiveLabel: appendKeyBindingLabel('', this.keybindingService.lookupKeybinding(ToggleCaseSensitiveCommandId)),
-            appendWholeWordsLabel: appendKeyBindingLabel('', this.keybindingService.lookupKeybinding(ToggleWholeWordCommandId)),
-            appendRegexLabel: appendKeyBindingLabel('', this.keybindingService.lookupKeybinding(ToggleRegexCommandId)),
+            appendCaseSensitiveLabel: appendKeyBindingLabel('', this.keybindingService.lookupKeybinding("toggleSearchCaseSensitive" )),
+            appendWholeWordsLabel: appendKeyBindingLabel('', this.keybindingService.lookupKeybinding("toggleSearchWholeWord" )),
+            appendRegexLabel: appendKeyBindingLabel('', this.keybindingService.lookupKeybinding("toggleSearchRegex" )),
             history: options.searchHistory,
             showHistoryHint: () => showHistoryKeybindingHint(this.keybindingService),
             flexibleHeight: true,
@@ -403,7 +403,7 @@ let SearchWidget = class SearchWidget extends Widget {
                 'search.replace.placeHolder',
                 "Replace"
             )),
-            appendPreserveCaseLabel: appendKeyBindingLabel('', this.keybindingService.lookupKeybinding(TogglePreserveCaseId)),
+            appendPreserveCaseLabel: appendKeyBindingLabel('', this.keybindingService.lookupKeybinding("toggleSearchPreserveCase" )),
             history: options.replaceHistory,
             showHistoryHint: () => showHistoryKeybindingHint(this.keybindingService),
             flexibleHeight: true,
@@ -647,8 +647,8 @@ function registerContributions() {
         id: ReplaceAllAction.ID,
         weight: 200 ,
         when: ( ContextKeyExpr.and(
-            SearchViewVisibleKey,
-            ReplaceActiveKey,
+            SearchContext.SearchViewVisibleKey,
+            SearchContext.ReplaceActiveKey,
             CONTEXT_FIND_WIDGET_NOT_VISIBLE
         )),
         primary: 512  | 2048  | 3 ,

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { extname, isEqual } from 'vscode/vscode/vs/base/common/resources';
+import { isEqual, extname } 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';
@@ -10,17 +10,17 @@ import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/d
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2 } 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/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';
+import { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 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, SEARCH_EDITOR_EXT, getOrMakeSearchEditorInput } from './searchEditorInput.js';
+import { SearchEditorInput, getOrMakeSearchEditorInput, SEARCH_EDITOR_EXT } 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';
@@ -49,6 +49,7 @@ const SelectAllSearchEditorMatchesCommandId = 'selectAllSearchEditorMatches';
     ( new SyncDescriptor(SearchEditorInput))
 ]);
 let SearchEditorContribution = class SearchEditorContribution {
+    static { this.ID = 'workbench.contrib.searchEditor'; }
     constructor(editorResolverService, instantiationService) {
         editorResolverService.registerEditor('*' + SEARCH_EDITOR_EXT, {
             id: SearchEditorInput.ID,
@@ -73,13 +74,15 @@ SearchEditorContribution = ( __decorate([
     ( __param(0, IEditorResolverService)),
     ( __param(1, IInstantiationService))
 ], SearchEditorContribution));
-const workbenchContributionsRegistry = ( Registry.as(Extensions.Workbench));
-workbenchContributionsRegistry.registerWorkbenchContribution(SearchEditorContribution, 1 );
+registerWorkbenchContribution2(SearchEditorContribution.ID, SearchEditorContribution, 1 );
 class SearchEditorInputSerializer {
     canSerialize(input) {
         return !!input.tryReadConfigSync();
     }
     serialize(input) {
+        if (!this.canSerialize(input)) {
+            return undefined;
+        }
         if (input.isDisposed()) {
             return JSON.stringify({ modelUri: undefined, dirty: false, config: input.tryReadConfigSync(), name: input.getName(), matchRanges: [], backingUri: input.backingUri?.toString() });
         }
@@ -255,7 +258,10 @@ registerAction2(class extends Action2 {
             f1: true,
             keybinding: {
                 primary: 512  | 3 ,
-                when: ( ContextKeyExpr.and(HasSearchResults, SearchViewFocusedKey)),
+                when: ( ContextKeyExpr.and(
+                    SearchContext.HasSearchResults,
+                    SearchContext.SearchViewFocusedKey
+                )),
                 weight: 200 ,
                 mac: {
                     primary: 2048  | 3
@@ -391,7 +397,7 @@ registerAction2(class extends Action2 {
             precondition: InSearchEditor,
             keybinding: Object.assign({
                 weight: 200 ,
-                when: SearchInputBoxFocusedKey,
+                when: SearchContext.SearchInputBoxFocusedKey,
             }, ToggleCaseSensitiveKeybinding)
         });
     }
@@ -413,7 +419,7 @@ registerAction2(class extends Action2 {
             precondition: InSearchEditor,
             keybinding: Object.assign({
                 weight: 200 ,
-                when: SearchInputBoxFocusedKey,
+                when: SearchContext.SearchInputBoxFocusedKey,
             }, ToggleWholeWordKeybinding)
         });
     }
@@ -425,17 +431,17 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: ToggleSearchEditorRegexCommandId,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/searchEditor/browser/searchEditor.contribution',
                 'searchEditor.action.toggleSearchEditorRegex',
                 "Toggle Use Regular Expression"
-            )), original: 'Toggle Use Regular Expression"' },
+            )),
             category,
             f1: true,
             precondition: InSearchEditor,
             keybinding: Object.assign({
                 weight: 200 ,
-                when: SearchInputBoxFocusedKey,
+                when: SearchContext.SearchInputBoxFocusedKey,
             }, ToggleRegexKeybinding)
         });
     }
@@ -447,11 +453,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: ToggleSearchEditorContextLinesCommandId,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/searchEditor/browser/searchEditor.contribution',
                 'searchEditor.action.toggleSearchEditorContextLines',
                 "Toggle Context Lines"
-            )), original: 'Toggle Context Lines"' },
+            )),
             category,
             f1: true,
             precondition: InSearchEditor,
@@ -470,11 +476,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: IncreaseSearchEditorContextLinesCommandId,
-            title: { original: 'Increase Context Lines', value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/searchEditor/browser/searchEditor.contribution',
                 'searchEditor.action.increaseSearchEditorContextLines',
                 "Increase Context Lines"
-            )) },
+            )),
             category,
             f1: true,
             precondition: InSearchEditor,
@@ -490,11 +496,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: DecreaseSearchEditorContextLinesCommandId,
-            title: { original: 'Decrease Context Lines', value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/searchEditor/browser/searchEditor.contribution',
                 'searchEditor.action.decreaseSearchEditorContextLines',
                 "Decrease Context Lines"
-            )) },
+            )),
             category,
             f1: true,
             precondition: InSearchEditor,
@@ -510,11 +516,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectAllSearchEditorMatchesCommandId,
-            title: { original: 'Select All Matches', value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/searchEditor/browser/searchEditor.contribution',
                 'searchEditor.action.selectAllSearchEditorMatches',
                 "Select All Matches"
-            )) },
+            )),
             category,
             f1: true,
             precondition: InSearchEditor,
@@ -552,6 +558,7 @@ registerAction2(class OpenSearchEditorAction extends Action2 {
     }
 });
 let SearchEditorWorkingCopyEditorHandler = class SearchEditorWorkingCopyEditorHandler extends Disposable {
+    static { this.ID = 'workbench.contrib.searchEditorWorkingCopyEditorHandler'; }
     constructor(instantiationService, workingCopyEditorService) {
         super();
         this.instantiationService = instantiationService;
@@ -576,4 +583,4 @@ SearchEditorWorkingCopyEditorHandler = ( __decorate([
     ( __param(0, IInstantiationService)),
     ( __param(1, IWorkingCopyEditorService))
 ], SearchEditorWorkingCopyEditorHandler));
-workbenchContributionsRegistry.registerWorkbenchContribution(SearchEditorWorkingCopyEditorHandler, 2 );
+registerWorkbenchContribution2(SearchEditorWorkingCopyEditorHandler.ID, SearchEditorWorkingCopyEditorHandler, 2 );

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

@@ -30,7 +30,6 @@ import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/co
 import { AbstractTextCodeEditor } from 'vscode/vscode/vs/workbench/browser/parts/editor/textCodeEditor';
 import { IncludePatternInputWidget, ExcludePatternInputWidget } from '../../search/browser/patternInputWidget.js';
 import { SearchWidget } from '../../search/browser/searchWidget.js';
-import { InputBoxFocusedKey } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { QueryBuilder } from 'vscode/vscode/vs/workbench/services/search/common/queryBuilder';
 import { getOutOfWorkspaceEditorResources } from 'vscode/vscode/vs/workbench/contrib/search/common/search';
 import { SearchModel } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
@@ -47,6 +46,7 @@ import { EditorExtensionsRegistry } from 'vscode/vscode/vs/editor/browser/editor
 import { UnusualLineTerminatorsDetector } from 'vscode/vscode/vs/editor/contrib/unusualLineTerminators/browser/unusualLineTerminators';
 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';
 
 var SearchEditor_1;
 const RESULT_LINE_REGEX = /^(\s+)(\d+)(: |  )(\s*)(.*)$/;
@@ -86,7 +86,7 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
         this.registerEditorListeners();
         const scopedContextKeyService = assertIsDefined(this.scopedContextKeyService);
         InSearchEditor.bindTo(scopedContextKeyService).set(true);
-        this.createQueryEditor(this.queryEditorContainer, this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, scopedContextKeyService]))), InputBoxFocusedKey.bindTo(scopedContextKeyService));
+        this.createQueryEditor(this.queryEditorContainer, this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, scopedContextKeyService]))), SearchContext.InputBoxFocusedKey.bindTo(scopedContextKeyService));
     }
     createQueryEditor(container, scopedInstantiationService, inputBoxFocusedContextKey) {
         const searchEditorInputboxStyles = getInputBoxStyle({ inputBorder: searchEditorTextInputBorder });

package/vscode/src/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchContributions.js

@@ -1,9 +0,0 @@
-import { ReplacePreviewContentProvider } from '../replaceService.js';
-import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
-
-function registerContributions() {
-    ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(ReplacePreviewContentProvider, 1 );
-}
-
-export { registerContributions };