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

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

@@ -3,13 +3,15 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { getSelectionKeyboardEvent } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { searchRemoveIcon, searchReplaceIcon } from './searchIcons.js';
-import { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
+import { SearchCommandIds, SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { IReplaceService } from 'vscode/vscode/vs/workbench/contrib/search/browser/replace.service';
 import { SearchResult, arrayContainsElementOrParent, Match, MatchInNotebook, FileMatch, FolderMatch } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { KeyCode, KeyMod } from 'vscode/vscode/vs/base/common/keyCodes';
 import { category, getSearchView, getElementsToOperateOn, shouldRefocus } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsBase';
 import { equals } from 'vscode/vscode/vs/base/common/arrays';
 
@@ -17,16 +19,16 @@ const _moduleId = "vs/workbench/contrib/search/browser/searchActionsRemoveReplac
 registerAction2(class RemoveAction extends Action2 {
     constructor() {
         super({
-            id: "search.action.remove" ,
+            id: SearchCommandIds.RemoveActionId,
             title: ( localize2WithPath(_moduleId, 0, "Dismiss")),
             category,
             icon: searchRemoveIcon,
             keybinding: {
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: ( (ContextKeyExpr.and(SearchContext.SearchViewVisibleKey, SearchContext.FileMatchOrMatchFocusKey))),
-                primary: 20 ,
+                primary: KeyCode.Delete,
                 mac: {
-                    primary: 2048  | 1 ,
+                    primary: KeyMod.CtrlCmd | KeyCode.Backspace,
                 },
             },
             menu: [
@@ -95,18 +97,18 @@ registerAction2(class RemoveAction extends Action2 {
 registerAction2(class ReplaceAction extends Action2 {
     constructor() {
         super({
-            id: "search.action.replace" ,
+            id: SearchCommandIds.ReplaceActionId,
             title: ( localize2WithPath(_moduleId, 1, "Replace")),
             category,
             keybinding: {
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: ( (ContextKeyExpr.and(
                     SearchContext.SearchViewVisibleKey,
                     SearchContext.ReplaceActiveKey,
                     SearchContext.MatchFocusKey,
                     SearchContext.IsEditableItemKey
                 ))),
-                primary: 1024  | 2048  | 22 ,
+                primary: KeyMod.Shift | KeyMod.CtrlCmd | KeyCode.Digit1,
             },
             icon: searchReplaceIcon,
             menu: [
@@ -140,19 +142,19 @@ registerAction2(class ReplaceAction extends Action2 {
 registerAction2(class ReplaceAllAction extends Action2 {
     constructor() {
         super({
-            id: "search.action.replaceAllInFile" ,
+            id: SearchCommandIds.ReplaceAllInFileActionId,
             title: ( localize2WithPath(_moduleId, 2, "Replace All")),
             category,
             keybinding: {
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: ( (ContextKeyExpr.and(
                     SearchContext.SearchViewVisibleKey,
                     SearchContext.ReplaceActiveKey,
                     SearchContext.FileFocusKey,
                     SearchContext.IsEditableItemKey
                 ))),
-                primary: 1024  | 2048  | 22 ,
-                secondary: [2048  | 1024  | 3 ],
+                primary: KeyMod.Shift | KeyMod.CtrlCmd | KeyCode.Digit1,
+                secondary: [KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Enter],
             },
             icon: searchReplaceIcon,
             menu: [
@@ -186,19 +188,19 @@ registerAction2(class ReplaceAllAction extends Action2 {
 registerAction2(class ReplaceAllInFolderAction extends Action2 {
     constructor() {
         super({
-            id: "search.action.replaceAllInFolder" ,
+            id: SearchCommandIds.ReplaceAllInFolderActionId,
             title: ( localize2WithPath(_moduleId, 2, "Replace All")),
             category,
             keybinding: {
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: ( (ContextKeyExpr.and(
                     SearchContext.SearchViewVisibleKey,
                     SearchContext.ReplaceActiveKey,
                     SearchContext.FolderFocusKey,
                     SearchContext.IsEditableItemKey
                 ))),
-                primary: 1024  | 2048  | 22 ,
-                secondary: [2048  | 1024  | 3 ],
+                primary: KeyMod.Shift | KeyMod.CtrlCmd | KeyCode.Digit1,
+                secondary: [KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Enter],
             },
             icon: searchReplaceIcon,
             menu: [

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

@@ -1,5 +1,8 @@
 import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+import { SearchCommandIds } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 
 const _moduleId = "vs/workbench/contrib/search/browser/searchActionsSymbol";
@@ -9,15 +12,15 @@ registerAction2(class ShowAllSymbolsAction extends Action2 {
     static { this.ALL_SYMBOLS_PREFIX = '#'; }
     constructor() {
         super({
-            id: "workbench.action.showAllSymbols" ,
+            id: SearchCommandIds.ShowAllSymbolsActionId,
             title: {
                 ...( localize2WithPath(_moduleId, 0, "Go to Symbol in Workspace...")),
                 mnemonicTitle: ( localizeWithPath(_moduleId, 1, "Go to Symbol in &&Workspace...")),
             },
             f1: true,
             keybinding: {
-                weight: 200 ,
-                primary: 2048  | 50
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod.CtrlCmd | KeyCode.KeyT
             },
             menu: {
                 id: MenuId.MenubarGoMenu,

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

@@ -1,4 +1,5 @@
 import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { SearchCommandIds } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { category } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsBase';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
@@ -11,7 +12,7 @@ const _moduleId = "vs/workbench/contrib/search/browser/searchActionsTextQuickAcc
 registerAction2(class TextSearchQuickAccessAction extends Action2 {
     constructor() {
         super({
-            id: "workbench.action.quickTextSearch" ,
+            id: SearchCommandIds.QuickTextSearchActionId,
             title: ( localize2WithPath(_moduleId, 0, "Quick Search")),
             category,
             f1: true

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

@@ -2,12 +2,14 @@ import { localize2WithPath } from 'vscode/vscode/vs/nls';
 import { WorkbenchListFocusContextKey } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { searchStopIcon, searchRefreshIcon, searchCollapseAllIcon, searchExpandAllIcon, searchClearIcon, searchShowAsList, searchShowAsTree } from './searchIcons.js';
-import { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
+import { SearchCommandIds, SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { ISearchHistoryService } from 'vscode/vscode/vs/workbench/contrib/search/common/searchHistoryService.service';
 import { FolderMatchWorkspaceRoot, Match, FolderMatch, FolderMatchNoRoot, SearchResult, FileMatch } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
 import { VIEW_ID } from 'vscode/vscode/vs/workbench/services/search/common/search';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { SearchStateKey, SearchUIState } from 'vscode/vscode/vs/workbench/contrib/search/common/search';
 import { category, getSearchView } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsBase';
 
@@ -15,7 +17,7 @@ const _moduleId = "vs/workbench/contrib/search/browser/searchActionsTopBar";
 registerAction2(class ClearSearchHistoryCommandAction extends Action2 {
     constructor() {
         super({
-            id: "search.action.clearHistory" ,
+            id: SearchCommandIds.ClearSearchHistoryCommandId,
             title: ( localize2WithPath(_moduleId, 0, "Clear Search History")),
             category,
             f1: true
@@ -28,16 +30,16 @@ registerAction2(class ClearSearchHistoryCommandAction extends Action2 {
 registerAction2(class CancelSearchAction extends Action2 {
     constructor() {
         super({
-            id: "search.action.cancel" ,
+            id: SearchCommandIds.CancelSearchActionId,
             title: ( localize2WithPath(_moduleId, 1, "Cancel Search")),
             icon: searchStopIcon,
             category,
             f1: true,
             precondition: ( (( (SearchStateKey.isEqualTo(SearchUIState.Idle))).negate())),
             keybinding: {
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: ( (ContextKeyExpr.and(SearchContext.SearchViewVisibleKey, WorkbenchListFocusContextKey))),
-                primary: 9 ,
+                primary: KeyCode.Escape,
             },
             menu: [{
                     id: MenuId.ViewTitle,
@@ -57,7 +59,7 @@ registerAction2(class CancelSearchAction extends Action2 {
 registerAction2(class RefreshAction extends Action2 {
     constructor() {
         super({
-            id: "search.action.refreshSearchResults" ,
+            id: SearchCommandIds.RefreshSearchResultsActionId,
             title: ( localize2WithPath(_moduleId, 2, "Refresh")),
             icon: searchRefreshIcon,
             precondition: SearchContext.ViewHasSearchPatternKey,
@@ -81,7 +83,7 @@ registerAction2(class RefreshAction extends Action2 {
 registerAction2(class CollapseDeepestExpandedLevelAction extends Action2 {
     constructor() {
         super({
-            id: "search.action.collapseSearchResults" ,
+            id: SearchCommandIds.CollapseSearchResultsActionId,
             title: ( localize2WithPath(_moduleId, 3, "Collapse All")),
             category,
             icon: searchCollapseAllIcon,
@@ -108,7 +110,7 @@ registerAction2(class CollapseDeepestExpandedLevelAction extends Action2 {
 registerAction2(class ExpandAllAction extends Action2 {
     constructor() {
         super({
-            id: "search.action.expandSearchResults" ,
+            id: SearchCommandIds.ExpandSearchResultsActionId,
             title: ( localize2WithPath(_moduleId, 4, "Expand All")),
             category,
             icon: searchExpandAllIcon,
@@ -136,7 +138,7 @@ registerAction2(class ExpandAllAction extends Action2 {
 registerAction2(class ClearSearchResultsAction extends Action2 {
     constructor() {
         super({
-            id: "search.action.clearSearchResults" ,
+            id: SearchCommandIds.ClearSearchResultsActionId,
             title: ( localize2WithPath(_moduleId, 5, "Clear Search Results")),
             category,
             icon: searchClearIcon,
@@ -162,7 +164,7 @@ registerAction2(class ClearSearchResultsAction extends Action2 {
 registerAction2(class ViewAsTreeAction extends Action2 {
     constructor() {
         super({
-            id: "search.action.viewAsTree" ,
+            id: SearchCommandIds.ViewAsTreeActionId,
             title: ( localize2WithPath(_moduleId, 6, "View as Tree")),
             category,
             icon: searchShowAsList,
@@ -192,7 +194,7 @@ registerAction2(class ViewAsTreeAction extends Action2 {
 registerAction2(class ViewAsListAction extends Action2 {
     constructor() {
         super({
-            id: "search.action.viewAsList" ,
+            id: SearchCommandIds.ViewAsListActionId,
             title: ( localize2WithPath(_moduleId, 7, "View as List")),
             category,
             icon: searchShowAsTree,

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

@@ -12,7 +12,7 @@ import { FolderMatch, FileMatch, Match, FolderMatchWorkspaceRoot, FolderMatchNoR
 import { isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { MenuWorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
+import { MenuWorkbenchToolBar, HiddenItemStrategy } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
 import { defaultCountBadgeStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
@@ -88,7 +88,7 @@ let FolderMatchRenderer = class FolderMatchRenderer extends Disposable {
             menuOptions: {
                 shouldForwardArgs: true
             },
-            hiddenItemStrategy: 0 ,
+            hiddenItemStrategy: HiddenItemStrategy.Ignore,
             toolbarOptions: {
                 primaryGroup: (g) => /^inline/.test(g),
             },
@@ -178,7 +178,7 @@ let FileMatchRenderer = class FileMatchRenderer extends Disposable {
             menuOptions: {
                 shouldForwardArgs: true
             },
-            hiddenItemStrategy: 0 ,
+            hiddenItemStrategy: HiddenItemStrategy.Ignore,
             toolbarOptions: {
                 primaryGroup: (g) => /^inline/.test(g),
             },
@@ -257,7 +257,7 @@ let MatchRenderer = class MatchRenderer extends Disposable {
             menuOptions: {
                 shouldForwardArgs: true
             },
-            hiddenItemStrategy: 0 ,
+            hiddenItemStrategy: HiddenItemStrategy.Ignore,
             toolbarOptions: {
                 primaryGroup: (g) => /^inline/.test(g),
             },

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

@@ -2,11 +2,13 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { $ as $$1, hide, append, addDisposableListener, EventType, EventHelper, clearNode, show, getActiveWindow, getTotalHeight, Dimension, isAncestorOfActiveElement } from 'vscode/vscode/vs/base/browser/dom';
 import { StandardKeyboardEvent } from 'vscode/vscode/vs/base/browser/keyboardEvent';
 import { status } from 'vscode/vscode/vs/base/browser/ui/aria/aria';
+import { MessageType } from 'vscode/vscode/vs/base/browser/ui/inputbox/inputBox';
 import { ObjectTreeElementCollapseState } from 'vscode/vscode/vs/base/browser/ui/tree/tree';
 import { Delayer, RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
 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 { KeyCode, KeyMod } from 'vscode/vscode/vs/base/common/keyCodes';
 import { DisposableStore, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { isMacintosh, isNative } from 'vscode/vscode/vs/base/common/platform';
 import { escapeRegExpCharacters } from 'vscode/vscode/vs/base/common/strings';
@@ -27,6 +29,7 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IContextViewService, IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
+import { FileChangeType } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
@@ -36,11 +39,13 @@ import { INotificationService } from 'vscode/vscode/vs/platform/notification/com
 import { withSelection } from 'vscode/vscode/vs/platform/opener/common/opener';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
 import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
+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 { defaultInputBoxStyles, defaultToggleStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
+import { WorkbenchState } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { OpenFileFolderAction, OpenFolderAction } from 'vscode/vscode/vs/workbench/browser/actions/workspaceActions';
 import { ResourceListDnDHandler } from 'vscode/vscode/vs/workbench/browser/dnd';
@@ -55,7 +60,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 { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
+import { SearchContext, SearchCommandIds } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { IReplaceService } from 'vscode/vscode/vs/workbench/contrib/search/browser/replace.service';
 import { SearchStateKey, SearchUIState, getOutOfWorkspaceEditorResources } from 'vscode/vscode/vs/workbench/contrib/search/common/search';
 import { SearchHistoryService } from '../common/searchHistoryService.js';
@@ -67,7 +72,7 @@ import { SIDE_GROUP, ACTIVE_GROUP } from 'vscode/vscode/vs/workbench/services/ed
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/preferences/common/preferences.service';
 import { QueryBuilder } from 'vscode/vscode/vs/workbench/services/search/common/queryBuilder';
-import 'vscode/vscode/vs/workbench/services/search/common/search';
+import { SearchSortOrder, ViewMode, SearchCompletionExitCode, QueryType } from 'vscode/vscode/vs/workbench/services/search/common/search';
 import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
@@ -146,7 +151,7 @@ let SearchView = class SearchView extends ViewPane {
         this.instantiationService = this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, this.contextKeyService]))));
         this._register(this.configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration('search.sortOrder')) {
-                if (this.searchConfig.sortOrder === "modified" ) {
+                if (this.searchConfig.sortOrder === SearchSortOrder.Modified) {
                     this.removeFileStats();
                 }
                 this.refreshTree();
@@ -158,7 +163,7 @@ let SearchView = class SearchView extends ViewPane {
         this.viewModel = this._register(this.searchViewModelWorkbenchService.searchModel);
         this.queryBuilder = this.instantiationService.createInstance(QueryBuilder);
         this.memento = ( (new Memento(this.id, storageService)));
-        this.viewletState = this.memento.getMemento(1 , 1 );
+        this.viewletState = this.memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
         this._register(this.fileService.onDidFilesChange(e => this.onFilesChanged(e)));
         this._register(this.textFileService.untitled.onWillDispose(model => this.onUntitledDidDispose(model.resource)));
         this._register(this.contextService.onDidChangeWorkbenchState(() => this.onDidChangeWorkbenchState()));
@@ -169,12 +174,12 @@ let SearchView = class SearchView extends ViewPane {
         this.toggleCollapseStateDelayer = this._register(( (new Delayer(100))));
         this.triggerQueryDelayer = this._register(( (new Delayer(0))));
         this.treeAccessibilityProvider = this.instantiationService.createInstance(SearchAccessibilityProvider, this);
-        this.isTreeLayoutViewVisible = this.viewletState['view.treeLayout'] ?? ((this.searchConfig.defaultViewMode === "tree") );
+        this.isTreeLayoutViewVisible = this.viewletState['view.treeLayout'] ?? (this.searchConfig.defaultViewMode === ViewMode.Tree);
         this._refreshResultsScheduler = this._register(( (new RunOnceScheduler(this._updateResults.bind(this), 80))));
         this._register(this.storageService.onWillSaveState(() => {
             this._saveSearchHistoryService();
         }));
-        this._register(this.storageService.onDidChangeValue(1 , SearchHistoryService.SEARCH_HISTORY_KEY, this._register(( (new DisposableStore()))))(() => {
+        this._register(this.storageService.onDidChangeValue(StorageScope.WORKSPACE, SearchHistoryService.SEARCH_HISTORY_KEY, this._register(( (new DisposableStore()))))(() => {
             const restoredHistory = this.searchHistoryService.load();
             if (restoredHistory.include) {
                 this.inputPatternIncludes.prependHistory(restoredHistory.include);
@@ -250,7 +255,7 @@ let SearchView = class SearchView extends ViewPane {
         }
     }
     onDidChangeWorkbenchState() {
-        if (this.contextService.getWorkbenchState() !== 1  && this.searchWithoutFolderMessageElement) {
+        if (this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY && this.searchWithoutFolderMessageElement) {
             hide(this.searchWithoutFolderMessageElement);
         }
     }
@@ -325,14 +330,14 @@ let SearchView = class SearchView extends ViewPane {
         }));
         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.toggleQueryDetails(false);
             }
         }));
         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.searchWidget.isReplaceActive()) {
                     this.searchWidget.focusReplaceAllAction();
                 }
@@ -383,7 +388,7 @@ let SearchView = class SearchView extends ViewPane {
         this._register(this.inputPatternIncludes.onSubmit(onFilePatternSubmit));
         this._register(this.inputPatternExcludes.onSubmit(onFilePatternSubmit));
         this.messagesElement = append(this.container, $('.messages.text-search-provider-messages'));
-        if (this.contextService.getWorkbenchState() === 1 ) {
+        if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
             this.showSearchWithoutFolderMessage();
         }
         this.createSearchResultsView(this.container);
@@ -541,7 +546,7 @@ let SearchView = class SearchView extends ViewPane {
     refreshTree(event) {
         const collapseResults = this.searchConfig.collapseResults;
         if (!event || event.added || event.removed) {
-            if (this.searchConfig.sortOrder === "modified" ) {
+            if (this.searchConfig.sortOrder === SearchSortOrder.Modified) {
                 this.retrieveFileStats()
                     .then(() => this.tree.setChildren(null, this.createResultIterator(collapseResults)));
             }
@@ -550,8 +555,8 @@ let SearchView = class SearchView extends ViewPane {
             }
         }
         else {
-            if (this.searchConfig.sortOrder === "countAscending"  ||
-                this.searchConfig.sortOrder === "countDescending" ) {
+            if (this.searchConfig.sortOrder === SearchSortOrder.CountAscending ||
+                this.searchConfig.sortOrder === SearchSortOrder.CountDescending) {
                 this.tree.setChildren(null, this.createResultIterator(collapseResults));
             }
             else {
@@ -570,7 +575,7 @@ let SearchView = class SearchView extends ViewPane {
             return this.createFolderIterator(folderMatches[0], collapseResults, true);
         }
         return (
-             (Iterable.map(folderMatches, folderMatch => {
+             (Iterable.map(folderMatches, (folderMatch) => {
                 const children = this.createFolderIterator(folderMatch, collapseResults, true);
                 return { element: folderMatch, children, incompressible: true };
             }))
@@ -581,7 +586,7 @@ let SearchView = class SearchView extends ViewPane {
         const matchArray = this.isTreeLayoutViewVisible ? folderMatch.matches() : folderMatch.allDownstreamFileMatches();
         const matches = matchArray.sort((a, b) => searchMatchComparer(a, b, sortOrder));
         return (
-             (Iterable.map(matches, match => {
+             (Iterable.map(matches, (match) => {
                 let children;
                 if (match instanceof FileMatch) {
                     children = this.createFileIterator(match);
@@ -600,7 +605,7 @@ let SearchView = class SearchView extends ViewPane {
             matches = matches.filter(e => !e.aiContributed);
         }
         return (
-             (Iterable.map(matches, r => ({ element: r, incompressible: true })))
+             (Iterable.map(matches, (r) => ({ element: r, incompressible: true })))
         );
     }
     createIterator(match, collapseResults) {
@@ -1152,7 +1157,7 @@ let SearchView = class SearchView extends ViewPane {
     clearSearchResults(clearInput = true) {
         this.viewModel.searchResult.clear();
         this.showEmptyStage(true);
-        if (this.contextService.getWorkbenchState() === 1 ) {
+        if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
             this.showSearchWithoutFolderMessage();
         }
         if (clearInput) {
@@ -1374,7 +1379,7 @@ let SearchView = class SearchView extends ViewPane {
         };
         const folderResources = this.contextService.getWorkspace().folders;
         const onQueryValidationError = (err) => {
-            this.searchWidget.searchInput?.showMessage({ content: err.message, type: 3  });
+            this.searchWidget.searchInput?.showMessage({ content: err.message, type: MessageType.ERROR });
             this.viewModel.searchResult.clear();
         };
         let query;
@@ -1448,7 +1453,7 @@ let SearchView = class SearchView extends ViewPane {
             }
         }
         const hasResults = !this.viewModel.searchResult.isEmpty(this.aiResultsVisible);
-        if (completed?.exit === 1 ) {
+        if (completed?.exit === SearchCompletionExitCode.NewSearchStarted) {
             return;
         }
         if (!hasResults) {
@@ -1536,7 +1541,7 @@ let SearchView = class SearchView extends ViewPane {
                 const learnMoreButton = this.messageDisposables.add(( (new SearchLinkButton(( localizeWithPath(_moduleId, 37, "Learn More")), this.onLearnMore.bind(this), this.hoverService))));
                 append(messageEl, learnMoreButton.element);
             }
-            if (this.contextService.getWorkbenchState() === 1 ) {
+            if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
                 this.showSearchWithoutFolderMessage();
             }
             this.reLayout();
@@ -1572,7 +1577,7 @@ let SearchView = class SearchView extends ViewPane {
         }
         else {
             progressComplete();
-            this.searchWidget.searchInput?.showMessage({ content: e.message, type: 3  });
+            this.searchWidget.searchInput?.showMessage({ content: e.message, type: MessageType.ERROR });
             this.viewModel.searchResult.clear();
             return Promise.resolve();
         }
@@ -1598,7 +1603,7 @@ let SearchView = class SearchView extends ViewPane {
         this.viewModel.replaceString = this.searchWidget.getReplaceValue();
         const result = this.viewModel.search(query);
         if (this.aiResultsVisible) {
-            const aiResult = this.viewModel.aiSearch({ ...query, contentPattern: query.contentPattern.pattern, type: 3  });
+            const aiResult = this.viewModel.aiSearch({ ...query, contentPattern: query.contentPattern.pattern, type: QueryType.aiText });
             return result.asyncResults.then(() => aiResult.then((complete) => {
                 clearTimeout(slowTimer);
                 this.onSearchComplete(progressComplete, excludePatternText, includePatternText, complete);
@@ -1621,7 +1626,7 @@ let SearchView = class SearchView extends ViewPane {
     }
     openSettings(query) {
         const options = { query };
-        return this.contextService.getWorkbenchState() !== 1  ?
+        return this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ?
             this.preferencesService.openWorkspaceSettings(options) :
             this.preferencesService.openUserSettings(options);
     }
@@ -1668,7 +1673,7 @@ let SearchView = class SearchView extends ViewPane {
                 append(messageEl, $('span', undefined, searchingInOpenMessage, '(', disableOpenEditorsButton.element, ')'));
             }
             append(messageEl, ' - ');
-            const openInEditorTooltip = appendKeyBindingLabel(( localizeWithPath(_moduleId, 47, "Copy current search results to an editor")), this.keybindingService.lookupKeybinding("search.action.openInEditor" ));
+            const openInEditorTooltip = appendKeyBindingLabel(( localizeWithPath(_moduleId, 47, "Copy current search results to an editor")), this.keybindingService.lookupKeybinding(SearchCommandIds.OpenInEditorCommandId));
             const openInEditorButton = this.messageDisposables.add(( (new SearchLinkButton(( localizeWithPath(_moduleId, 48, "Open in editor")), () => this.instantiationService.invokeFunction(createEditorFromSearchResult, this.searchResult, this.searchIncludePattern.getValue(), this.searchExcludePattern.getValue(), this.searchIncludePattern.onlySearchInOpenEditors()), this.hoverService, openInEditorTooltip))));
             append(messageEl, openInEditorButton.element);
             this.reLayout();
@@ -1835,17 +1840,17 @@ let SearchView = class SearchView extends ViewPane {
         }
     }
     onFilesChanged(e) {
-        if (!this.viewModel || (this.searchConfig.sortOrder !== "modified"  && !e.gotDeleted())) {
+        if (!this.viewModel || (this.searchConfig.sortOrder !== SearchSortOrder.Modified && !e.gotDeleted())) {
             return;
         }
         const matches = this.viewModel.searchResult.matches();
         if (e.gotDeleted()) {
-            const deletedMatches = matches.filter(m => e.contains(m.resource, 2 ));
+            const deletedMatches = matches.filter(m => e.contains(m.resource, FileChangeType.DELETED));
             this.viewModel.searchResult.remove(deletedMatches);
         }
         else {
             const changedMatches = matches.filter(m => e.contains(m.resource));
-            if (changedMatches.length && this.searchConfig.sortOrder === "modified" ) {
+            if (changedMatches.length && this.searchConfig.sortOrder === SearchSortOrder.Modified) {
                 this.updateFileStats(changedMatches).then(() => this.refreshTree());
             }
         }
@@ -1989,7 +1994,7 @@ class SearchLinkButton extends Disposable {
         this._register(addDisposableListener(this.element, EventType.CLICK, wrappedHandler));
         this._register(addDisposableListener(this.element, EventType.KEY_DOWN, e => {
             const event = ( (new StandardKeyboardEvent(e)));
-            if (event.equals(10 ) || event.equals(3 )) {
+            if (event.equals(KeyCode.Space) || event.equals(KeyCode.Enter)) {
                 wrappedHandler(e);
                 event.preventDefault();
                 event.stopPropagation();