@codingame/monaco-vscode-search-service-override 32.0.2 → 33.0.9

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

@@ -27,6 +27,7 @@ import { openNewSearchEditor, createEditorFromSearchResult, toggleSearchEditorCa
 import { SearchEditorInput, SEARCH_EDITOR_EXT, getOrMakeSearchEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/searchEditor/browser/searchEditorInput';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { VIEW_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/search';
+import { searchConfigurationNode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/search/common/search';
 import { RegisteredEditorPriority } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService';
 import { IEditorResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService.service';
 import { IWorkingCopyEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService.service';
@@ -48,33 +49,30 @@ const RerunSearchEditorSearchCommandId = "rerunSearchEditorSearch";
 const CleanSearchEditorStateCommandId = "cleanSearchEditorState";
 const SelectAllSearchEditorMatchesCommandId = "selectAllSearchEditorMatches";
 ( Registry.as(Extensions.Configuration)).registerConfiguration({
-    id: "search",
-    order: 13,
-    title: ( localize(13184, "Search")),
-    type: "object",
+    ...searchConfigurationNode,
     properties: {
         "search.searchEditor.doubleClickBehaviour": {
             type: "string",
             enum: ["selectWord", "goToLocation", "openLocationToSide"],
             default: "goToLocation",
-            enumDescriptions: [( localize(13185, "Double-clicking selects the word under the cursor.")), ( localize(13186, "Double-clicking opens the result in the active editor group.")), ( localize(
-                13187,
+            enumDescriptions: [( localize(13315, "Double-clicking selects the word under the cursor.")), ( localize(13316, "Double-clicking opens the result in the active editor group.")), ( localize(
+                13317,
                 "Double-clicking opens the result in the editor group to the side, creating one if it does not yet exist."
             ))],
-            markdownDescription: ( localize(13188, "Configure effect of double-clicking a result in a search editor."))
+            markdownDescription: ( localize(13318, "Configure effect of double-clicking a result in a search editor."))
         },
         "search.searchEditor.singleClickBehaviour": {
             type: "string",
             enum: ["default", "peekDefinition"],
             default: "default",
-            enumDescriptions: [( localize(13189, "Single-clicking does nothing.")), ( localize(13190, "Single-clicking opens a Peek Definition window."))],
-            markdownDescription: ( localize(13191, "Configure effect of single-clicking a result in a search editor."))
+            enumDescriptions: [( localize(13319, "Single-clicking does nothing.")), ( localize(13320, "Single-clicking opens a Peek Definition window."))],
+            markdownDescription: ( localize(13321, "Configure effect of single-clicking a result in a search editor."))
         },
         "search.searchEditor.reusePriorSearchConfiguration": {
             type: "boolean",
             default: false,
             markdownDescription: ( localize(
-                13192,
+                13322,
                 "When enabled, new Search Editors will reuse the includes, excludes, and flags of the previously opened Search Editor."
             ))
         },
@@ -82,7 +80,7 @@ const SelectAllSearchEditorMatchesCommandId = "selectAllSearchEditorMatches";
             type: ["number", "null"],
             default: 1,
             markdownDescription: ( localize(
-                13193,
+                13323,
                 "The default number of surrounding context lines to use when creating new Search Editors. If using `#search.searchEditor.reusePriorSearchConfiguration#`, this can be set to `null` (empty) to use the prior Search Editor's configuration."
             ))
         },
@@ -90,13 +88,13 @@ const SelectAllSearchEditorMatchesCommandId = "selectAllSearchEditorMatches";
             type: "boolean",
             default: false,
             markdownDescription: ( localize(
-                13194,
+                13324,
                 "When a search is triggered, focus the Search Editor results instead of the Search Editor input."
             ))
         }
     }
 });
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(SearchEditor, SearchEditor.ID, ( localize(13195, "Search Editor"))), [( new SyncDescriptor(SearchEditorInput))]);
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(SearchEditor, SearchEditor.ID, ( localize(13325, "Search Editor"))), [( new SyncDescriptor(SearchEditorInput))]);
 let SearchEditorContribution = class SearchEditorContribution {
     static {
         this.ID = "workbench.contrib.searchEditor";
@@ -104,7 +102,7 @@ let SearchEditorContribution = class SearchEditorContribution {
     constructor(editorResolverService, instantiationService) {
         editorResolverService.registerEditor("*" + SEARCH_EDITOR_EXT, {
             id: SearchEditorInput.ID,
-            label: ( localize(13196, "Search Editor")),
+            label: ( localize(13326, "Search Editor")),
             detail: DEFAULT_EDITOR_ASSOCIATION.providerDisplayName,
             priority: RegisteredEditorPriority.default
         }, {
@@ -211,7 +209,7 @@ CommandsRegistry.registerCommand(CleanSearchEditorStateCommandId, accessor => {
         activeEditorPane.cleanState();
     }
 });
-const category = ( localize2(13197, "Search Editor"));
+const category = ( localize2(13327, "Search Editor"));
 const translateLegacyConfig = (legacyConfig = {}) => {
     const config = {};
     const overrides = {
@@ -277,7 +275,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "search.searchEditor.action.deleteFileResults",
-            title: ( localize2(13198, "Delete File Results")),
+            title: ( localize2(13328, "Delete File Results")),
             keybinding: {
                 weight: KeybindingWeight.EditorContrib,
                 primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Backspace
@@ -298,7 +296,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: OpenNewEditorCommandId,
-            title: ( localize2(13199, "New Search Editor")),
+            title: ( localize2(13329, "New Search Editor")),
             category,
             f1: true,
             metadata: openArgMetadata
@@ -315,7 +313,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: OpenEditorCommandId,
-            title: ( localize2(13200, "Open Search Editor")),
+            title: ( localize2(13330, "Open Search Editor")),
             category,
             f1: true,
             metadata: openArgMetadata
@@ -332,7 +330,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: OpenNewEditorToSideCommandId,
-            title: ( localize2(13201, "Open New Search Editor to the Side")),
+            title: ( localize2(13331, "Open New Search Editor to the Side")),
             category,
             f1: true,
             metadata: openArgMetadata
@@ -346,7 +344,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: OpenInEditorCommandId,
-            title: ( localize2(13202, "Open Results in Editor")),
+            title: ( localize2(13332, "Open Results in Editor")),
             category,
             f1: true,
             keybinding: {
@@ -381,7 +379,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: RerunSearchEditorSearchCommandId,
-            title: ( localize2(13203, "Search Again")),
+            title: ( localize2(13333, "Search Again")),
             category,
             keybinding: {
                 primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyR,
@@ -413,7 +411,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: FocusQueryEditorWidgetCommandId,
-            title: ( localize2(13204, "Focus Search Editor Input")),
+            title: ( localize2(13334, "Focus Search Editor Input")),
             category,
             f1: true,
             precondition: InSearchEditor,
@@ -435,7 +433,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: FocusQueryEditorFilesToIncludeCommandId,
-            title: ( localize2(13205, "Focus Search Editor Files to Include")),
+            title: ( localize2(13335, "Focus Search Editor Files to Include")),
             category,
             f1: true,
             precondition: InSearchEditor
@@ -453,7 +451,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: FocusQueryEditorFilesToExcludeCommandId,
-            title: ( localize2(13206, "Focus Search Editor Files to Exclude")),
+            title: ( localize2(13336, "Focus Search Editor Files to Exclude")),
             category,
             f1: true,
             precondition: InSearchEditor
@@ -471,7 +469,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: ToggleSearchEditorCaseSensitiveCommandId,
-            title: ( localize2(13207, "Toggle Match Case")),
+            title: ( localize2(13337, "Toggle Match Case")),
             category,
             f1: true,
             precondition: InSearchEditor,
@@ -489,7 +487,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: ToggleSearchEditorWholeWordCommandId,
-            title: ( localize2(13208, "Toggle Match Whole Word")),
+            title: ( localize2(13338, "Toggle Match Whole Word")),
             category,
             f1: true,
             precondition: InSearchEditor,
@@ -507,7 +505,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: ToggleSearchEditorRegexCommandId,
-            title: ( localize2(13209, "Toggle Use Regular Expression")),
+            title: ( localize2(13339, "Toggle Use Regular Expression")),
             category,
             f1: true,
             precondition: InSearchEditor,
@@ -525,7 +523,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: ToggleSearchEditorContextLinesCommandId,
-            title: ( localize2(13210, "Toggle Context Lines")),
+            title: ( localize2(13340, "Toggle Context Lines")),
             category,
             f1: true,
             precondition: InSearchEditor,
@@ -546,7 +544,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: IncreaseSearchEditorContextLinesCommandId,
-            title: ( localize2(13211, "Increase Context Lines")),
+            title: ( localize2(13341, "Increase Context Lines")),
             category,
             f1: true,
             precondition: InSearchEditor,
@@ -564,7 +562,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: DecreaseSearchEditorContextLinesCommandId,
-            title: ( localize2(13212, "Decrease Context Lines")),
+            title: ( localize2(13342, "Decrease Context Lines")),
             category,
             f1: true,
             precondition: InSearchEditor,
@@ -582,7 +580,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectAllSearchEditorMatchesCommandId,
-            title: ( localize2(13213, "Select All Matches")),
+            title: ( localize2(13343, "Select All Matches")),
             category,
             f1: true,
             precondition: InSearchEditor,
@@ -600,7 +598,7 @@ registerAction2(class OpenSearchEditorAction extends Action2 {
     constructor() {
         super({
             id: "search.action.openNewEditorFromView",
-            title: ( localize(13214, "Open New Search Editor")),
+            title: ( localize(13344, "Open New Search Editor")),
             category,
             icon: searchNewEditorIcon,
             menu: [{

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

@@ -186,7 +186,7 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
             resetCursor: false
         })));
         this.includesExcludesContainer = append(container, $(".includes-excludes"));
-        const toggleQueryDetailsLabel = ( localize(13215, "Toggle Search Details"));
+        const toggleQueryDetailsLabel = ( localize(13345, "Toggle Search Details"));
         this.toggleQueryDetailsButton = append(
             this.includesExcludesContainer,
             $(".expand" + ThemeIcon.asCSSSelector(searchDetailsIcon), {
@@ -229,11 +229,11 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
             })
         );
         const folderIncludesList = append(this.includesExcludesContainer, $(".file-types.includes"));
-        const filesToIncludeTitle = ( localize(13216, "files to include"));
+        const filesToIncludeTitle = ( localize(13346, "files to include"));
         append(folderIncludesList, $("h4", undefined, filesToIncludeTitle));
         this.inputPatternIncludes = this._register(
             scopedInstantiationService.createInstance(IncludePatternInputWidget, folderIncludesList, this.contextViewService, {
-                ariaLabel: ( localize(13217, "Search Include Patterns")),
+                ariaLabel: ( localize(13347, "Search Include Patterns")),
                 inputBoxStyles: searchEditorInputboxStyles
             })
         );
@@ -245,11 +245,11 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
             this.inputPatternIncludes.onChangeSearchInEditorsBox(() => this.triggerSearch())
         );
         const excludesList = append(this.includesExcludesContainer, $(".file-types.excludes"));
-        const excludesTitle = ( localize(13218, "files to exclude"));
+        const excludesTitle = ( localize(13348, "files to exclude"));
         append(excludesList, $("h4", undefined, excludesTitle));
         this.inputPatternExcludes = this._register(
             scopedInstantiationService.createInstance(ExcludePatternInputWidget, excludesList, this.contextViewService, {
-                ariaLabel: ( localize(13219, "Search Exclude Patterns")),
+                ariaLabel: ( localize(13349, "Search Exclude Patterns")),
                 inputBoxStyles: searchEditorInputboxStyles
             })
         );
@@ -278,7 +278,7 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
         clearNode(this.messageBox);
         this.messageDisposables.clear();
         if (show) {
-            const runAgainLink = append(this.messageBox, $("a.pointer.prominent.message", {}, ( localize(13220, "Run Search"))));
+            const runAgainLink = append(this.messageBox, $("a.pointer.prominent.message", {}, ( localize(13350, "Run Search"))));
             this.messageDisposables.add(addDisposableListener(runAgainLink, EventType.CLICK, async () => {
                 await this.triggerSearch();
                 this.searchResultEditor.focus();
@@ -497,7 +497,7 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
             }
         }
         alert(( localize(
-            13221,
+            13351,
             "Matched {0} at {1} in file {2}",
             matchText,
             matchLineText,
@@ -841,11 +841,11 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
         }
     }
     getAriaLabel() {
-        return this.getInput()?.getName() ?? ( localize(13222, "Search"));
+        return this.getInput()?.getName() ?? ( localize(13352, "Search"));
     }
 };
 SearchEditor = SearchEditor_1 = ( __decorate([( __param(1, ITelemetryService)), ( __param(2, IThemeService)), ( __param(3, IStorageService)), ( __param(4, IModelService)), ( __param(5, IWorkspaceContextService)), ( __param(6, ILabelService)), ( __param(7, IInstantiationService)), ( __param(8, IContextViewService)), ( __param(9, ICommandService)), ( __param(10, IOpenerService)), ( __param(11, INotificationService)), ( __param(12, IEditorProgressService)), ( __param(13, ITextResourceConfigurationService)), ( __param(14, IEditorGroupsService)), ( __param(15, IEditorService)), ( __param(16, IConfigurationService)), ( __param(17, IFileService)), ( __param(18, ILogService)), ( __param(19, IHoverService))], SearchEditor));
-const searchEditorTextInputBorder = registerColor("searchEditor.textInputBorder", inputBorder, ( localize(13223, "Search editor text input box border.")));
+const searchEditorTextInputBorder = registerColor("searchEditor.textInputBorder", inputBorder, ( localize(13353, "Search editor text input box border.")));
 function findNextRange(matchRanges, currentPosition) {
     for (const matchRange of matchRanges) {
         if (Position.isBefore(currentPosition, matchRange.getStartPosition())) {

package/vscode/src/vs/workbench/services/search/browser/searchService.js

@@ -93,7 +93,7 @@ let LocalFileSearchWorkerClient = class LocalFileSearchWorkerClient extends Disp
             return {
                 results: [],
                 messages: [{
-                    text: ( localize(16901, "Unable to search with Web Worker text searcher")),
+                    text: ( localize(17033, "Unable to search with Web Worker text searcher")),
                     type: TextSearchCompleteMessageType.Warning
                 }]
             };
@@ -138,7 +138,7 @@ let LocalFileSearchWorkerClient = class LocalFileSearchWorkerClient extends Disp
             return {
                 results: [],
                 messages: [{
-                    text: ( localize(16902, "Unable to search with Web Worker file searcher")),
+                    text: ( localize(17034, "Unable to search with Web Worker file searcher")),
                     type: TextSearchCompleteMessageType.Warning
                 }]
             };