@codingame/monaco-vscode-search-service-override 1.83.2 → 1.83.3-next.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-search-service-override",
-  "version": "1.83.2",
+  "version": "1.83.3-next.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.83.2",
+    "vscode": "npm:@codingame/monaco-vscode-api@1.83.3-next.0",
     "monaco-editor": "0.44.0"
   }
 }

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.js

@@ -14,12 +14,22 @@ import { filterIcon } from 'vscode/vscode/vs/workbench/contrib/extensions/browse
 import { isSafari } from 'monaco-editor/esm/vs/base/common/platform.js';
 import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 
-registerIcon('find-filter', Codicon.filter, ( nls.localize('findFilterIcon', 'Icon for Find Filter in find widget.')));
-const NOTEBOOK_FIND_FILTERS = ( nls.localize('notebook.find.filter.filterAction', "Find Filters"));
-const NOTEBOOK_FIND_IN_MARKUP_INPUT = ( nls.localize('notebook.find.filter.findInMarkupInput', "Markdown Source"));
-const NOTEBOOK_FIND_IN_MARKUP_PREVIEW = ( nls.localize('notebook.find.filter.findInMarkupPreview', "Rendered Markdown"));
-const NOTEBOOK_FIND_IN_CODE_INPUT = ( nls.localize('notebook.find.filter.findInCodeInput', "Code Cell Source"));
-const NOTEBOOK_FIND_IN_CODE_OUTPUT = ( nls.localize('notebook.find.filter.findInCodeOutput', "Code Cell Output"));
+nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'label.find', "Find");
+nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'placeholder.find', "Find");
+nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'label.previousMatchButton', "Previous Match");
+nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'label.nextMatchButton', "Next Match");
+nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'label.closeButton', "Close");
+nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'label.toggleReplaceButton', "Toggle Replace");
+nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'label.replace', "Replace");
+nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'placeholder.replace', "Replace");
+nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'label.replaceButton', "Replace");
+nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'label.replaceAllButton', "Replace All");
+registerIcon('find-filter', Codicon.filter, nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'findFilterIcon', 'Icon for Find Filter in find widget.'));
+const NOTEBOOK_FIND_FILTERS = nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'notebook.find.filter.filterAction', "Find Filters");
+const NOTEBOOK_FIND_IN_MARKUP_INPUT = nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'notebook.find.filter.findInMarkupInput', "Markdown Source");
+const NOTEBOOK_FIND_IN_MARKUP_PREVIEW = nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'notebook.find.filter.findInMarkupPreview', "Rendered Markdown");
+const NOTEBOOK_FIND_IN_CODE_INPUT = nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'notebook.find.filter.findInCodeInput', "Code Cell Source");
+const NOTEBOOK_FIND_IN_CODE_OUTPUT = nls.localizeWithPath('vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget', 'notebook.find.filter.findInCodeOutput', "Code Cell Output");
 const NOTEBOOK_FIND_WIDGET_INITIAL_WIDTH = 318;
 const NOTEBOOK_FIND_WIDGET_INITIAL_HORIZONTAL_PADDING = 4;
 let NotebookFindFilterActionViewItem = class NotebookFindFilterActionViewItem extends DropdownMenuActionViewItem {

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/anythingQuickAccess.css.js';
 import { QuickPickItemScorerAccessor, QuickInputHideReason, quickPickItemScorerAccessor, IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
-import { PickerQuickAccessProvider, TriggerAction } from 'monaco-editor/esm/vs/platform/quickinput/browser/pickerQuickAccess.js';
+import { PickerQuickAccessProvider, TriggerAction } from 'vscode/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
 import { prepareQuery, compareItemsByFuzzyScore, scoreItemFuzzy } from 'monaco-editor/esm/vs/base/common/fuzzyScorer.js';
 import { QueryBuilder } from 'vscode/vscode/vs/workbench/services/search/common/queryBuilder';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
@@ -19,7 +19,7 @@ import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.
 import { getIconClasses } from 'monaco-editor/esm/vs/editor/common/services/getIconClasses.js';
 import { IModelService } from 'monaco-editor/esm/vs/editor/common/services/model.js';
 import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/language.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import { isEditorInput, EditorResourceAccessor } from 'vscode/vscode/vs/workbench/common/editor';
@@ -57,7 +57,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
     static { AnythingQuickAccessProvider_1 = this; }
     static { this.PREFIX = ''; }
     static { this.NO_RESULTS_PICK = {
-        label: ( localize('noAnythingResults', "No matching results"))
+        label: localizeWithPath('vs/workbench/contrib/search/browser/anythingQuickAccess', 'noAnythingResults', "No matching results")
     }; }
     static { this.MAX_RESULTS = 512; }
     static { this.TYPING_SEARCH_DELAY = 200; }
@@ -255,7 +255,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
                 picks.push(...this.getHelpPicks(query, token, options));
             }
             if (historyEditorPicks.length !== 0) {
-                picks.push({ type: 'separator', label: ( localize('recentlyOpenedSeparator', "recently opened")) });
+                picks.push({ type: 'separator', label: localizeWithPath('vs/workbench/contrib/search/browser/anythingQuickAccess', 'recentlyOpenedSeparator', "recently opened") });
                 picks.push(...historyEditorPicks);
             }
         }
@@ -273,7 +273,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
                     return [];
                 }
                 return additionalPicks.length > 0 ? [
-                    { type: 'separator', label: this.configuration.includeSymbols ? ( localize('fileAndSymbolResultsSeparator', "file and symbol results")) : ( localize('fileResultsSeparator', "file results")) },
+                    { type: 'separator', label: this.configuration.includeSymbols ? localizeWithPath('vs/workbench/contrib/search/browser/anythingQuickAccess', 'fileAndSymbolResultsSeparator', "file and symbol results") : localizeWithPath('vs/workbench/contrib/search/browser/anythingQuickAccess', 'fileResultsSeparator', "file results") },
                     ...additionalPicks
                 ] : [];
             })(),
@@ -523,7 +523,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
                 description: helpEntry.prefix ?? provider.prefix,
                 commandCenterOrder: helpEntry.commandCenterOrder,
                 keybinding: helpEntry.commandId ? this.keybindingService.lookupKeybinding(helpEntry.commandId) : undefined,
-                ariaLabel: ( localize('helpPickAriaLabel', "{0}, {1}", label, helpEntry.description)),
+                ariaLabel: localizeWithPath('vs/workbench/contrib/search/browser/anythingQuickAccess', 'helpPickAriaLabel', "{0}, {1}", label, helpEntry.description),
                 accept: () => {
                     this.quickInputService.quickAccess.show(provider.prefix, {
                         preserveValue: true,
@@ -534,7 +534,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
         })));
         if (this.quickChatService.enabled) {
             providers.push({
-                label: ( localize('chat', "Open Quick Chat")),
+                label: localizeWithPath('vs/workbench/contrib/search/browser/anythingQuickAccess', 'chat', "Open Quick Chat"),
                 commandCenterOrder: 30,
                 keybinding: this.keybindingService.lookupKeybinding(ASK_QUICK_QUESTION_ACTION_ID),
                 accept: () => this.quickChatService.toggle()
@@ -661,19 +661,13 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
             buttons.push({
                 iconClass: openSideBySideDirection === 'right' ? ThemeIcon.asClassName(Codicon.splitHorizontal) : ThemeIcon.asClassName(Codicon.splitVertical),
                 tooltip: openSideBySideDirection === 'right' ?
-                    ( localize(
-                        { key: 'openToSide', comment: ['Open this file in a split editor on the left/right side'] },
-                        "Open to the Side"
-                    )) :
-                    ( localize(
-                        { key: 'openToBottom', comment: ['Open this file in a split editor on the bottom'] },
-                        "Open to the Bottom"
-                    ))
+                    localizeWithPath('vs/workbench/contrib/search/browser/anythingQuickAccess', { key: 'openToSide', comment: ['Open this file in a split editor on the left/right side'] }, "Open to the Side") :
+                    localizeWithPath('vs/workbench/contrib/search/browser/anythingQuickAccess', { key: 'openToBottom', comment: ['Open this file in a split editor on the bottom'] }, "Open to the Bottom")
             });
             if (isEditorHistoryEntry) {
                 buttons.push({
                     iconClass: isDirty ? ('dirty-anything ' + ThemeIcon.asClassName(Codicon.circleFilled)) : ThemeIcon.asClassName(Codicon.close),
-                    tooltip: ( localize('closeEditor', "Remove from Recently Opened")),
+                    tooltip: localizeWithPath('vs/workbench/contrib/search/browser/anythingQuickAccess', 'closeEditor', "Remove from Recently Opened"),
                     alwaysVisible: isDirty
                 });
             }
@@ -682,7 +676,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
         return {
             resource,
             label,
-            ariaLabel: isDirty ? ( localize('filePickAriaLabelDirty', "{0} unsaved changes", labelAndDescription)) : labelAndDescription,
+            ariaLabel: isDirty ? localizeWithPath('vs/workbench/contrib/search/browser/anythingQuickAccess', 'filePickAriaLabelDirty', "{0} unsaved changes", labelAndDescription) : labelAndDescription,
             description,
             get iconClasses() { return iconClassesValue.value; },
             get buttons() { return buttonsValue.value; },

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

@@ -26,7 +26,7 @@ let PatternInputWidget = class PatternInputWidget extends Widget {
         this.onCancel = this._onCancel.event;
         options = {
             ...{
-                ariaLabel: ( nls.localize('defaultLabel', "input"))
+                ariaLabel: nls.localizeWithPath('vs/workbench/contrib/search/browser/patternInputWidget', 'defaultLabel', "input")
             },
             ...options,
         };
@@ -153,7 +153,7 @@ let IncludePatternInputWidget = class IncludePatternInputWidget extends PatternI
     renderSubcontrols(controlsDiv) {
         this.useSearchInEditorsBox = this._register(( new Toggle({
             icon: Codicon.book,
-            title: ( nls.localize('onlySearchInOpenEditors', "Search only in Open Editors")),
+            title: nls.localizeWithPath('vs/workbench/contrib/search/browser/patternInputWidget', 'onlySearchInOpenEditors', "Search only in Open Editors"),
             isChecked: false,
             ...defaultToggleStyles
         })));
@@ -196,10 +196,7 @@ let ExcludePatternInputWidget = class ExcludePatternInputWidget extends PatternI
         this.useExcludesAndIgnoreFilesBox = this._register(( new Toggle({
             icon: Codicon.exclude,
             actionClassName: 'useExcludesAndIgnoreFiles',
-            title: ( nls.localize(
-                'useExcludesAndIgnoreFilesDescription',
-                "Use Exclude Settings and Ignore Files"
-            )),
+            title: nls.localizeWithPath('vs/workbench/contrib/search/browser/patternInputWidget', 'useExcludesAndIgnoreFilesDescription', "Use Exclude Settings and Ignore Files"),
             isChecked: true,
             ...defaultToggleStyles
         })));

package/vscode/src/vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess.js

@@ -3,12 +3,12 @@ import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { ResourceSet } from 'monaco-editor/esm/vs/base/common/map.js';
 import { basenameOrAuthority, dirname } from 'monaco-editor/esm/vs/base/common/resources.js';
 import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
 import { getSelectionKeyboardEvent } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
-import { PickerQuickAccessProvider } from 'monaco-editor/esm/vs/platform/quickinput/browser/pickerQuickAccess.js';
+import { PickerQuickAccessProvider } from 'vscode/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
 import { DefaultQuickAccessFilterValue } from 'monaco-editor/esm/vs/platform/quickinput/common/quickAccess.js';
 import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
 import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
@@ -123,7 +123,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                     type: 'separator',
                 });
                 picks.push({
-                    label: ( localize('QuickSearchSeeMoreFiles', "See More Files")),
+                    label: localizeWithPath('vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess', 'QuickSearchSeeMoreFiles', "See More Files"),
                     iconClass: ThemeIcon.asClassName(searchDetailsIcon),
                     accept: async () => {
                         this.moveToSearchViewlet(this.searchModel, matches[limit]);
@@ -140,7 +140,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                 tooltip: description,
                 buttons: [{
                         iconClass: ThemeIcon.asClassName(searchOpenInFileIcon),
-                        tooltip: ( localize('QuickSearchOpenInFile', "Open File"))
+                        tooltip: localizeWithPath('vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess', 'QuickSearchOpenInFile', "Open File")
                     }],
             });
             const results = fileMatch.matches() ?? [];
@@ -148,7 +148,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                 const element = results[matchIndex];
                 if (matchIndex === MAX_RESULTS_PER_FILE) {
                     picks.push({
-                        label: ( localize('QuickSearchMore', "More")),
+                        label: localizeWithPath('vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess', 'QuickSearchMore', "More"),
                         iconClass: ThemeIcon.asClassName(searchDetailsIcon),
                         accept: async () => {
                             this.moveToSearchViewlet(this.searchModel, element);

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

@@ -84,7 +84,7 @@ ReplacePreviewModel = ( __decorate([
 ], ReplacePreviewModel));
 let ReplaceService = class ReplaceService {
     static { ReplaceService_1 = this; }
-    static { this.REPLACE_SAVE_SOURCE = SaveSourceRegistry.registerSource('searchReplace.source', ( nls.localize('searchReplace.source', "Search and Replace"))); }
+    static { this.REPLACE_SAVE_SOURCE = SaveSourceRegistry.registerSource('searchReplace.source', nls.localizeWithPath('vs/workbench/contrib/search/browser/replaceService', 'searchReplace.source', "Search and Replace")); }
     constructor(textFileService, editorService, textModelResolverService, bulkEditorService, labelService, notebookEditorModelResolverService) {
         this.textFileService = textFileService;
         this.editorService = editorService;
@@ -122,12 +122,7 @@ let ReplaceService = class ReplaceService {
         const editor = await this.editorService.openEditor({
             original: { resource: fileMatch.resource },
             modified: { resource: toReplaceResource(fileMatch.resource) },
-            label: ( nls.localize(
-                'fileReplaceChanges',
-                "{0} ↔ {1} (Replace Preview)",
-                fileMatch.name(),
-                fileMatch.name()
-            )),
+            label: nls.localizeWithPath('vs/workbench/contrib/search/browser/replaceService', 'fileReplaceChanges', "{0} ↔ {1} (Replace Preview)", fileMatch.name(), fileMatch.name()),
             description: this.labelService.getUriLabel(dirname(fileMatch.resource), { relative: true }),
             options: {
                 preserveFocus,