@codingame/monaco-vscode-search-service-override 4.5.1 → 4.5.2

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

@@ -11,15 +11,12 @@ import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/acti
 import { SearchStateKey, SearchUIState } from 'vscode/vscode/vs/workbench/contrib/search/common/search';
 import { category, getSearchView } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsBase';
 
+const _moduleId = "vs/workbench/contrib/search/browser/searchActionsTopBar";
 registerAction2(class ClearSearchHistoryCommandAction extends Action2 {
     constructor() {
         super({
             id: "search.action.clearHistory" ,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/search/browser/searchActionsTopBar',
-                'clearSearchHistoryLabel',
-                "Clear Search History"
-            )),
+            title: ( localize2WithPath(_moduleId, 0, "Clear Search History")),
             category,
             f1: true
         });
@@ -32,25 +29,24 @@ registerAction2(class CancelSearchAction extends Action2 {
     constructor() {
         super({
             id: "search.action.cancel" ,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/search/browser/searchActionsTopBar',
-                'CancelSearchAction.label',
-                "Cancel Search"
-            )),
+            title: ( localize2WithPath(_moduleId, 1, "Cancel Search")),
             icon: searchStopIcon,
             category,
             f1: true,
-            precondition: ( ( SearchStateKey.isEqualTo(SearchUIState.Idle)).negate()),
+            precondition: ( (( (SearchStateKey.isEqualTo(SearchUIState.Idle))).negate())),
             keybinding: {
                 weight: 200 ,
-                when: ( ContextKeyExpr.and(SearchContext.SearchViewVisibleKey, WorkbenchListFocusContextKey)),
+                when: ( (ContextKeyExpr.and(SearchContext.SearchViewVisibleKey, WorkbenchListFocusContextKey))),
                 primary: 9 ,
             },
             menu: [{
                     id: MenuId.ViewTitle,
                     group: 'navigation',
                     order: 0,
-                    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_ID)), ( SearchStateKey.isEqualTo(SearchUIState.SlowSearch)))),
+                    when: ( (ContextKeyExpr.and(
+                         (ContextKeyExpr.equals('view', VIEW_ID)),
+                         (SearchStateKey.isEqualTo(SearchUIState.SlowSearch))
+                    ))),
                 }]
         });
     }
@@ -62,11 +58,7 @@ registerAction2(class RefreshAction extends Action2 {
     constructor() {
         super({
             id: "search.action.refreshSearchResults" ,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/search/browser/searchActionsTopBar',
-                'RefreshAction.label',
-                "Refresh"
-            )),
+            title: ( localize2WithPath(_moduleId, 2, "Refresh")),
             icon: searchRefreshIcon,
             precondition: SearchContext.ViewHasSearchPatternKey,
             category,
@@ -75,7 +67,10 @@ registerAction2(class RefreshAction extends Action2 {
                     id: MenuId.ViewTitle,
                     group: 'navigation',
                     order: 0,
-                    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_ID)), ( ( SearchStateKey.isEqualTo(SearchUIState.SlowSearch)).negate()))),
+                    when: ( (ContextKeyExpr.and(
+                         (ContextKeyExpr.equals('view', VIEW_ID)),
+                         (( (SearchStateKey.isEqualTo(SearchUIState.SlowSearch))).negate())
+                    ))),
                 }]
         });
     }
@@ -87,23 +82,22 @@ registerAction2(class CollapseDeepestExpandedLevelAction extends Action2 {
     constructor() {
         super({
             id: "search.action.collapseSearchResults" ,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/search/browser/searchActionsTopBar',
-                'CollapseDeepestExpandedLevelAction.label',
-                "Collapse All"
-            )),
+            title: ( localize2WithPath(_moduleId, 3, "Collapse All")),
             category,
             icon: searchCollapseAllIcon,
             f1: true,
-            precondition: ( ContextKeyExpr.and(
-                SearchContext.HasSearchResults,
-                SearchContext.ViewHasSomeCollapsibleKey
-            )),
+            precondition: ( (ContextKeyExpr.and(SearchContext.HasSearchResults, SearchContext.ViewHasSomeCollapsibleKey))),
             menu: [{
                     id: MenuId.ViewTitle,
                     group: 'navigation',
                     order: 4,
-                    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_ID)), ( ContextKeyExpr.or(( SearchContext.HasSearchResults.negate()), SearchContext.ViewHasSomeCollapsibleKey)))),
+                    when: ( (ContextKeyExpr.and(
+                         (ContextKeyExpr.equals('view', VIEW_ID)),
+                         (ContextKeyExpr.or(
+                             (SearchContext.HasSearchResults.negate()),
+                            SearchContext.ViewHasSomeCollapsibleKey
+                        ))
+                    ))),
                 }]
         });
     }
@@ -115,20 +109,23 @@ registerAction2(class ExpandAllAction extends Action2 {
     constructor() {
         super({
             id: "search.action.expandSearchResults" ,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/search/browser/searchActionsTopBar',
-                'ExpandAllAction.label',
-                "Expand All"
-            )),
+            title: ( localize2WithPath(_moduleId, 4, "Expand All")),
             category,
             icon: searchExpandAllIcon,
             f1: true,
-            precondition: ( ContextKeyExpr.and(SearchContext.HasSearchResults, ( SearchContext.ViewHasSomeCollapsibleKey.toNegated()))),
+            precondition: ( (ContextKeyExpr.and(
+                SearchContext.HasSearchResults,
+                 (SearchContext.ViewHasSomeCollapsibleKey.toNegated())
+            ))),
             menu: [{
                     id: MenuId.ViewTitle,
                     group: 'navigation',
                     order: 4,
-                    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_ID)), SearchContext.HasSearchResults, ( SearchContext.ViewHasSomeCollapsibleKey.toNegated()))),
+                    when: ( (ContextKeyExpr.and(
+                         (ContextKeyExpr.equals('view', VIEW_ID)),
+                        SearchContext.HasSearchResults,
+                         (SearchContext.ViewHasSomeCollapsibleKey.toNegated())
+                    ))),
                 }]
         });
     }
@@ -140,25 +137,21 @@ registerAction2(class ClearSearchResultsAction extends Action2 {
     constructor() {
         super({
             id: "search.action.clearSearchResults" ,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/search/browser/searchActionsTopBar',
-                'ClearSearchResultsAction.label',
-                "Clear Search Results"
-            )),
+            title: ( localize2WithPath(_moduleId, 5, "Clear Search Results")),
             category,
             icon: searchClearIcon,
             f1: true,
-            precondition: ( ContextKeyExpr.or(
+            precondition: ( (ContextKeyExpr.or(
                 SearchContext.HasSearchResults,
                 SearchContext.ViewHasSearchPatternKey,
                 SearchContext.ViewHasReplacePatternKey,
                 SearchContext.ViewHasFilePatternKey
-            )),
+            ))),
             menu: [{
                     id: MenuId.ViewTitle,
                     group: 'navigation',
                     order: 1,
-                    when: ( ContextKeyExpr.equals('view', VIEW_ID)),
+                    when: ( (ContextKeyExpr.equals('view', VIEW_ID))),
                 }]
         });
     }
@@ -170,20 +163,22 @@ registerAction2(class ViewAsTreeAction extends Action2 {
     constructor() {
         super({
             id: "search.action.viewAsTree" ,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/search/browser/searchActionsTopBar',
-                'ViewAsTreeAction.label',
-                "View as Tree"
-            )),
+            title: ( localize2WithPath(_moduleId, 6, "View as Tree")),
             category,
             icon: searchShowAsList,
             f1: true,
-            precondition: ( ContextKeyExpr.and(SearchContext.HasSearchResults, ( SearchContext.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)), ( SearchContext.InTreeViewKey.toNegated()))),
+                    when: ( (ContextKeyExpr.and(
+                         (ContextKeyExpr.equals('view', VIEW_ID)),
+                         (SearchContext.InTreeViewKey.toNegated())
+                    ))),
                 }]
         });
     }
@@ -198,23 +193,19 @@ registerAction2(class ViewAsListAction extends Action2 {
     constructor() {
         super({
             id: "search.action.viewAsList" ,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/search/browser/searchActionsTopBar',
-                'ViewAsListAction.label',
-                "View as List"
-            )),
+            title: ( localize2WithPath(_moduleId, 7, "View as List")),
             category,
             icon: searchShowAsTree,
             f1: true,
-            precondition: ( ContextKeyExpr.and(
-                SearchContext.HasSearchResults,
-                SearchContext.InTreeViewKey
-            )),
+            precondition: ( (ContextKeyExpr.and(SearchContext.HasSearchResults, SearchContext.InTreeViewKey))),
             menu: [{
                     id: MenuId.ViewTitle,
                     group: 'navigation',
                     order: 2,
-                    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_ID)), SearchContext.InTreeViewKey)),
+                    when: ( (ContextKeyExpr.and(
+                         (ContextKeyExpr.equals('view', VIEW_ID)),
+                        SearchContext.InTreeViewKey
+                    ))),
                 }]
         });
     }

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

@@ -6,11 +6,8 @@ import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/
 import { Toggle } from 'vscode/vscode/vs/base/browser/ui/toggle/toggle';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 
-const NLS_AI_TOGGLE_LABEL = ( localizeWithPath(
-    'vs/workbench/contrib/search/browser/searchFindInput',
-    'aiDescription',
-    "Use AI"
-));
+const _moduleId = "vs/workbench/contrib/search/browser/searchFindInput";
+const NLS_AI_TOGGLE_LABEL = ( localizeWithPath(_moduleId, 0, "Use AI"));
 class SearchFindInput extends ContextScopedFindInput {
     constructor(container, contextViewProvider, options, contextKeyService, contextMenuService, instantiationService, filters, _shouldShowAIButton,
     filterStartVisiblitity) {
@@ -21,18 +18,14 @@ class SearchFindInput extends ContextScopedFindInput {
         this._shouldShowAIButton = _shouldShowAIButton;
         this._filterChecked = false;
         this._visible = false;
-        this._onDidChangeAIToggle = this._register(( new Emitter()));
+        this._onDidChangeAIToggle = this._register(( (new Emitter())));
         this.onDidChangeAIToggle = this._onDidChangeAIToggle.event;
-        this._findFilter = this._register(( new NotebookFindInputFilterButton(filters, contextMenuService, instantiationService, options, ( localizeWithPath(
-            'vs/workbench/contrib/search/browser/searchFindInput',
-            'searchFindInputNotebookFilter.label',
-            "Notebook Find Filters"
-        )))));
-        this._aiButton = this._register(( new AIToggle({
+        this._findFilter = this._register(( (new NotebookFindInputFilterButton(filters, contextMenuService, instantiationService, options, ( localizeWithPath(_moduleId, 1, "Notebook Find Filters"))))));
+        this._aiButton = this._register(( (new AIToggle({
             appendTitle: '',
             isChecked: false,
             ...options.toggleStyles
-        })));
+        }))));
         this.setAdditionalToggles([this._aiButton]);
         this.inputBox.paddingRight = (this.caseSensitive?.width() ?? 0) + (this.wholeWords?.width() ?? 0) + (this.regex?.width() ?? 0) + this._findFilter.width;
         this.controls.appendChild(this._findFilter.container);

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

@@ -2,105 +2,30 @@ import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
 
-const searchDetailsIcon = registerIcon('search-details', Codicon.ellipsis, ( localizeWithPath(
- 'vs/workbench/contrib/search/browser/searchIcons',
- 'searchDetailsIcon',
- 'Icon to make search details visible.'
-)));
-const searchActivityBarIcon = registerIcon('search-see-more', Codicon.linkExternal, ( localizeWithPath(
- 'vs/workbench/contrib/search/browser/searchIcons',
- 'searchSeeMoreIcon',
- 'Icon to view more context in the search view.'
-)));
-const searchShowContextIcon = registerIcon('search-show-context', Codicon.listSelection, ( localizeWithPath(
- 'vs/workbench/contrib/search/browser/searchIcons',
- 'searchShowContextIcon',
- 'Icon for toggle the context in the search editor.'
-)));
-const searchHideReplaceIcon = registerIcon('search-hide-replace', Codicon.chevronRight, ( localizeWithPath(
- 'vs/workbench/contrib/search/browser/searchIcons',
- 'searchHideReplaceIcon',
- 'Icon to collapse the replace section in the search view.'
-)));
-const searchShowReplaceIcon = registerIcon('search-show-replace', Codicon.chevronDown, ( localizeWithPath(
- 'vs/workbench/contrib/search/browser/searchIcons',
- 'searchShowReplaceIcon',
- 'Icon to expand the replace section in the search view.'
-)));
-const searchReplaceAllIcon = registerIcon('search-replace-all', Codicon.replaceAll, ( localizeWithPath(
- 'vs/workbench/contrib/search/browser/searchIcons',
- 'searchReplaceAllIcon',
- 'Icon for replace all in the search view.'
-)));
-const searchReplaceIcon = registerIcon('search-replace', Codicon.replace, ( localizeWithPath(
- 'vs/workbench/contrib/search/browser/searchIcons',
- 'searchReplaceIcon',
- 'Icon for replace in the search view.'
-)));
-const searchRemoveIcon = registerIcon('search-remove', Codicon.close, ( localizeWithPath(
- 'vs/workbench/contrib/search/browser/searchIcons',
- 'searchRemoveIcon',
- 'Icon to remove a search result.'
-)));
-const searchRefreshIcon = registerIcon('search-refresh', Codicon.refresh, ( localizeWithPath(
- 'vs/workbench/contrib/search/browser/searchIcons',
- 'searchRefreshIcon',
- 'Icon for refresh in the search view.'
-)));
-const searchCollapseAllIcon = registerIcon('search-collapse-results', Codicon.collapseAll, ( localizeWithPath(
- 'vs/workbench/contrib/search/browser/searchIcons',
- 'searchCollapseAllIcon',
- 'Icon for collapse results in the search view.'
-)));
-const searchExpandAllIcon = registerIcon('search-expand-results', Codicon.expandAll, ( localizeWithPath(
- 'vs/workbench/contrib/search/browser/searchIcons',
- 'searchExpandAllIcon',
- 'Icon for expand results in the search view.'
-)));
-const searchShowAsTree = registerIcon('search-tree', Codicon.listTree, ( localizeWithPath(
- 'vs/workbench/contrib/search/browser/searchIcons',
- 'searchShowAsTree',
- 'Icon for viewing results as a tree in the search view.'
-)));
-const searchShowAsList = registerIcon('search-list', Codicon.listFlat, ( localizeWithPath(
- 'vs/workbench/contrib/search/browser/searchIcons',
- 'searchShowAsList',
- 'Icon for viewing results as a list in the search view.'
-)));
-const searchClearIcon = registerIcon('search-clear-results', Codicon.clearAll, ( localizeWithPath(
- 'vs/workbench/contrib/search/browser/searchIcons',
- 'searchClearIcon',
- 'Icon for clear results in the search view.'
-)));
-const searchStopIcon = registerIcon('search-stop', Codicon.searchStop, ( localizeWithPath(
- 'vs/workbench/contrib/search/browser/searchIcons',
- 'searchStopIcon',
- 'Icon for stop in the search view.'
-)));
-const searchViewIcon = registerIcon('search-view-icon', Codicon.search, ( localizeWithPath(
- 'vs/workbench/contrib/search/browser/searchIcons',
- 'searchViewIcon',
- 'View icon of the search view.'
-)));
-const searchNewEditorIcon = registerIcon('search-new-editor', Codicon.newFile, ( localizeWithPath(
- 'vs/workbench/contrib/search/browser/searchIcons',
- 'searchNewEditorIcon',
- 'Icon for the action to open a new search editor.'
-)));
+const _moduleId = "vs/workbench/contrib/search/browser/searchIcons";
+const searchDetailsIcon = registerIcon('search-details', Codicon.ellipsis, ( localizeWithPath(_moduleId, 0, 'Icon to make search details visible.')));
+const searchActivityBarIcon = registerIcon('search-see-more', Codicon.linkExternal, ( localizeWithPath(_moduleId, 1, 'Icon to view more context in the search view.')));
+const searchShowContextIcon = registerIcon('search-show-context', Codicon.listSelection, ( localizeWithPath(_moduleId, 2, 'Icon for toggle the context in the search editor.')));
+const searchHideReplaceIcon = registerIcon('search-hide-replace', Codicon.chevronRight, ( localizeWithPath(_moduleId, 3, 'Icon to collapse the replace section in the search view.')));
+const searchShowReplaceIcon = registerIcon('search-show-replace', Codicon.chevronDown, ( localizeWithPath(_moduleId, 4, 'Icon to expand the replace section in the search view.')));
+const searchReplaceAllIcon = registerIcon('search-replace-all', Codicon.replaceAll, ( localizeWithPath(_moduleId, 5, 'Icon for replace all in the search view.')));
+const searchReplaceIcon = registerIcon('search-replace', Codicon.replace, ( localizeWithPath(_moduleId, 6, 'Icon for replace in the search view.')));
+const searchRemoveIcon = registerIcon('search-remove', Codicon.close, ( localizeWithPath(_moduleId, 7, 'Icon to remove a search result.')));
+const searchRefreshIcon = registerIcon('search-refresh', Codicon.refresh, ( localizeWithPath(_moduleId, 8, 'Icon for refresh in the search view.')));
+const searchCollapseAllIcon = registerIcon('search-collapse-results', Codicon.collapseAll, ( localizeWithPath(_moduleId, 9, 'Icon for collapse results in the search view.')));
+const searchExpandAllIcon = registerIcon('search-expand-results', Codicon.expandAll, ( localizeWithPath(_moduleId, 10, 'Icon for expand results in the search view.')));
+const searchShowAsTree = registerIcon('search-tree', Codicon.listTree, ( localizeWithPath(_moduleId, 11, 'Icon for viewing results as a tree in the search view.')));
+const searchShowAsList = registerIcon('search-list', Codicon.listFlat, ( localizeWithPath(_moduleId, 12, 'Icon for viewing results as a list in the search view.')));
+const searchClearIcon = registerIcon('search-clear-results', Codicon.clearAll, ( localizeWithPath(_moduleId, 13, 'Icon for clear results in the search view.')));
+const searchStopIcon = registerIcon('search-stop', Codicon.searchStop, ( localizeWithPath(_moduleId, 14, 'Icon for stop in the search view.')));
+const searchViewIcon = registerIcon('search-view-icon', Codicon.search, ( localizeWithPath(_moduleId, 15, 'View icon of the search view.')));
+const searchNewEditorIcon = registerIcon('search-new-editor', Codicon.newFile, ( localizeWithPath(_moduleId, 16, 'Icon for the action to open a new search editor.')));
 const searchOpenInFileIcon = registerIcon('search-open-in-file', Codicon.goToFile, ( localizeWithPath(
- 'vs/workbench/contrib/search/browser/searchIcons',
- 'searchOpenInFile',
+ _moduleId,
+ 17,
  'Icon for the action to go to the file of the current search result.'
 )));
-registerIcon('search-sparkle-filled', Codicon.sparkleFilled, ( localizeWithPath(
- 'vs/workbench/contrib/search/browser/searchIcons',
- 'searchSparkleFilled',
- 'Icon to show AI results in search.'
-)));
-registerIcon('search-sparkle-empty', Codicon.sparkle, ( localizeWithPath(
- 'vs/workbench/contrib/search/browser/searchIcons',
- 'searchSparkleEmpty',
- 'Icon to hide AI results in search.'
-)));
+registerIcon('search-sparkle-filled', Codicon.sparkleFilled, ( localizeWithPath(_moduleId, 18, 'Icon to show AI results in search.')));
+registerIcon('search-sparkle-empty', Codicon.sparkle, ( localizeWithPath(_moduleId, 19, 'Icon to hide AI results in search.')));
 
 export { searchActivityBarIcon, searchClearIcon, searchCollapseAllIcon, searchDetailsIcon, searchExpandAllIcon, searchHideReplaceIcon, searchNewEditorIcon, searchOpenInFileIcon, searchRefreshIcon, searchRemoveIcon, searchReplaceAllIcon, searchReplaceIcon, searchShowAsList, searchShowAsTree, searchShowContextIcon, searchShowReplaceIcon, searchStopIcon, searchViewIcon };

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

@@ -8,6 +8,7 @@ import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { Link } from 'vscode/vscode/vs/platform/opener/browser/link';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 
+const _moduleId = "vs/workbench/contrib/search/browser/searchMessage";
 const renderSearchMessage = (message, instantiationService, notificationService, openerService, commandService, disposableStore, triggerSearch) => {
     const div = $('div.providerMessage');
     const linkedText = parseLinkedText(message.text);
@@ -27,7 +28,7 @@ const renderSearchMessage = (message, instantiationService, notificationService,
                     if (!message.trusted) {
                         return;
                     }
-                    const parsed = ( URI.parse(href, true));
+                    const parsed = ( (URI.parse(href, true)));
                     if (parsed.scheme === Schemas.command && message.trusted) {
                         const result = await commandService.executeCommand(parsed.path);
                         if (result?.triggerSearch) {
@@ -40,19 +41,14 @@ const renderSearchMessage = (message, instantiationService, notificationService,
                     else {
                         if (parsed.scheme === Schemas.command && !message.trusted) {
                             notificationService.error(( localizeWithPath(
-                                'vs/workbench/contrib/search/browser/searchMessage',
-                                'unable to open trust',
+                                _moduleId,
+                                0,
                                 "Unable to open command link from untrusted source: {0}",
                                 href
                             )));
                         }
                         else {
-                            notificationService.error(( localizeWithPath(
-                                'vs/workbench/contrib/search/browser/searchMessage',
-                                'unable to open',
-                                "Unable to open unknown link: {0}",
-                                href
-                            )));
+                            notificationService.error(( localizeWithPath(_moduleId, 1, "Unable to open unknown link: {0}", href)));
                         }
                     }
                 }