@codingame/monaco-vscode-search-service-override 5.3.0 → 6.0.0

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

@@ -7,6 +7,7 @@ import { Widget } from 'vscode/vscode/vs/base/browser/ui/widget';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
 import { Delayer } from 'vscode/vscode/vs/base/common/async';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { CONTEXT_FIND_WIDGET_NOT_VISIBLE } from 'vscode/vscode/vs/editor/contrib/find/browser/findModel';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService.service';
@@ -15,11 +16,11 @@ import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/cont
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IContextViewService, IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
-import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 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 { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
+import { SearchContext, SearchCommandIds } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility.service';
 import { isMacintosh } from 'vscode/vscode/vs/base/common/platform';
 import { Toggle } from 'vscode/vscode/vs/base/browser/ui/toggle/toggle';
@@ -32,6 +33,7 @@ import { NotebookFindFilters } from 'vscode/vscode/vs/workbench/contrib/notebook
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { NotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { GroupModelChangeKind } from 'vscode/vscode/vs/workbench/common/editor';
 import { SearchFindInput } from './searchFindInput.js';
 import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 import { MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -55,7 +57,7 @@ class ReplaceAllAction extends Action {
         return Promise.resolve(null);
     }
 }
-const ctrlKeyMod = ((isMacintosh ? 256  : 2048) );
+const ctrlKeyMod = (isMacintosh ? KeyMod.WinCtrl : KeyMod.CtrlCmd);
 function stopPropagationForMultiLineUpwards(event, value, textarea) {
     const isMultiline = !!value.match(/\n/);
     if (textarea && (isMultiline || textarea.clientHeight > SingleLineInputHeight) && textarea.selectionStart > 0) {
@@ -125,7 +127,9 @@ let SearchWidget = class SearchWidget extends Widget {
             notebookOptions.isInNotebookMarkdownInput,
             notebookOptions.isInNotebookMarkdownPreview,
             notebookOptions.isInNotebookCellInput,
-            notebookOptions.isInNotebookCellOutput
+            notebookOptions.isInNotebookCellOutput,
+            false,
+            []
         ))));
         this._register(this._notebookFilters.onDidChange(() => {
             if (this.searchInput) {
@@ -135,19 +139,19 @@ let SearchWidget = class SearchWidget extends Widget {
         this._register(this.editorService.onDidEditorsChange((e) => {
             if (this.searchInput &&
                 e.event.editor instanceof NotebookEditorInput &&
-                ((e.event.kind === 4  || e.event.kind === 5) )) {
+                (e.event.kind === GroupModelChangeKind.EDITOR_OPEN || e.event.kind === GroupModelChangeKind.EDITOR_CLOSE)) {
                 this.searchInput.filterVisible = this._hasNotebookOpen();
             }
         }));
         this._replaceHistoryDelayer = ( (new Delayer(500)));
         this._toggleReplaceButtonListener = this._register(( (new MutableDisposable())));
         this.render(container, options);
-        this.configurationService.onDidChangeConfiguration(e => {
+        this._register(this.configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration('editor.accessibilitySupport')) {
                 this.updateAccessibilitySupport();
             }
-        });
-        this.accessibilityService.onDidChangeScreenReaderOptimized(() => this.updateAccessibilitySupport());
+        }));
+        this._register(this.accessibilityService.onDidChangeScreenReaderOptimized(() => this.updateAccessibilitySupport()));
         this.updateAccessibilitySupport();
     }
     _hasNotebookOpen() {
@@ -280,9 +284,9 @@ let SearchWidget = class SearchWidget extends Widget {
             label: ( localizeWithPath(_moduleId, 3, 'Search: Type Search Term and press Enter to search')),
             validation: (value) => this.validateSearchInput(value),
             placeholder: ( localizeWithPath(_moduleId, 4, "Search")),
-            appendCaseSensitiveLabel: appendKeyBindingLabel('', this.keybindingService.lookupKeybinding("toggleSearchCaseSensitive" )),
-            appendWholeWordsLabel: appendKeyBindingLabel('', this.keybindingService.lookupKeybinding("toggleSearchWholeWord" )),
-            appendRegexLabel: appendKeyBindingLabel('', this.keybindingService.lookupKeybinding("toggleSearchRegex" )),
+            appendCaseSensitiveLabel: appendKeyBindingLabel('', this.keybindingService.lookupKeybinding(SearchCommandIds.ToggleCaseSensitiveCommandId)),
+            appendWholeWordsLabel: appendKeyBindingLabel('', this.keybindingService.lookupKeybinding(SearchCommandIds.ToggleWholeWordCommandId)),
+            appendRegexLabel: appendKeyBindingLabel('', this.keybindingService.lookupKeybinding(SearchCommandIds.ToggleRegexCommandId)),
             history: options.searchHistory,
             showHistoryHint: () => showHistoryKeybindingHint(this.keybindingService),
             flexibleHeight: true,
@@ -303,7 +307,7 @@ let SearchWidget = class SearchWidget extends Widget {
             options.initialAIButtonVisibility ?? false,
             this._hasNotebookOpen()
         ))));
-        this.searchInput.onKeyDown((keyboardEvent) => this.onSearchInputKeyDown(keyboardEvent));
+        this._register(this.searchInput.onKeyDown((keyboardEvent) => this.onSearchInputKeyDown(keyboardEvent)));
         this.searchInput.setValue(options.value || '');
         this.searchInput.setRegex(!!options.isRegex);
         this.searchInput.setCaseSensitive(!!options.isCaseSensitive);
@@ -381,7 +385,7 @@ let SearchWidget = class SearchWidget extends Widget {
         this.replaceInput = this._register(( (new ContextScopedReplaceInput(replaceBox, this.contextViewService, {
             label: ( localizeWithPath(_moduleId, 6, 'Replace: Type replace term and press Enter to preview')),
             placeholder: ( localizeWithPath(_moduleId, 7, "Replace")),
-            appendPreserveCaseLabel: appendKeyBindingLabel('', this.keybindingService.lookupKeybinding("toggleSearchPreserveCase" )),
+            appendPreserveCaseLabel: appendKeyBindingLabel('', this.keybindingService.lookupKeybinding(SearchCommandIds.TogglePreserveCaseId)),
             history: options.replaceHistory,
             showHistoryHint: () => showHistoryKeybindingHint(this.keybindingService),
             flexibleHeight: true,
@@ -487,20 +491,20 @@ let SearchWidget = class SearchWidget extends Widget {
         }
     }
     onSearchInputKeyDown(keyboardEvent) {
-        if (keyboardEvent.equals(ctrlKeyMod | 3 )) {
+        if (keyboardEvent.equals(ctrlKeyMod | KeyCode.Enter)) {
             this.searchInput?.inputBox.insertAtCursor('\n');
             keyboardEvent.preventDefault();
         }
-        if (keyboardEvent.equals(3 )) {
+        if (keyboardEvent.equals(KeyCode.Enter)) {
             this.searchInput?.onSearchSubmit();
             this.submitSearch();
             keyboardEvent.preventDefault();
         }
-        else if (keyboardEvent.equals(9 )) {
+        else if (keyboardEvent.equals(KeyCode.Escape)) {
             this._onSearchCancel.fire({ focus: true });
             keyboardEvent.preventDefault();
         }
-        else if (keyboardEvent.equals(2 )) {
+        else if (keyboardEvent.equals(KeyCode.Tab)) {
             if (this.isReplaceShown()) {
                 this.replaceInput?.focus();
             }
@@ -509,15 +513,15 @@ let SearchWidget = class SearchWidget extends Widget {
             }
             keyboardEvent.preventDefault();
         }
-        else if (keyboardEvent.equals(16 )) {
+        else if (keyboardEvent.equals(KeyCode.UpArrow)) {
             stopPropagationForMultiLineUpwards(keyboardEvent, this.searchInput?.getValue() ?? '', this.searchInput?.domNode.querySelector('textarea') ?? null);
         }
-        else if (keyboardEvent.equals(18 )) {
+        else if (keyboardEvent.equals(KeyCode.DownArrow)) {
             stopPropagationForMultiLineDownwards(keyboardEvent, this.searchInput?.getValue() ?? '', this.searchInput?.domNode.querySelector('textarea') ?? null);
         }
     }
     onCaseSensitiveKeyDown(keyboardEvent) {
-        if (keyboardEvent.equals(1024  | 2 )) {
+        if (keyboardEvent.equals(KeyMod.Shift | KeyCode.Tab)) {
             if (this.isReplaceShown()) {
                 this.replaceInput?.focus();
                 keyboardEvent.preventDefault();
@@ -525,7 +529,7 @@ let SearchWidget = class SearchWidget extends Widget {
         }
     }
     onRegexKeyDown(keyboardEvent) {
-        if (keyboardEvent.equals(2 )) {
+        if (keyboardEvent.equals(KeyCode.Tab)) {
             if (this.isReplaceShown()) {
                 this.replaceInput?.focusOnPreserve();
                 keyboardEvent.preventDefault();
@@ -533,7 +537,7 @@ let SearchWidget = class SearchWidget extends Widget {
         }
     }
     onPreserveCaseKeyDown(keyboardEvent) {
-        if (keyboardEvent.equals(2 )) {
+        if (keyboardEvent.equals(KeyCode.Tab)) {
             if (this.isReplaceActive()) {
                 this.focusReplaceAllAction();
             }
@@ -542,37 +546,37 @@ let SearchWidget = class SearchWidget extends Widget {
             }
             keyboardEvent.preventDefault();
         }
-        else if (keyboardEvent.equals(1024  | 2 )) {
+        else if (keyboardEvent.equals(KeyMod.Shift | KeyCode.Tab)) {
             this.focusRegexAction();
             keyboardEvent.preventDefault();
         }
     }
     onReplaceInputKeyDown(keyboardEvent) {
-        if (keyboardEvent.equals(ctrlKeyMod | 3 )) {
+        if (keyboardEvent.equals(ctrlKeyMod | KeyCode.Enter)) {
             this.replaceInput?.inputBox.insertAtCursor('\n');
             keyboardEvent.preventDefault();
         }
-        if (keyboardEvent.equals(3 )) {
+        if (keyboardEvent.equals(KeyCode.Enter)) {
             this.submitSearch();
             keyboardEvent.preventDefault();
         }
-        else if (keyboardEvent.equals(2 )) {
+        else if (keyboardEvent.equals(KeyCode.Tab)) {
             this.searchInput?.focusOnCaseSensitive();
             keyboardEvent.preventDefault();
         }
-        else if (keyboardEvent.equals(1024  | 2 )) {
+        else if (keyboardEvent.equals(KeyMod.Shift | KeyCode.Tab)) {
             this.searchInput?.focus();
             keyboardEvent.preventDefault();
         }
-        else if (keyboardEvent.equals(16 )) {
+        else if (keyboardEvent.equals(KeyCode.UpArrow)) {
             stopPropagationForMultiLineUpwards(keyboardEvent, this.replaceInput?.getValue() ?? '', this.replaceInput?.domNode.querySelector('textarea') ?? null);
         }
-        else if (keyboardEvent.equals(18 )) {
+        else if (keyboardEvent.equals(KeyCode.DownArrow)) {
             stopPropagationForMultiLineDownwards(keyboardEvent, this.replaceInput?.getValue() ?? '', this.replaceInput?.domNode.querySelector('textarea') ?? null);
         }
     }
     onReplaceActionbarKeyDown(keyboardEvent) {
-        if (keyboardEvent.equals(1024  | 2 )) {
+        if (keyboardEvent.equals(KeyMod.Shift | KeyCode.Tab)) {
             this.focusRegexAction();
             keyboardEvent.preventDefault();
         }
@@ -624,13 +628,13 @@ SearchWidget = SearchWidget_1 = ( (__decorate([
 function registerContributions() {
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: ReplaceAllAction.ID,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: ( (ContextKeyExpr.and(
             SearchContext.SearchViewVisibleKey,
             SearchContext.ReplaceActiveKey,
             CONTEXT_FIND_WIDGET_NOT_VISIBLE
         ))),
-        primary: 512  | 2048  | 3 ,
+        primary: KeyMod.Alt | KeyMod.CtrlCmd | KeyCode.Enter,
         handler: accessor => {
             const viewsService = accessor.get(IViewsService);
             if (isSearchViewFocused(viewsService)) {

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

@@ -1,5 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { isEmptyObject } from 'vscode/vscode/vs/base/common/types';
 
@@ -13,12 +14,12 @@ let SearchHistoryService = class SearchHistoryService {
         this.onDidClearHistory = this._onDidClearHistory.event;
     }
     clearHistory() {
-        this.storageService.remove(SearchHistoryService_1.SEARCH_HISTORY_KEY, 1 );
+        this.storageService.remove(SearchHistoryService_1.SEARCH_HISTORY_KEY, StorageScope.WORKSPACE);
         this._onDidClearHistory.fire();
     }
     load() {
         let result;
-        const raw = this.storageService.get(SearchHistoryService_1.SEARCH_HISTORY_KEY, 1 );
+        const raw = this.storageService.get(SearchHistoryService_1.SEARCH_HISTORY_KEY, StorageScope.WORKSPACE);
         if (raw) {
             try {
                 result = JSON.parse(raw);
@@ -30,10 +31,10 @@ let SearchHistoryService = class SearchHistoryService {
     }
     save(history) {
         if (isEmptyObject(history)) {
-            this.storageService.remove(SearchHistoryService_1.SEARCH_HISTORY_KEY, 1 );
+            this.storageService.remove(SearchHistoryService_1.SEARCH_HISTORY_KEY, StorageScope.WORKSPACE);
         }
         else {
-            this.storageService.store(SearchHistoryService_1.SEARCH_HISTORY_KEY, JSON.stringify(history), 1 , 0 );
+            this.storageService.store(SearchHistoryService_1.SEARCH_HISTORY_KEY, JSON.stringify(history), StorageScope.WORKSPACE, StorageTarget.USER);
         }
     }
 };

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

@@ -1,4 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 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';
@@ -9,9 +10,10 @@ import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/cont
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
-import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2, WorkbenchPhase } 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.service';
@@ -69,7 +71,7 @@ SearchEditorContribution = ( (__decorate([
     ( (__param(0, IEditorResolverService))),
     ( (__param(1, IInstantiationService)))
 ], SearchEditorContribution)));
-registerWorkbenchContribution2(SearchEditorContribution.ID, SearchEditorContribution, 1 );
+registerWorkbenchContribution2(SearchEditorContribution.ID, SearchEditorContribution, WorkbenchPhase.BlockStartup);
 class SearchEditorInputSerializer {
     canSerialize(input) {
         return !!input.tryReadConfigSync();
@@ -163,8 +165,8 @@ registerAction2(class extends Action2 {
             id: 'search.searchEditor.action.deleteFileResults',
             title: ( localize2WithPath(_moduleId, 3, 'Delete File Results')),
             keybinding: {
-                weight: 100 ,
-                primary: 2048  | 1024  | 1 ,
+                weight: KeybindingWeight.EditorContrib,
+                primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Backspace,
             },
             precondition: InSearchEditor,
             category,
@@ -228,11 +230,11 @@ registerAction2(class extends Action2 {
             category,
             f1: true,
             keybinding: {
-                primary: 512  | 3 ,
+                primary: KeyMod.Alt | KeyCode.Enter,
                 when: ( (ContextKeyExpr.and(SearchContext.HasSearchResults, SearchContext.SearchViewFocusedKey))),
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 mac: {
-                    primary: 2048  | 3
+                    primary: KeyMod.CtrlCmd | KeyCode.Enter
                 }
             },
         });
@@ -253,9 +255,9 @@ registerAction2(class extends Action2 {
             title: ( localize2WithPath(_moduleId, 8, 'Search Again')),
             category,
             keybinding: {
-                primary: 2048  | 1024  | 48 ,
+                primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyR,
                 when: InSearchEditor,
-                weight: 100
+                weight: KeybindingWeight.EditorContrib
             },
             icon: searchRefreshIcon,
             menu: [{
@@ -286,8 +288,8 @@ registerAction2(class extends Action2 {
             f1: true,
             precondition: InSearchEditor,
             keybinding: {
-                primary: 9 ,
-                weight: 100
+                primary: KeyCode.Escape,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -344,7 +346,7 @@ registerAction2(class extends Action2 {
             f1: true,
             precondition: InSearchEditor,
             keybinding: Object.assign({
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: SearchContext.SearchInputBoxFocusedKey,
             }, ToggleCaseSensitiveKeybinding)
         });
@@ -362,7 +364,7 @@ registerAction2(class extends Action2 {
             f1: true,
             precondition: InSearchEditor,
             keybinding: Object.assign({
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: SearchContext.SearchInputBoxFocusedKey,
             }, ToggleWholeWordKeybinding)
         });
@@ -380,7 +382,7 @@ registerAction2(class extends Action2 {
             f1: true,
             precondition: InSearchEditor,
             keybinding: Object.assign({
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: SearchContext.SearchInputBoxFocusedKey,
             }, ToggleRegexKeybinding)
         });
@@ -398,9 +400,9 @@ registerAction2(class extends Action2 {
             f1: true,
             precondition: InSearchEditor,
             keybinding: {
-                weight: 200 ,
-                primary: 512  | 42 ,
-                mac: { primary: 2048  | 512  | 42  }
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod.Alt | KeyCode.KeyL,
+                mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyL }
             }
         });
     }
@@ -417,8 +419,8 @@ registerAction2(class extends Action2 {
             f1: true,
             precondition: InSearchEditor,
             keybinding: {
-                weight: 200 ,
-                primary: 512  | 86
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod.Alt | KeyCode.Equal
             }
         });
     }
@@ -433,8 +435,8 @@ registerAction2(class extends Action2 {
             f1: true,
             precondition: InSearchEditor,
             keybinding: {
-                weight: 200 ,
-                primary: 512  | 88
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod.Alt | KeyCode.Minus
             }
         });
     }
@@ -449,8 +451,8 @@ registerAction2(class extends Action2 {
             f1: true,
             precondition: InSearchEditor,
             keybinding: {
-                weight: 200 ,
-                primary: 2048  | 1024  | 42 ,
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyL,
             }
         });
     }
@@ -503,4 +505,4 @@ SearchEditorWorkingCopyEditorHandler = ( (__decorate([
     ( (__param(0, IInstantiationService))),
     ( (__param(1, IWorkingCopyEditorService)))
 ], SearchEditorWorkingCopyEditorHandler)));
-registerWorkbenchContribution2(SearchEditorWorkingCopyEditorHandler.ID, SearchEditorWorkingCopyEditorHandler, 2 );
+registerWorkbenchContribution2(SearchEditorWorkingCopyEditorHandler.ID, SearchEditorWorkingCopyEditorHandler, WorkbenchPhase.BlockRestore);

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

@@ -3,6 +3,7 @@ import { $, append, addDisposableListener, EventType, EventHelper, clearNode, ge
 import { StandardKeyboardEvent } from 'vscode/vscode/vs/base/browser/keyboardEvent';
 import { alert } from 'vscode/vscode/vs/base/browser/ui/aria/aria';
 import { Delayer } from 'vscode/vscode/vs/base/common/async';
+import { KeyCode, KeyMod } from 'vscode/vscode/vs/base/common/keyCodes';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { assertIsDefined } from 'vscode/vscode/vs/base/common/types';
 import './media/searchEditor.css.js';
@@ -39,6 +40,7 @@ import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeServi
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { AbstractTextCodeEditor } from 'vscode/vscode/vs/workbench/browser/parts/editor/textCodeEditor';
+import { EditorInputCapabilities } from 'vscode/vscode/vs/workbench/common/editor';
 import { IncludePatternInputWidget, ExcludePatternInputWidget } from '../../search/browser/patternInputWidget.js';
 import { SearchWidget } from '../../search/browser/searchWidget.js';
 import { QueryBuilder } from 'vscode/vscode/vs/workbench/services/search/common/queryBuilder';
@@ -48,6 +50,7 @@ import { SearchEditorID, InSearchEditor, SearchEditorInputTypeId } from 'vscode/
 import { serializeSearchResultForEditor } from './searchEditorSerialization.js';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { SearchSortOrder } from 'vscode/vscode/vs/workbench/services/search/common/search';
 import { searchDetailsIcon } from '../../search/browser/searchIcons.js';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
@@ -125,14 +128,14 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
         }));
         this._register(addDisposableListener(this.toggleQueryDetailsButton, EventType.KEY_UP, (e) => {
             const event = ( (new StandardKeyboardEvent(e)));
-            if (event.equals(3 ) || event.equals(10 )) {
+            if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
                 EventHelper.stop(e);
                 this.toggleIncludesExcludes();
             }
         }));
         this._register(addDisposableListener(this.toggleQueryDetailsButton, EventType.KEY_DOWN, (e) => {
             const event = ( (new StandardKeyboardEvent(e)));
-            if (event.equals(1024  | 2 )) {
+            if (event.equals(KeyMod.Shift | KeyCode.Tab)) {
                 if (this.queryEditorWidget.isReplaceActive()) {
                     this.queryEditorWidget.focusReplaceAllAction();
                 }
@@ -524,7 +527,7 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
         }
         input.ongoingSearchOperation = undefined;
         const sortOrder = this.searchConfig.sortOrder;
-        if (sortOrder === "modified" ) {
+        if (sortOrder === SearchSortOrder.Modified) {
             await this.retrieveFileStats(this.searchModel.searchResult);
         }
         const controller = ReferencesController.get(this.searchResultEditor);
@@ -541,7 +544,7 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
             }
         }
         this.reLayout();
-        input.setDirty(!input.hasCapability(4 ));
+        input.setDirty(!input.hasCapability(EditorInputCapabilities.Untitled));
         input.setMatchRanges(results.matchRanges);
     }
     addMessage(message) {

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

@@ -6,6 +6,7 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
+import { EditorsOrder } from 'vscode/vscode/vs/workbench/common/editor';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { getSearchView } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsBase';
 import { SearchEditorInput, getOrMakeSearchEditorInput } from './searchEditorInput.js';
@@ -129,7 +130,7 @@ const openNewSearchEditor = async (accessor, _args = {}, toSide = false) => {
             args[name] = (typeof value === 'string') ? await configurationResolverService.resolveAsync(lastActiveWorkspaceRoot, value) : value;
         }
     }
-    const existing = editorService.getEditors(0 ).find(id => id.editor.typeId === SearchEditorInput.ID);
+    const existing = editorService.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).find(id => id.editor.typeId === SearchEditorInput.ID);
     let editor;
     if (existing && args.location === 'reuse') {
         const group = editorGroupsService.getGroup(existing.groupId);

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

@@ -4,13 +4,15 @@ import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { basename } from 'vscode/vscode/vs/base/common/path';
 import { isEqual, extname, joinPath } from 'vscode/vscode/vs/base/common/resources';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { TrackedRangeStickiness } from 'vscode/vscode/vs/editor/common/model';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
-import { EditorResourceAccessor } from 'vscode/vscode/vs/workbench/common/editor';
+import { EditorInputCapabilities, EditorResourceAccessor } from 'vscode/vscode/vs/workbench/common/editor';
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
 import { SearchEditorInputTypeId, SearchEditorScheme, SearchEditorWorkingCopyTypeId, SearchEditorFindMatchClass } from 'vscode/vscode/vs/workbench/contrib/searchEditor/browser/constants';
 import { SearchEditorModel, searchEditorModelFactory } from './searchEditorModel.js';
@@ -18,6 +20,7 @@ import { serializeSearchConfiguration, parseSavedSearchEditor, defaultSearchConf
 import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService.service';
 import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
 import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
+import { WorkingCopyCapabilities } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopy';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { bufferToReadable, VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { EditorInput } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
@@ -41,9 +44,9 @@ let SearchEditorInput = class SearchEditorInput extends EditorInput {
         return SearchEditorIcon;
     }
     get capabilities() {
-        let capabilities = 8 ;
+        let capabilities = EditorInputCapabilities.Singleton;
         if (!this.backingUri) {
-            capabilities |= 4 ;
+            capabilities |= EditorInputCapabilities.Untitled;
         }
         return capabilities;
     }
@@ -78,7 +81,7 @@ let SearchEditorInput = class SearchEditorInput extends EditorInput {
             constructor() {
                 this.typeId = SearchEditorWorkingCopyTypeId;
                 this.resource = input.modelUri;
-                this.capabilities = input.hasCapability(4 ) ? 2  : 0 ;
+                this.capabilities = input.hasCapability(EditorInputCapabilities.Untitled) ? WorkingCopyCapabilities.Untitled : WorkingCopyCapabilities.None;
                 this.onDidChangeDirty = input.onDidChangeDirty;
                 this.onDidChangeContent = input.onDidChangeContent;
                 this.onDidSave = input.onDidSave;
@@ -121,7 +124,7 @@ let SearchEditorInput = class SearchEditorInput extends EditorInput {
                     this._onDidChangeLabel.fire();
                     this.lastLabel = this.getName();
                 }
-                this.memento.getMemento(1 , 1 ).searchConfig = model.config;
+                this.memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE).searchConfig = model.config;
             });
             this._register(this.configChangeListenerDisposable);
         }
@@ -213,7 +216,7 @@ let SearchEditorInput = class SearchEditorInput extends EditorInput {
     }
     async setMatchRanges(ranges) {
         this.oldDecorationsIDs = (await this.resolveModels()).resultsModel.deltaDecorations(this.oldDecorationsIDs, ( (ranges.map(
-            range => ({ range, options: { description: 'search-editor-find-match', className: SearchEditorFindMatchClass, stickiness: 1  } })
+            range => ({ range, options: { description: 'search-editor-find-match', className: SearchEditorFindMatchClass, stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges } })
         ))));
     }
     async revert(group, options) {
@@ -248,7 +251,7 @@ let SearchEditorInput = class SearchEditorInput extends EditorInput {
         return joinPath(await this.fileDialogService.defaultFilePath(this.pathService.defaultUriScheme), searchFileName);
     }
     toUntyped() {
-        if (this.hasCapability(4 )) {
+        if (this.hasCapability(EditorInputCapabilities.Untitled)) {
             return undefined;
         }
         return {
@@ -282,7 +285,7 @@ const getOrMakeSearchEditorInput = (accessor, existingData) => {
             const searchEditorSettings = configurationService.getValue('search').searchEditor;
             const reuseOldSettings = searchEditorSettings.reusePriorSearchConfiguration;
             const defaultNumberOfContextLines = searchEditorSettings.defaultNumberOfContextLines;
-            const priorConfig = reuseOldSettings ? ( (new Memento(SearchEditorInput.ID, storageService))).getMemento(1 , 1 ).searchConfig : {};
+            const priorConfig = reuseOldSettings ? ( (new Memento(SearchEditorInput.ID, storageService))).getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE).searchConfig : {};
             const defaultConfig = defaultSearchConfig();
             const config = { ...defaultConfig, ...priorConfig, ...existingData.config };
             if (defaultNumberOfContextLines !== null && defaultNumberOfContextLines !== undefined) {

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

@@ -1,4 +1,4 @@
-import { coalesce, flatten } from 'vscode/vscode/vs/base/common/arrays';
+import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
 import './media/searchEditor.css.js';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
@@ -227,9 +227,9 @@ const serializeSearchResultForEditor = (searchResult, rawIncludePattern, rawExcl
     }
     info.push('');
     const matchComparer = (a, b) => searchMatchComparer(a, b, sortOrder);
-    const allResults = flattenSearchResultSerializations(flatten(( (searchResult.folderMatches().sort(matchComparer)
+    const allResults = flattenSearchResultSerializations(( (searchResult.folderMatches().sort(matchComparer)
         .map(folderMatch => folderMatch.allDownstreamFileMatches().sort(matchComparer)
-        .flatMap(fileMatch => fileMatchToSearchResultFormat(fileMatch, labelFormatter)))))));
+        .flatMap(fileMatch => fileMatchToSearchResultFormat(fileMatch, labelFormatter))))).flat());
     return {
         matchRanges: ( (allResults.matchRanges.map(translateRangeLines(info.length)))),
         text: info.concat(allResults.text).join(lineDelimiter),