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

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

@@ -1,9 +1,9 @@
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { getSelectionKeyboardEvent } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
 import { searchRemoveIcon, searchReplaceIcon } from './searchIcons.js';
-import { RemoveActionId, SearchViewVisibleKey, FileMatchOrMatchFocusKey, ReplaceActionId, ReplaceActiveKey, MatchFocusKey, IsEditableItemKey, ReplaceAllInFileActionId, FileFocusKey, ReplaceAllInFolderActionId, FolderFocusKey } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
+import { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { IReplaceService } from 'vscode/vscode/vs/workbench/contrib/search/browser/replace';
 import { arrayContainsElementOrParent, SearchResult, Match, MatchInNotebook, FileMatch, FolderMatch } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
@@ -16,20 +16,20 @@ import { equals } from 'vscode/vscode/vs/base/common/arrays';
 registerAction2(class RemoveAction extends Action2 {
     constructor() {
         super({
-            id: RemoveActionId,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsRemoveReplace',
-                    'RemoveAction.label',
-                    "Dismiss"
-                )),
-                original: 'Dismiss'
-            },
+            id: "search.action.remove" ,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/search/browser/searchActionsRemoveReplace',
+                'RemoveAction.label',
+                "Dismiss"
+            )),
             category,
             icon: searchRemoveIcon,
             keybinding: {
                 weight: 200 ,
-                when: ( ContextKeyExpr.and(SearchViewVisibleKey, FileMatchOrMatchFocusKey)),
+                when: ( ContextKeyExpr.and(
+                    SearchContext.SearchViewVisibleKey,
+                    SearchContext.FileMatchOrMatchFocusKey
+                )),
                 primary: 20 ,
                 mac: {
                     primary: 2048  | 1 ,
@@ -101,23 +101,20 @@ registerAction2(class RemoveAction extends Action2 {
 registerAction2(class ReplaceAction extends Action2 {
     constructor() {
         super({
-            id: ReplaceActionId,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsRemoveReplace',
-                    'match.replace.label',
-                    "Replace"
-                )),
-                original: 'Replace'
-            },
+            id: "search.action.replace" ,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/search/browser/searchActionsRemoveReplace',
+                'match.replace.label',
+                "Replace"
+            )),
             category,
             keybinding: {
                 weight: 200 ,
                 when: ( ContextKeyExpr.and(
-                    SearchViewVisibleKey,
-                    ReplaceActiveKey,
-                    MatchFocusKey,
-                    IsEditableItemKey
+                    SearchContext.SearchViewVisibleKey,
+                    SearchContext.ReplaceActiveKey,
+                    SearchContext.MatchFocusKey,
+                    SearchContext.IsEditableItemKey
                 )),
                 primary: 1024  | 2048  | 22 ,
             },
@@ -126,9 +123,9 @@ registerAction2(class ReplaceAction extends Action2 {
                 {
                     id: MenuId.SearchContext,
                     when: ( ContextKeyExpr.and(
-                        ReplaceActiveKey,
-                        MatchFocusKey,
-                        IsEditableItemKey
+                        SearchContext.ReplaceActiveKey,
+                        SearchContext.MatchFocusKey,
+                        SearchContext.IsEditableItemKey
                     )),
                     group: 'search',
                     order: 1
@@ -136,9 +133,9 @@ registerAction2(class ReplaceAction extends Action2 {
                 {
                     id: MenuId.SearchActionMenu,
                     when: ( ContextKeyExpr.and(
-                        ReplaceActiveKey,
-                        MatchFocusKey,
-                        IsEditableItemKey
+                        SearchContext.ReplaceActiveKey,
+                        SearchContext.MatchFocusKey,
+                        SearchContext.IsEditableItemKey
                     )),
                     group: 'inline',
                     order: 1
@@ -153,23 +150,20 @@ registerAction2(class ReplaceAction extends Action2 {
 registerAction2(class ReplaceAllAction extends Action2 {
     constructor() {
         super({
-            id: ReplaceAllInFileActionId,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsRemoveReplace',
-                    'file.replaceAll.label',
-                    "Replace All"
-                )),
-                original: 'Replace All'
-            },
+            id: "search.action.replaceAllInFile" ,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/search/browser/searchActionsRemoveReplace',
+                'file.replaceAll.label',
+                "Replace All"
+            )),
             category,
             keybinding: {
                 weight: 200 ,
                 when: ( ContextKeyExpr.and(
-                    SearchViewVisibleKey,
-                    ReplaceActiveKey,
-                    FileFocusKey,
-                    IsEditableItemKey
+                    SearchContext.SearchViewVisibleKey,
+                    SearchContext.ReplaceActiveKey,
+                    SearchContext.FileFocusKey,
+                    SearchContext.IsEditableItemKey
                 )),
                 primary: 1024  | 2048  | 22 ,
                 secondary: [2048  | 1024  | 3 ],
@@ -179,9 +173,9 @@ registerAction2(class ReplaceAllAction extends Action2 {
                 {
                     id: MenuId.SearchContext,
                     when: ( ContextKeyExpr.and(
-                        ReplaceActiveKey,
-                        FileFocusKey,
-                        IsEditableItemKey
+                        SearchContext.ReplaceActiveKey,
+                        SearchContext.FileFocusKey,
+                        SearchContext.IsEditableItemKey
                     )),
                     group: 'search',
                     order: 1
@@ -189,9 +183,9 @@ registerAction2(class ReplaceAllAction extends Action2 {
                 {
                     id: MenuId.SearchActionMenu,
                     when: ( ContextKeyExpr.and(
-                        ReplaceActiveKey,
-                        FileFocusKey,
-                        IsEditableItemKey
+                        SearchContext.ReplaceActiveKey,
+                        SearchContext.FileFocusKey,
+                        SearchContext.IsEditableItemKey
                     )),
                     group: 'inline',
                     order: 1
@@ -206,23 +200,20 @@ registerAction2(class ReplaceAllAction extends Action2 {
 registerAction2(class ReplaceAllInFolderAction extends Action2 {
     constructor() {
         super({
-            id: ReplaceAllInFolderActionId,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsRemoveReplace',
-                    'file.replaceAll.label',
-                    "Replace All"
-                )),
-                original: 'Replace All'
-            },
+            id: "search.action.replaceAllInFolder" ,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/search/browser/searchActionsRemoveReplace',
+                'file.replaceAll.label',
+                "Replace All"
+            )),
             category,
             keybinding: {
                 weight: 200 ,
                 when: ( ContextKeyExpr.and(
-                    SearchViewVisibleKey,
-                    ReplaceActiveKey,
-                    FolderFocusKey,
-                    IsEditableItemKey
+                    SearchContext.SearchViewVisibleKey,
+                    SearchContext.ReplaceActiveKey,
+                    SearchContext.FolderFocusKey,
+                    SearchContext.IsEditableItemKey
                 )),
                 primary: 1024  | 2048  | 22 ,
                 secondary: [2048  | 1024  | 3 ],
@@ -232,9 +223,9 @@ registerAction2(class ReplaceAllInFolderAction extends Action2 {
                 {
                     id: MenuId.SearchContext,
                     when: ( ContextKeyExpr.and(
-                        ReplaceActiveKey,
-                        FolderFocusKey,
-                        IsEditableItemKey
+                        SearchContext.ReplaceActiveKey,
+                        SearchContext.FolderFocusKey,
+                        SearchContext.IsEditableItemKey
                     )),
                     group: 'search',
                     order: 1
@@ -242,9 +233,9 @@ registerAction2(class ReplaceAllInFolderAction extends Action2 {
                 {
                     id: MenuId.SearchActionMenu,
                     when: ( ContextKeyExpr.and(
-                        ReplaceActiveKey,
-                        FolderFocusKey,
-                        IsEditableItemKey
+                        SearchContext.ReplaceActiveKey,
+                        SearchContext.FolderFocusKey,
+                        SearchContext.IsEditableItemKey
                     )),
                     group: 'inline',
                     order: 1

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

@@ -1,5 +1,4 @@
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { ShowAllSymbolsActionId } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
+import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
 
@@ -13,19 +12,18 @@ registerAction2(class ShowAllSymbolsAction extends Action2 {
     static { this.ALL_SYMBOLS_PREFIX = '#'; }
     constructor() {
         super({
-            id: ShowAllSymbolsActionId,
+            id: "workbench.action.showAllSymbols" ,
             title: {
-                value: ( localizeWithPath(
+                ...( localize2WithPath(
                     'vs/workbench/contrib/search/browser/searchActionsSymbol',
                     'showTriggerActions',
                     "Go to Symbol in Workspace..."
                 )),
-                original: 'Go to Symbol in Workspace...',
                 mnemonicTitle: ( localizeWithPath(
                     'vs/workbench/contrib/search/browser/searchActionsSymbol',
                     { key: 'miGotoSymbolInWorkspace', comment: ['&& denotes a mnemonic'] },
                     "Go to Symbol in &&Workspace..."
-                ))
+                )),
             },
             f1: true,
             keybinding: {

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

@@ -1,5 +1,4 @@
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { QuickTextSearchActionId } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
+import { localize2WithPath } from 'vscode/vscode/vs/nls';
 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';
@@ -11,15 +10,12 @@ import { getSelectionTextFromEditor } from './searchView.js';
 registerAction2(class TextSearchQuickAccessAction extends Action2 {
     constructor() {
         super({
-            id: QuickTextSearchActionId,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsTextQuickAccess',
-                    'quickTextSearch',
-                    "Quick Search (Experimental)"
-                )),
-                original: 'Quick Search (Experimental)'
-            },
+            id: "workbench.action.experimental.quickTextSearch" ,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/search/browser/searchActionsTextQuickAccess',
+                'quickTextSearch',
+                "Quick Search (Experimental)"
+            )),
             category,
             f1: true
         });

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

@@ -1,8 +1,8 @@
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+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';
 import { searchStopIcon, searchRefreshIcon, searchCollapseAllIcon, searchExpandAllIcon, searchClearIcon, searchShowAsList, searchShowAsTree } from './searchIcons.js';
-import { ClearSearchHistoryCommandId, CancelSearchActionId, SearchViewVisibleKey, RefreshSearchResultsActionId, ViewHasSearchPatternKey, CollapseSearchResultsActionId, HasSearchResults, ViewHasSomeCollapsibleKey, ExpandSearchResultsActionId, ClearSearchResultsActionId, ViewHasReplacePatternKey, ViewHasFilePatternKey, ViewAsTreeActionId, InTreeViewKey, ViewAsListActionId } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
+import { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { ISearchHistoryService } from 'vscode/vscode/vs/workbench/contrib/search/common/searchHistoryService';
 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';
@@ -14,15 +14,12 @@ import { category, getSearchView } from 'vscode/vscode/vs/workbench/contrib/sear
 registerAction2(class ClearSearchHistoryCommandAction extends Action2 {
     constructor() {
         super({
-            id: ClearSearchHistoryCommandId,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsTopBar',
-                    'clearSearchHistoryLabel',
-                    "Clear Search History"
-                )),
-                original: 'Clear Search History'
-            },
+            id: "search.action.clearHistory" ,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/search/browser/searchActionsTopBar',
+                'clearSearchHistoryLabel',
+                "Clear Search History"
+            )),
             category,
             f1: true
         });
@@ -34,22 +31,19 @@ registerAction2(class ClearSearchHistoryCommandAction extends Action2 {
 registerAction2(class CancelSearchAction extends Action2 {
     constructor() {
         super({
-            id: CancelSearchActionId,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsTopBar',
-                    'CancelSearchAction.label',
-                    "Cancel Search"
-                )),
-                original: 'Cancel Search'
-            },
+            id: "search.action.cancel" ,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/search/browser/searchActionsTopBar',
+                'CancelSearchAction.label',
+                "Cancel Search"
+            )),
             icon: searchStopIcon,
             category,
             f1: true,
             precondition: ( ( SearchStateKey.isEqualTo(SearchUIState.Idle)).negate()),
             keybinding: {
                 weight: 200 ,
-                when: ( ContextKeyExpr.and(SearchViewVisibleKey, WorkbenchListFocusContextKey)),
+                when: ( ContextKeyExpr.and(SearchContext.SearchViewVisibleKey, WorkbenchListFocusContextKey)),
                 primary: 9 ,
             },
             menu: [{
@@ -67,17 +61,14 @@ registerAction2(class CancelSearchAction extends Action2 {
 registerAction2(class RefreshAction extends Action2 {
     constructor() {
         super({
-            id: RefreshSearchResultsActionId,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsTopBar',
-                    'RefreshAction.label',
-                    "Refresh"
-                )),
-                original: 'Refresh'
-            },
+            id: "search.action.refreshSearchResults" ,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/search/browser/searchActionsTopBar',
+                'RefreshAction.label',
+                "Refresh"
+            )),
             icon: searchRefreshIcon,
-            precondition: ViewHasSearchPatternKey,
+            precondition: SearchContext.ViewHasSearchPatternKey,
             category,
             f1: true,
             menu: [{
@@ -95,24 +86,24 @@ registerAction2(class RefreshAction extends Action2 {
 registerAction2(class CollapseDeepestExpandedLevelAction extends Action2 {
     constructor() {
         super({
-            id: CollapseSearchResultsActionId,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsTopBar',
-                    'CollapseDeepestExpandedLevelAction.label',
-                    "Collapse All"
-                )),
-                original: 'Collapse All'
-            },
+            id: "search.action.collapseSearchResults" ,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/search/browser/searchActionsTopBar',
+                'CollapseDeepestExpandedLevelAction.label',
+                "Collapse All"
+            )),
             category,
             icon: searchCollapseAllIcon,
             f1: true,
-            precondition: ( ContextKeyExpr.and(HasSearchResults, ViewHasSomeCollapsibleKey)),
+            precondition: ( ContextKeyExpr.and(
+                SearchContext.HasSearchResults,
+                SearchContext.ViewHasSomeCollapsibleKey
+            )),
             menu: [{
                     id: MenuId.ViewTitle,
                     group: 'navigation',
                     order: 3,
-                    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_ID)), ( ContextKeyExpr.or(( HasSearchResults.negate()), ViewHasSomeCollapsibleKey)))),
+                    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_ID)), ( ContextKeyExpr.or(( SearchContext.HasSearchResults.negate()), SearchContext.ViewHasSomeCollapsibleKey)))),
                 }]
         });
     }
@@ -123,24 +114,21 @@ registerAction2(class CollapseDeepestExpandedLevelAction extends Action2 {
 registerAction2(class ExpandAllAction extends Action2 {
     constructor() {
         super({
-            id: ExpandSearchResultsActionId,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsTopBar',
-                    'ExpandAllAction.label',
-                    "Expand All"
-                )),
-                original: 'Expand All'
-            },
+            id: "search.action.expandSearchResults" ,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/search/browser/searchActionsTopBar',
+                'ExpandAllAction.label',
+                "Expand All"
+            )),
             category,
             icon: searchExpandAllIcon,
             f1: true,
-            precondition: ( ContextKeyExpr.and(HasSearchResults, ( ViewHasSomeCollapsibleKey.toNegated()))),
+            precondition: ( ContextKeyExpr.and(SearchContext.HasSearchResults, ( SearchContext.ViewHasSomeCollapsibleKey.toNegated()))),
             menu: [{
                     id: MenuId.ViewTitle,
                     group: 'navigation',
                     order: 3,
-                    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_ID)), HasSearchResults, ( ViewHasSomeCollapsibleKey.toNegated()))),
+                    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_ID)), SearchContext.HasSearchResults, ( SearchContext.ViewHasSomeCollapsibleKey.toNegated()))),
                 }]
         });
     }
@@ -151,23 +139,20 @@ registerAction2(class ExpandAllAction extends Action2 {
 registerAction2(class ClearSearchResultsAction extends Action2 {
     constructor() {
         super({
-            id: ClearSearchResultsActionId,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsTopBar',
-                    'ClearSearchResultsAction.label',
-                    "Clear Search Results"
-                )),
-                original: 'Clear Search Results'
-            },
+            id: "search.action.clearSearchResults" ,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/search/browser/searchActionsTopBar',
+                'ClearSearchResultsAction.label',
+                "Clear Search Results"
+            )),
             category,
             icon: searchClearIcon,
             f1: true,
             precondition: ( ContextKeyExpr.or(
-                HasSearchResults,
-                ViewHasSearchPatternKey,
-                ViewHasReplacePatternKey,
-                ViewHasFilePatternKey
+                SearchContext.HasSearchResults,
+                SearchContext.ViewHasSearchPatternKey,
+                SearchContext.ViewHasReplacePatternKey,
+                SearchContext.ViewHasFilePatternKey
             )),
             menu: [{
                     id: MenuId.ViewTitle,
@@ -184,24 +169,21 @@ registerAction2(class ClearSearchResultsAction extends Action2 {
 registerAction2(class ViewAsTreeAction extends Action2 {
     constructor() {
         super({
-            id: ViewAsTreeActionId,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsTopBar',
-                    'ViewAsTreeAction.label',
-                    "View as Tree"
-                )),
-                original: 'View as Tree'
-            },
+            id: "search.action.viewAsTree" ,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/search/browser/searchActionsTopBar',
+                'ViewAsTreeAction.label',
+                "View as Tree"
+            )),
             category,
             icon: searchShowAsList,
             f1: true,
-            precondition: ( ContextKeyExpr.and(HasSearchResults, ( InTreeViewKey.toNegated()))),
+            precondition: ( ContextKeyExpr.and(SearchContext.HasSearchResults, ( SearchContext.InTreeViewKey.toNegated()))),
             menu: [{
                     id: MenuId.ViewTitle,
                     group: 'navigation',
                     order: 2,
-                    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_ID)), ( InTreeViewKey.toNegated()))),
+                    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_ID)), ( SearchContext.InTreeViewKey.toNegated()))),
                 }]
         });
     }
@@ -215,24 +197,24 @@ registerAction2(class ViewAsTreeAction extends Action2 {
 registerAction2(class ViewAsListAction extends Action2 {
     constructor() {
         super({
-            id: ViewAsListActionId,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsTopBar',
-                    'ViewAsListAction.label',
-                    "View as List"
-                )),
-                original: 'View as List'
-            },
+            id: "search.action.viewAsList" ,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/search/browser/searchActionsTopBar',
+                'ViewAsListAction.label',
+                "View as List"
+            )),
             category,
             icon: searchShowAsTree,
             f1: true,
-            precondition: ( ContextKeyExpr.and(HasSearchResults, InTreeViewKey)),
+            precondition: ( ContextKeyExpr.and(
+                SearchContext.HasSearchResults,
+                SearchContext.InTreeViewKey
+            )),
             menu: [{
                     id: MenuId.ViewTitle,
                     group: 'navigation',
                     order: 2,
-                    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_ID)), InTreeViewKey)),
+                    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_ID)), SearchContext.InTreeViewKey)),
                 }]
         });
     }

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

@@ -15,8 +15,8 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
 import { MenuWorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
-import { MatchFocusKey, FileFocusKey, FolderFocusKey, IsEditableItemKey } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { defaultCountBadgeStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
+import { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 
 var FolderMatchRenderer_1, FileMatchRenderer_1, MatchRenderer_1;
 class SearchDelegate {
@@ -85,9 +85,9 @@ let FolderMatchRenderer = class FolderMatchRenderer extends Disposable {
         const elementDisposables = ( new DisposableStore());
         disposables.add(elementDisposables);
         const contextKeyServiceMain = disposables.add(this.contextKeyService.createScoped(container));
-        MatchFocusKey.bindTo(contextKeyServiceMain).set(false);
-        FileFocusKey.bindTo(contextKeyServiceMain).set(false);
-        FolderFocusKey.bindTo(contextKeyServiceMain).set(true);
+        SearchContext.MatchFocusKey.bindTo(contextKeyServiceMain).set(false);
+        SearchContext.FileFocusKey.bindTo(contextKeyServiceMain).set(false);
+        SearchContext.FolderFocusKey.bindTo(contextKeyServiceMain).set(true);
         const instantiationService = this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, contextKeyServiceMain])));
         const actions = disposables.add(instantiationService.createInstance(MenuWorkbenchToolBar, actionBarContainer, MenuId.SearchActionMenu, {
             menuOptions: {
@@ -125,9 +125,9 @@ let FolderMatchRenderer = class FolderMatchRenderer extends Disposable {
                 "Other files"
             )));
         }
-        IsEditableItemKey.bindTo(templateData.contextKeyService).set(!folderMatch.hasOnlyReadOnlyMatches());
+        SearchContext.IsEditableItemKey.bindTo(templateData.contextKeyService).set(!folderMatch.hasOnlyReadOnlyMatches());
         templateData.elementDisposables.add(folderMatch.onChange(() => {
-            IsEditableItemKey.bindTo(templateData.contextKeyService).set(!folderMatch.hasOnlyReadOnlyMatches());
+            SearchContext.IsEditableItemKey.bindTo(templateData.contextKeyService).set(!folderMatch.hasOnlyReadOnlyMatches());
         }));
         this.renderFolderDetails(folderMatch, templateData);
     }
@@ -189,9 +189,9 @@ let FileMatchRenderer = class FileMatchRenderer extends Disposable {
         const badge = ( new CountBadge(append(fileMatchElement, $('.badge')), {}, defaultCountBadgeStyles));
         const actionBarContainer = append(fileMatchElement, $('.actionBarContainer'));
         const contextKeyServiceMain = disposables.add(this.contextKeyService.createScoped(container));
-        MatchFocusKey.bindTo(contextKeyServiceMain).set(false);
-        FileFocusKey.bindTo(contextKeyServiceMain).set(true);
-        FolderFocusKey.bindTo(contextKeyServiceMain).set(false);
+        SearchContext.MatchFocusKey.bindTo(contextKeyServiceMain).set(false);
+        SearchContext.FileFocusKey.bindTo(contextKeyServiceMain).set(true);
+        SearchContext.FolderFocusKey.bindTo(contextKeyServiceMain).set(false);
         const instantiationService = this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, contextKeyServiceMain])));
         const actions = disposables.add(instantiationService.createInstance(MenuWorkbenchToolBar, actionBarContainer, MenuId.SearchActionMenu, {
             menuOptions: {
@@ -231,9 +231,9 @@ let FileMatchRenderer = class FileMatchRenderer extends Disposable {
             count
         )));
         templateData.actions.context = { viewer: this.searchView.getControl(), element: fileMatch };
-        IsEditableItemKey.bindTo(templateData.contextKeyService).set(!fileMatch.hasOnlyReadOnlyMatches());
+        SearchContext.IsEditableItemKey.bindTo(templateData.contextKeyService).set(!fileMatch.hasOnlyReadOnlyMatches());
         templateData.elementDisposables.add(fileMatch.onChange(() => {
-            IsEditableItemKey.bindTo(templateData.contextKeyService).set(!fileMatch.hasOnlyReadOnlyMatches());
+            SearchContext.IsEditableItemKey.bindTo(templateData.contextKeyService).set(!fileMatch.hasOnlyReadOnlyMatches());
         }));
         const twistieContainer = templateData.el.parentElement?.parentElement?.querySelector('.monaco-tl-twistie');
         twistieContainer?.classList.add('force-twistie');
@@ -277,9 +277,9 @@ let MatchRenderer = class MatchRenderer extends Disposable {
         const actionBarContainer = append(container, $('span.actionBarContainer'));
         const disposables = ( new DisposableStore());
         const contextKeyServiceMain = disposables.add(this.contextKeyService.createScoped(container));
-        MatchFocusKey.bindTo(contextKeyServiceMain).set(true);
-        FileFocusKey.bindTo(contextKeyServiceMain).set(false);
-        FolderFocusKey.bindTo(contextKeyServiceMain).set(false);
+        SearchContext.MatchFocusKey.bindTo(contextKeyServiceMain).set(true);
+        SearchContext.FileFocusKey.bindTo(contextKeyServiceMain).set(false);
+        SearchContext.FolderFocusKey.bindTo(contextKeyServiceMain).set(false);
         const instantiationService = this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, contextKeyServiceMain])));
         const actions = disposables.add(instantiationService.createInstance(MenuWorkbenchToolBar, actionBarContainer, MenuId.SearchActionMenu, {
             menuOptions: {
@@ -314,7 +314,7 @@ let MatchRenderer = class MatchRenderer extends Disposable {
         templateData.replace.textContent = replace ? match.replaceString : '';
         templateData.after.textContent = preview.after;
         templateData.parent.title = (preview.fullBefore + (replace ? match.replaceString : preview.inside) + preview.after).trim().substr(0, 999);
-        IsEditableItemKey.bindTo(templateData.contextKeyService).set(!(match instanceof MatchInNotebook && match.isReadonly()));
+        SearchContext.IsEditableItemKey.bindTo(templateData.contextKeyService).set(!(match instanceof MatchInNotebook && match.isReadonly()));
         const numLines = match.range().endLineNumber - match.range().startLineNumber;
         const extraLinesStr = numLines > 0 ? `+${numLines}` : '';
         const showLineNumbers = this.configurationService.getValue('search').showLineNumbers;