@codingame/monaco-vscode-search-service-override 7.1.0 → 7.1.1

package/package.json

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

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

@@ -5,7 +5,7 @@ import { Widget } from 'vscode/vscode/vs/base/browser/ui/widget';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { ContextScopedHistoryInputBox } from 'vscode/vscode/vs/platform/history/browser/contextScopedHistoryWidget';
 import { showHistoryKeybindingHint } from 'vscode/vscode/vs/platform/history/browser/historyWidgetKeybindingHint';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
@@ -14,7 +14,6 @@ import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/
 import { defaultToggleStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 
-const _moduleId = "vs/workbench/contrib/search/browser/patternInputWidget";
 let PatternInputWidget = class PatternInputWidget extends Widget {
     static { this.OPTION_CHANGE = 'optionChange'; }
     constructor(parent, contextViewProvider, options, contextKeyService, configurationService, keybindingService) {
@@ -29,7 +28,7 @@ let PatternInputWidget = class PatternInputWidget extends Widget {
         this.onCancel = this._onCancel.event;
         options = {
             ...{
-                ariaLabel: ( localizeWithPath(_moduleId, 0, "input"))
+                ariaLabel: ( localize(10767, "input"))
             },
             ...options,
         };
@@ -156,7 +155,7 @@ let IncludePatternInputWidget = class IncludePatternInputWidget extends PatternI
     renderSubcontrols(controlsDiv) {
         this.useSearchInEditorsBox = this._register(( (new Toggle({
             icon: Codicon.book,
-            title: ( localizeWithPath(_moduleId, 1, "Search only in Open Editors")),
+            title: ( localize(10768, "Search only in Open Editors")),
             isChecked: false,
             hoverDelegate: getDefaultHoverDelegate('element'),
             ...defaultToggleStyles
@@ -200,7 +199,7 @@ let ExcludePatternInputWidget = class ExcludePatternInputWidget extends PatternI
         this.useExcludesAndIgnoreFilesBox = this._register(( (new Toggle({
             icon: Codicon.exclude,
             actionClassName: 'useExcludesAndIgnoreFiles',
-            title: ( localizeWithPath(_moduleId, 2, "Use Exclude Settings and Ignore Files")),
+            title: ( localize(10769, "Use Exclude Settings and Ignore Files")),
             isChecked: true,
             hoverDelegate: getDefaultHoverDelegate('element'),
             ...defaultToggleStyles

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

@@ -4,14 +4,14 @@ import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ResourceSet } from 'vscode/vscode/vs/base/common/map';
 import { basenameOrAuthority, dirname } from 'vscode/vscode/vs/base/common/resources';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { getSelectionKeyboardEvent } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { PickerQuickAccessProvider, TriggerAction } from 'vscode/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
 import { DefaultQuickAccessFilterValue } from 'vscode/vscode/vs/platform/quickinput/common/quickAccess';
-import { QuickInputHideReason } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
+import { QuickInputButtonLocation, QuickInputHideReason } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { searchDetailsIcon, searchOpenInFileIcon, searchActivityBarIcon } from '../searchIcons.js';
 import { SearchModel, SearchModelLocation, searchComparer } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
@@ -25,8 +25,8 @@ import { Event } from 'vscode/vscode/vs/base/common/event';
 import { PickerEditorState } from 'vscode/vscode/vs/workbench/browser/quickaccess';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { Sequencer } from 'vscode/vscode/vs/base/common/async';
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 
-const _moduleId = "vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess";
 const TEXT_SEARCH_QUICK_ACCESS_PREFIX = '%';
 const DEFAULT_TEXT_QUERY_BUILDER_OPTIONS = {
     _reason: 'quickAccessSearch',
@@ -80,10 +80,13 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
         if (TEXT_SEARCH_QUICK_ACCESS_PREFIX.length < picker.value.length) {
             picker.valueSelection = [TEXT_SEARCH_QUICK_ACCESS_PREFIX.length, picker.value.length];
         }
-        picker.customButton = true;
-        picker.customLabel = '$(go-to-search)';
+        picker.buttons = [{
+                location: QuickInputButtonLocation.Inline,
+                iconClass: ThemeIcon.asClassName(Codicon.goToSearch),
+                tooltip: ( localize(8421, "See in Search Panel"))
+            }];
         this.editorViewState.reset();
-        disposables.add(picker.onDidCustom(() => {
+        disposables.add(picker.onDidTriggerButton(() => {
             if (this.searchModel.searchResult.count() > 0) {
                 this.moveToSearchViewlet(undefined);
             }
@@ -194,7 +197,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                     type: 'separator',
                 });
                 picks.push({
-                    label: ( localizeWithPath(_moduleId, 0, "See More Files")),
+                    label: ( localize(8422, "See More Files")),
                     iconClass: ThemeIcon.asClassName(searchDetailsIcon),
                     accept: async () => {
                         this.moveToSearchViewlet(matches[limit]);
@@ -211,7 +214,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                 description,
                 buttons: [{
                         iconClass: ThemeIcon.asClassName(searchOpenInFileIcon),
-                        tooltip: ( localizeWithPath(_moduleId, 1, "Open File"))
+                        tooltip: ( localize(8423, "Open File"))
                     }],
                 trigger: async () => {
                     await this.handleAccept(fileMatch, {});
@@ -223,7 +226,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                 const element = results[matchIndex];
                 if (matchIndex === MAX_RESULTS_PER_FILE) {
                     picks.push({
-                        label: ( localizeWithPath(_moduleId, 2, "More")),
+                        label: ( localize(8424, "More")),
                         iconClass: ThemeIcon.asClassName(searchDetailsIcon),
                         accept: async () => {
                             this.moveToSearchViewlet(element);
@@ -244,7 +247,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                     },
                     buttons: [{
                             iconClass: ThemeIcon.asClassName(searchActivityBarIcon),
-                            tooltip: ( localizeWithPath(_moduleId, 3, "See in Search Panel")),
+                            tooltip: ( localize(8425, "See in Search Panel")),
                         }],
                     ariaLabel: `Match at location ${element.range().startLineNumber}:${element.range().startColumn} - ${previewText}`,
                     accept: async (keyMods, event) => {
@@ -282,7 +285,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
         if (contentPattern === '') {
             this.searchModel.searchResult.clear();
             return [{
-                    label: ( localizeWithPath(_moduleId, 4, "Enter a term to search for across your files."))
+                    label: ( localize(8426, "Enter a term to search for across your files."))
                 }];
         }
         const conditionalTokenCts = disposables.add(( (new CancellationTokenSource())));
@@ -307,7 +310,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
             picks: syncResult,
             additionalPicks: allMatches.asyncResults
                 .then(asyncResults => (asyncResults.length + syncResult.length === 0) ? [{
-                    label: ( localizeWithPath(_moduleId, 5, "No matching results"))
+                    label: ( localize(8427, "No matching results"))
                 }] : this._getPicksFromMatches(asyncResults, MAX_FILES_SHOWN - matches.length))
                 .then(picks => {
                 if (picks.length > 0) {

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IReplaceService } from 'vscode/vscode/vs/workbench/contrib/search/browser/replace.service';
@@ -24,7 +24,6 @@ import { CellUri } from 'vscode/vscode/vs/workbench/contrib/notebook/common/note
 import { INotebookEditorModelResolverService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service';
 
 var ReplaceService_1;
-const _moduleId = "vs/workbench/contrib/search/browser/replaceService";
 const REPLACE_PREVIEW = 'replacePreview';
 const toReplaceResource = (fileResource) => {
     return fileResource.with({ scheme: Schemas.internal, fragment: REPLACE_PREVIEW, query: JSON.stringify({ scheme: fileResource.scheme }) });
@@ -88,7 +87,7 @@ ReplacePreviewModel = ( (__decorate([
 ], ReplacePreviewModel)));
 let ReplaceService = class ReplaceService {
     static { ReplaceService_1 = this; }
-    static { this.REPLACE_SAVE_SOURCE = SaveSourceRegistry.registerSource('searchReplace.source', ( localizeWithPath(_moduleId, 0, "Search and Replace"))); }
+    static { this.REPLACE_SAVE_SOURCE = SaveSourceRegistry.registerSource('searchReplace.source', ( localize(3367, "Search and Replace"))); }
     constructor(textFileService, editorService, textModelResolverService, bulkEditorService, labelService, notebookEditorModelResolverService) {
         this.textFileService = textFileService;
         this.editorService = editorService;
@@ -126,13 +125,7 @@ let ReplaceService = class ReplaceService {
         const editor = await this.editorService.openEditor({
             original: { resource: fileMatch.resource },
             modified: { resource: toReplaceResource(fileMatch.resource) },
-            label: ( localizeWithPath(
-                _moduleId,
-                1,
-                "{0} ↔ {1} (Replace Preview)",
-                fileMatch.name(),
-                fileMatch.name()
-            )),
+            label: ( localize(3368, "{0} ↔ {1} (Replace Preview)", fileMatch.name(), fileMatch.name())),
             description: this.labelService.getUriLabel(dirname(fileMatch.resource), { relative: true }),
             options: {
                 preserveFocus,