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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-search-service-override",
-  "version": "5.2.0",
+  "version": "6.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -29,6 +29,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@5.2.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@6.0.0"
   }
 }

package/search.js

@@ -1,3 +1,4 @@
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { ISearchService } from 'vscode/vscode/vs/workbench/services/search/common/search.service';
 import { SearchService } from './vscode/src/vs/workbench/services/search/common/searchService.js';
@@ -7,13 +8,46 @@ import { SearchHistoryService } from './vscode/src/vs/workbench/contrib/search/c
 import { ISearchHistoryService } from 'vscode/vscode/vs/workbench/contrib/search/common/searchHistoryService.service';
 import { IReplaceService } from 'vscode/vscode/vs/workbench/contrib/search/browser/replace.service';
 import { ReplaceService } from './vscode/src/vs/workbench/contrib/search/browser/replaceService.js';
-import { RemoteSearchService } from './vscode/src/vs/workbench/services/search/browser/searchService.js';
+import { LocalFileSearchWorkerClient } from './vscode/src/vs/workbench/services/search/browser/searchService.js';
 import './vscode/src/vs/workbench/contrib/search/browser/search.contribution.js';
 import './vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.js';
+import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
 
-function getServiceOverride({ useHtmlFileSystemProvider = false } = {}) {
+function isHTMLFileSystemProvider(provider) {
+    return provider.directories != null;
+}
+let CustomSearchService = class CustomSearchService extends SearchService {
+    constructor(modelService, editorService, telemetryService, logService, extensionService, fileService, instantiationService, uriIdentityService) {
+        super(modelService, editorService, telemetryService, logService, extensionService, fileService, uriIdentityService);
+        this.instantiationService = instantiationService;
+        if (isHTMLFileSystemProvider(fileService.getProvider(Schemas.file))) {
+            const searchProvider = this.instantiationService.createInstance(LocalFileSearchWorkerClient);
+            this.registerSearchResultProvider(Schemas.file, 0 , searchProvider);
+            this.registerSearchResultProvider(Schemas.file, 1 , searchProvider);
+        }
+    }
+};
+CustomSearchService = __decorate([
+    ( __param(0, IModelService)),
+    ( __param(1, IEditorService)),
+    ( __param(2, ITelemetryService)),
+    ( __param(3, ILogService)),
+    ( __param(4, IExtensionService)),
+    ( __param(5, IFileService)),
+    ( __param(6, IInstantiationService)),
+    ( __param(7, IUriIdentityService))
+], CustomSearchService);
+function getServiceOverride() {
     return {
-        [( ISearchService.toString())]: useHtmlFileSystemProvider ? new SyncDescriptor(RemoteSearchService, [], true) : new SyncDescriptor(SearchService, [], true),
+        [( ISearchService.toString())]: new SyncDescriptor(CustomSearchService, [], true),
         [( ISearchViewModelWorkbenchService.toString())]: new SyncDescriptor(SearchViewModelWorkbenchService, [], true),
         [( ISearchHistoryService.toString())]: new SyncDescriptor(SearchHistoryService, [], true),
         [( IReplaceService.toString())]: new SyncDescriptor(ReplaceService, [], true)

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

@@ -4,6 +4,7 @@ import { Toggle } from 'vscode/vscode/vs/base/browser/ui/toggle/toggle';
 import { Widget } from 'vscode/vscode/vs/base/browser/ui/widget';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { ContextScopedHistoryInputBox } from 'vscode/vscode/vs/platform/history/browser/contextScopedHistoryWidget';
 import { showHistoryKeybindingHint } from 'vscode/vscode/vs/platform/history/browser/historyWidgetKeybindingHint';
@@ -117,11 +118,11 @@ let PatternInputWidget = class PatternInputWidget extends Widget {
     }
     onInputKeyUp(keyboardEvent) {
         switch (keyboardEvent.keyCode) {
-            case 3 :
+            case KeyCode.Enter:
                 this.onSearchSubmit();
                 this._onSubmit.fire(false);
                 return;
-            case 9 :
+            case KeyCode.Escape:
                 this._onCancel.fire();
                 return;
         }

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

@@ -1,9 +1,10 @@
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ReplacePreviewContentProvider } from './replaceService.js';
-import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 
 function registerContributions() {
-    registerWorkbenchContribution2(ReplacePreviewContentProvider.ID, ReplacePreviewContentProvider, 1 );
+    registerWorkbenchContribution2(ReplacePreviewContentProvider.ID, ReplacePreviewContentProvider, WorkbenchPhase.BlockStartup );
 }
 
 export { registerContributions };

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

@@ -9,6 +9,7 @@ import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/langu
 import { Match, MatchInNotebook, FileMatch } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
 import { ISearchViewModelWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel.service';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
+import { ScrollType } from 'vscode/vscode/vs/editor/common/editorCommon';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { createTextBufferFactoryFromSnapshot } from 'vscode/vscode/vs/editor/common/model/textModel';
 import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
@@ -148,7 +149,7 @@ let ReplaceService = class ReplaceService {
         if (editor) {
             const editorControl = editor.getControl();
             if (element instanceof Match && editorControl) {
-                editorControl.revealLineInCenter(element.range().startLineNumber, 1 );
+                editorControl.revealLineInCenter(element.range().startLineNumber, ScrollType.Immediate);
             }
         }
     }

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

@@ -1,29 +1,32 @@
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { isMacintosh } from 'vscode/vscode/vs/base/common/platform';
 import { AbstractGotoLineQuickAccessProvider } from 'vscode/vscode/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess';
 import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
-import { Extensions as Extensions$2 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions as Extensions$2, ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { Extensions as Extensions$1 } from 'vscode/vscode/vs/platform/quickinput/common/quickAccess';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { defaultQuickAccessContextKeyValue } from 'vscode/vscode/vs/workbench/browser/quickaccess';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/views';
+import { Extensions, ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { GotoSymbolQuickAccessProvider } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess';
-import { AnythingQuickAccessProvider } from './anythingQuickAccess.js';
+import { AnythingQuickAccessProvider } from 'vscode/vscode/vs/workbench/contrib/search/browser/anythingQuickAccess';
 import { registerContributions } from './replaceContributions.js';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import 'vscode/vscode/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchService';
 import { searchViewIcon } from './searchIcons.js';
 import { SearchView } from './searchView.js';
 import { registerContributions as registerContributions$1 } from './searchWidget.js';
-import { SymbolsQuickAccessProvider } from './symbolsQuickAccess.js';
+import { SymbolsQuickAccessProvider } from 'vscode/vscode/vs/workbench/contrib/search/browser/symbolsQuickAccess';
 import '../common/searchHistoryService.js';
 import 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
-import { VIEWLET_ID, VIEW_ID, SEARCH_EXCLUDE_CONFIG } from 'vscode/vscode/vs/workbench/services/search/common/search';
+import { VIEWLET_ID, VIEW_ID, SEARCH_EXCLUDE_CONFIG, SearchSortOrder, ViewMode } from 'vscode/vscode/vs/workbench/services/search/common/search';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { assertType } from 'vscode/vscode/vs/base/common/types';
 import { getWorkspaceSymbols } from 'vscode/vscode/vs/workbench/contrib/search/common/search';
+import { SearchCommandIds } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import './searchActionsCopy.js';
 import 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsFind';
 import './searchActionsNav.js';
@@ -48,7 +51,7 @@ const viewContainer = ( (Registry.as(Extensions.ViewContainersRegistry))).regist
     hideIfEmpty: true,
     icon: searchViewIcon,
     order: 1,
-}, 0 , { doNotRegisterOpenCommand: true });
+}, ViewContainerLocation.Sidebar, { doNotRegisterOpenCommand: true });
 const viewDescriptor = {
     id: VIEW_ID,
     containerIcon: searchViewIcon,
@@ -60,7 +63,7 @@ const viewDescriptor = {
         id: viewContainer.id,
         mnemonicTitle: ( localizeWithPath(_moduleId, 1, "&&Search")),
         keybindings: {
-            primary: 2048  | 1024  | 36 ,
+            primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyF,
             when: ( (ContextKeyExpr.regex('neverMatch', /doesNotMatch/)))
         },
         order: 1
@@ -90,7 +93,7 @@ quickAccessRegistry.registerQuickAccessProvider({
     prefix: SymbolsQuickAccessProvider.PREFIX,
     placeholder: ( localizeWithPath(_moduleId, 4, "Type the name of a symbol to open.")),
     contextKey: 'inWorkspaceSymbolsPicker',
-    helpEntries: [{ description: ( localizeWithPath(_moduleId, 5, "Go to Symbol in Workspace")), commandId: "workbench.action.showAllSymbols"  }]
+    helpEntries: [{ description: ( localizeWithPath(_moduleId, 5, "Go to Symbol in Workspace")), commandId: SearchCommandIds.ShowAllSymbolsActionId }]
 });
 quickAccessRegistry.registerQuickAccessProvider({
     ctor: TextSearchQuickAccess,
@@ -100,7 +103,7 @@ quickAccessRegistry.registerQuickAccessProvider({
     helpEntries: [
         {
             description: ( localizeWithPath(_moduleId, 7, "Search for Text")),
-            commandId: "workbench.action.quickTextSearch" ,
+            commandId: SearchCommandIds.QuickTextSearchActionId,
             commandCenterOrder: 25,
         }
     ]
@@ -147,7 +150,7 @@ configurationRegistry.registerConfiguration({
                     }
                 ]
             },
-            scope: 4
+            scope: ConfigurationScope.RESOURCE
         },
         [SEARCH_MODE_CONFIG]: {
             type: 'string',
@@ -208,7 +211,7 @@ configurationRegistry.registerConfiguration({
                 "Controls whether to use `.gitignore` and `.ignore` files when searching for files."
             )),
             default: true,
-            scope: 4
+            scope: ConfigurationScope.RESOURCE
         },
         'search.useGlobalIgnoreFiles': {
             type: 'boolean',
@@ -218,7 +221,7 @@ configurationRegistry.registerConfiguration({
                 "Controls whether to use your global gitignore file (for example, from `$HOME/.config/git/ignore`) when searching for files. Requires `#search.useIgnoreFiles#` to be enabled."
             )),
             default: false,
-            scope: 4
+            scope: ConfigurationScope.RESOURCE
         },
         'search.useParentIgnoreFiles': {
             type: 'boolean',
@@ -228,7 +231,7 @@ configurationRegistry.registerConfiguration({
                 "Controls whether to use `.gitignore` and `.ignore` files in parent directories when searching for files. Requires `#search.useIgnoreFiles#` to be enabled."
             )),
             default: false,
-            scope: 4
+            scope: ConfigurationScope.RESOURCE
         },
         'search.quickOpen.includeSymbols': {
             type: 'boolean',
@@ -473,8 +476,8 @@ configurationRegistry.registerConfiguration({
         },
         'search.sortOrder': {
             type: 'string',
-            enum: ["default" , "fileNames" , "type" , "modified" , "countDescending" , "countAscending" ],
-            default: "default" ,
+            enum: [SearchSortOrder.Default, SearchSortOrder.FileNames, SearchSortOrder.Type, SearchSortOrder.Modified, SearchSortOrder.CountDescending, SearchSortOrder.CountAscending],
+            default: SearchSortOrder.Default,
             enumDescriptions: [
                 ( localizeWithPath(
                     _moduleId,
@@ -525,8 +528,8 @@ configurationRegistry.registerConfiguration({
         },
         'search.defaultViewMode': {
             type: 'string',
-            enum: ["tree" , "list" ],
-            default: "list" ,
+            enum: [ViewMode.Tree, ViewMode.List],
+            default: ViewMode.List,
             enumDescriptions: [
                 ( localizeWithPath(_moduleId, 65, "Shows search results as a tree.")),
                 ( localizeWithPath(_moduleId, 66, "Shows search results as a list."))

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

@@ -2,9 +2,11 @@ import { localize2WithPath } from 'vscode/vscode/vs/nls';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService.service';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
-import { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
+import { SearchCommandIds, SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { FileMatch, FolderMatchWithResource, Match, FolderMatch, searchMatchComparer } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { category, getSearchView } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsBase';
 import { isWindows } from 'vscode/vscode/vs/base/common/platform';
 
@@ -12,13 +14,13 @@ const _moduleId = "vs/workbench/contrib/search/browser/searchActionsCopy";
 registerAction2(class CopyMatchCommandAction extends Action2 {
     constructor() {
         super({
-            id: "search.action.copyMatch" ,
+            id: SearchCommandIds.CopyMatchCommandId,
             title: ( localize2WithPath(_moduleId, 0, "Copy")),
             category,
             keybinding: {
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: SearchContext.FileMatchOrMatchFocusKey,
-                primary: 2048  | 33 ,
+                primary: KeyMod.CtrlCmd | KeyCode.KeyC,
             },
             menu: [{
                     id: MenuId.SearchContext,
@@ -35,15 +37,15 @@ registerAction2(class CopyMatchCommandAction extends Action2 {
 registerAction2(class CopyPathCommandAction extends Action2 {
     constructor() {
         super({
-            id: "search.action.copyPath" ,
+            id: SearchCommandIds.CopyPathCommandId,
             title: ( localize2WithPath(_moduleId, 1, "Copy Path")),
             category,
             keybinding: {
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: SearchContext.FileMatchOrFolderMatchWithResourceFocusKey,
-                primary: 2048  | 512  | 33 ,
+                primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyC,
                 win: {
-                    primary: 1024  | 512  | 33
+                    primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KeyC
                 },
             },
             menu: [{
@@ -61,7 +63,7 @@ registerAction2(class CopyPathCommandAction extends Action2 {
 registerAction2(class CopyAllCommandAction extends Action2 {
     constructor() {
         super({
-            id: "search.action.copyAll" ,
+            id: SearchCommandIds.CopyAllCommandId,
             title: ( localize2WithPath(_moduleId, 2, "Copy All")),
             category,
             menu: [{

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

@@ -2,7 +2,7 @@ import { isMacintosh } from 'vscode/vscode/vs/base/common/platform';
 import { localize2WithPath } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
-import { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
+import { SearchCommandIds, SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { InSearchEditor } from 'vscode/vscode/vs/workbench/contrib/searchEditor/browser/constants';
 import { FolderMatch } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
 import { SearchEditorInput } from '../../searchEditor/browser/searchEditorInput.js';
@@ -11,6 +11,8 @@ import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/cont
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { assertIsDefined } from 'vscode/vscode/vs/base/common/types';
 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 { ToggleCaseSensitiveKeybinding, ToggleWholeWordKeybinding, ToggleRegexKeybinding, TogglePreserveCaseKeybinding } from 'vscode/vscode/vs/editor/contrib/find/browser/findModel';
 import { category, getSearchView, openSearchView } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsBase';
 import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
@@ -20,13 +22,13 @@ const _moduleId = "vs/workbench/contrib/search/browser/searchActionsNav";
 registerAction2(class ToggleQueryDetailsAction extends Action2 {
     constructor() {
         super({
-            id: "workbench.action.search.toggleQueryDetails" ,
+            id: SearchCommandIds.ToggleQueryDetailsActionId,
             title: ( localize2WithPath(_moduleId, 0, "Toggle Query Details")),
             category,
             keybinding: {
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: ( (ContextKeyExpr.or(SearchContext.SearchViewFocusedKey, InSearchEditor))),
-                primary: 2048  | 1024  | 40 ,
+                primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyJ,
             },
         });
     }
@@ -44,16 +46,16 @@ registerAction2(class ToggleQueryDetailsAction extends Action2 {
 registerAction2(class CloseReplaceAction extends Action2 {
     constructor() {
         super({
-            id: "closeReplaceInFilesWidget" ,
+            id: SearchCommandIds.CloseReplaceWidgetActionId,
             title: ( localize2WithPath(_moduleId, 1, "Close Replace Widget")),
             category,
             keybinding: {
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: ( (ContextKeyExpr.and(
                     SearchContext.SearchViewVisibleKey,
                     SearchContext.ReplaceInputBoxFocusedKey
                 ))),
-                primary: 9 ,
+                primary: KeyCode.Escape,
             },
         });
     }
@@ -69,11 +71,11 @@ registerAction2(class CloseReplaceAction extends Action2 {
 registerAction2(class ToggleCaseSensitiveCommandAction extends Action2 {
     constructor() {
         super({
-            id: "toggleSearchCaseSensitive" ,
+            id: SearchCommandIds.ToggleCaseSensitiveCommandId,
             title: ( localize2WithPath(_moduleId, 2, "Toggle Case Sensitive")),
             category,
             keybinding: Object.assign({
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: isMacintosh ? ( (ContextKeyExpr.and(
                     SearchContext.SearchViewFocusedKey,
                      (SearchContext.FileMatchOrFolderMatchFocusKey.toNegated())
@@ -88,10 +90,10 @@ registerAction2(class ToggleCaseSensitiveCommandAction extends Action2 {
 registerAction2(class ToggleWholeWordCommandAction extends Action2 {
     constructor() {
         super({
-            id: "toggleSearchWholeWord" ,
+            id: SearchCommandIds.ToggleWholeWordCommandId,
             title: ( localize2WithPath(_moduleId, 3, "Toggle Whole Word")),
             keybinding: Object.assign({
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: SearchContext.SearchViewFocusedKey,
             }, ToggleWholeWordKeybinding),
             category,
@@ -104,10 +106,10 @@ registerAction2(class ToggleWholeWordCommandAction extends Action2 {
 registerAction2(class ToggleRegexCommandAction extends Action2 {
     constructor() {
         super({
-            id: "toggleSearchRegex" ,
+            id: SearchCommandIds.ToggleRegexCommandId,
             title: ( localize2WithPath(_moduleId, 4, "Toggle Regex")),
             keybinding: Object.assign({
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: SearchContext.SearchViewFocusedKey,
             }, ToggleRegexKeybinding),
             category,
@@ -120,10 +122,10 @@ registerAction2(class ToggleRegexCommandAction extends Action2 {
 registerAction2(class TogglePreserveCaseAction extends Action2 {
     constructor() {
         super({
-            id: "toggleSearchPreserveCase" ,
+            id: SearchCommandIds.TogglePreserveCaseId,
             title: ( localize2WithPath(_moduleId, 5, "Toggle Preserve Case")),
             keybinding: Object.assign({
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: SearchContext.SearchViewFocusedKey,
             }, TogglePreserveCaseKeybinding),
             category,
@@ -136,16 +138,16 @@ registerAction2(class TogglePreserveCaseAction extends Action2 {
 registerAction2(class OpenMatchAction extends Action2 {
     constructor() {
         super({
-            id: "search.action.openResult" ,
+            id: SearchCommandIds.OpenMatch,
             title: ( localize2WithPath(_moduleId, 6, "Open Match")),
             category,
             keybinding: {
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: ( (ContextKeyExpr.and(SearchContext.SearchViewVisibleKey, SearchContext.FileMatchOrMatchFocusKey))),
-                primary: 3 ,
+                primary: KeyCode.Enter,
                 mac: {
-                    primary: 3 ,
-                    secondary: [2048  | 18 ]
+                    primary: KeyCode.Enter,
+                    secondary: [KeyMod.CtrlCmd | KeyCode.DownArrow]
                 },
             },
         });
@@ -168,15 +170,15 @@ registerAction2(class OpenMatchAction extends Action2 {
 registerAction2(class OpenMatchToSideAction extends Action2 {
     constructor() {
         super({
-            id: "search.action.openResultToSide" ,
+            id: SearchCommandIds.OpenMatchToSide,
             title: ( localize2WithPath(_moduleId, 7, "Open Match To Side")),
             category,
             keybinding: {
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: ( (ContextKeyExpr.and(SearchContext.SearchViewVisibleKey, SearchContext.FileMatchOrMatchFocusKey))),
-                primary: 2048  | 3 ,
+                primary: KeyMod.CtrlCmd | KeyCode.Enter,
                 mac: {
-                    primary: 256  | 3
+                    primary: KeyMod.WinCtrl | KeyCode.Enter
                 },
             },
         });
@@ -192,12 +194,12 @@ registerAction2(class OpenMatchToSideAction extends Action2 {
 registerAction2(class AddCursorsAtSearchResultsAction extends Action2 {
     constructor() {
         super({
-            id: "addCursorsAtSearchResults" ,
+            id: SearchCommandIds.AddCursorsAtSearchResults,
             title: ( localize2WithPath(_moduleId, 8, "Add Cursors at Search Results")),
             keybinding: {
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: ( (ContextKeyExpr.and(SearchContext.SearchViewVisibleKey, SearchContext.FileMatchOrMatchFocusKey))),
-                primary: 2048  | 1024  | 42 ,
+                primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyL,
             },
             category,
         });
@@ -213,16 +215,16 @@ registerAction2(class AddCursorsAtSearchResultsAction extends Action2 {
 registerAction2(class FocusNextInputAction extends Action2 {
     constructor() {
         super({
-            id: "search.focus.nextInputBox" ,
+            id: SearchCommandIds.FocusNextInputActionId,
             title: ( localize2WithPath(_moduleId, 9, "Focus Next Input")),
             category,
             keybinding: {
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: ( (ContextKeyExpr.or(
                      (ContextKeyExpr.and(InSearchEditor, SearchContext.InputBoxFocusedKey)),
                      (ContextKeyExpr.and(SearchContext.SearchViewVisibleKey, SearchContext.InputBoxFocusedKey))
                 ))),
-                primary: 2048  | 18 ,
+                primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
             },
         });
     }
@@ -239,11 +241,11 @@ registerAction2(class FocusNextInputAction extends Action2 {
 registerAction2(class FocusPreviousInputAction extends Action2 {
     constructor() {
         super({
-            id: "search.focus.previousInputBox" ,
+            id: SearchCommandIds.FocusPreviousInputActionId,
             title: ( localize2WithPath(_moduleId, 10, "Focus Previous Input")),
             category,
             keybinding: {
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: ( (ContextKeyExpr.or(
                      (ContextKeyExpr.and(InSearchEditor, SearchContext.InputBoxFocusedKey)),
                      (ContextKeyExpr.and(
@@ -252,7 +254,7 @@ registerAction2(class FocusPreviousInputAction extends Action2 {
                          (SearchContext.SearchInputBoxFocusedKey.toNegated())
                     ))
                 ))),
-                primary: 2048  | 16 ,
+                primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
             },
         });
     }
@@ -269,16 +271,16 @@ registerAction2(class FocusPreviousInputAction extends Action2 {
 registerAction2(class FocusSearchFromResultsAction extends Action2 {
     constructor() {
         super({
-            id: "search.action.focusSearchFromResults" ,
+            id: SearchCommandIds.FocusSearchFromResults,
             title: ( localize2WithPath(_moduleId, 11, "Focus Search From Results")),
             category,
             keybinding: {
-                weight: 200 ,
+                weight: KeybindingWeight.WorkbenchContrib,
                 when: ( (ContextKeyExpr.and(
                     SearchContext.SearchViewVisibleKey,
                      (ContextKeyExpr.or(SearchContext.FirstMatchFocusKey, CONTEXT_ACCESSIBILITY_MODE_ENABLED))
                 ))),
-                primary: 2048  | 16 ,
+                primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
             },
         });
     }
@@ -291,7 +293,7 @@ registerAction2(class ToggleSearchOnTypeAction extends Action2 {
     static { this.searchOnTypeKey = 'search.searchOnType'; }
     constructor() {
         super({
-            id: "workbench.action.toggleSearchOnType" ,
+            id: SearchCommandIds.ToggleSearchOnTypeActionId,
             title: ( localize2WithPath(_moduleId, 12, "Toggle Search on Type")),
             category,
         });
@@ -305,7 +307,7 @@ registerAction2(class ToggleSearchOnTypeAction extends Action2 {
 registerAction2(class FocusSearchListCommandAction extends Action2 {
     constructor() {
         super({
-            id: "search.action.focusSearchList" ,
+            id: SearchCommandIds.FocusSearchListCommandID,
             title: ( localize2WithPath(_moduleId, 13, "Focus List")),
             category,
             f1: true
@@ -318,11 +320,11 @@ registerAction2(class FocusSearchListCommandAction extends Action2 {
 registerAction2(class FocusNextSearchResultAction extends Action2 {
     constructor() {
         super({
-            id: "search.action.focusNextSearchResult" ,
+            id: SearchCommandIds.FocusNextSearchResultActionId,
             title: ( localize2WithPath(_moduleId, 14, "Focus Next Search Result")),
             keybinding: [{
-                    primary: 62 ,
-                    weight: 200 ,
+                    primary: KeyCode.F4,
+                    weight: KeybindingWeight.WorkbenchContrib,
                 }],
             category,
             f1: true,
@@ -336,11 +338,11 @@ registerAction2(class FocusNextSearchResultAction extends Action2 {
 registerAction2(class FocusPreviousSearchResultAction extends Action2 {
     constructor() {
         super({
-            id: "search.action.focusPreviousSearchResult" ,
+            id: SearchCommandIds.FocusPreviousSearchResultActionId,
             title: ( localize2WithPath(_moduleId, 15, "Focus Previous Search Result")),
             keybinding: [{
-                    primary: 1024  | 62 ,
-                    weight: 200 ,
+                    primary: KeyMod.Shift | KeyCode.F4,
+                    weight: KeybindingWeight.WorkbenchContrib,
                 }],
             category,
             f1: true,
@@ -354,11 +356,11 @@ registerAction2(class FocusPreviousSearchResultAction extends Action2 {
 registerAction2(class ReplaceInFilesAction extends Action2 {
     constructor() {
         super({
-            id: "workbench.action.replaceInFiles" ,
+            id: SearchCommandIds.ReplaceInFilesActionId,
             title: ( localize2WithPath(_moduleId, 16, "Replace in Files")),
             keybinding: [{
-                    primary: 2048  | 1024  | 38 ,
-                    weight: 200 ,
+                    primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyH,
+                    weight: KeybindingWeight.WorkbenchContrib,
                 }],
             category,
             f1: true,