@codingame/monaco-vscode-search-service-override 17.2.1 → 18.0.1

package/index.js

@@ -5,7 +5,7 @@ import { ISearchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { SearchService } from './vscode/src/vs/workbench/services/search/common/searchService.js';
 import { SearchViewModelWorkbenchService } from './vscode/src/vs/workbench/contrib/search/browser/searchTreeModel/searchModel.js';
 import { ISearchViewModelWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchViewModelWorkbenchService.service';
-import { SearchHistoryService } from './vscode/src/vs/workbench/contrib/search/common/searchHistoryService.js';
+import { SearchHistoryService } from '@codingame/monaco-vscode-bc8c28cd-7a80-54a9-af1a-e6b1e7a7f34a-common/vscode/vs/workbench/contrib/search/common/searchHistoryService';
 import { ISearchHistoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/search/common/searchHistoryService.service';
 import { IReplaceService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/search/browser/replace.service';
 import { ReplaceService } from './vscode/src/vs/workbench/contrib/search/browser/replaceService.js';
@@ -27,6 +27,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/base/common/charCode';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-search-service-override",
-  "version": "17.2.1",
+  "version": "18.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - search service-override",
   "keywords": [],
@@ -15,24 +15,20 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common": "17.2.1",
-    "@codingame/monaco-vscode-1ae7d696-d960-5ac6-97a3-9fe7c8c3a793-common": "17.2.1",
-    "@codingame/monaco-vscode-25a9b730-95ad-54d3-8807-71421ad9b891-common": "17.2.1",
-    "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common": "17.2.1",
-    "@codingame/monaco-vscode-3cf6a388-482f-5484-a806-0525ad9ad8af-common": "17.2.1",
-    "@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common": "17.2.1",
-    "@codingame/monaco-vscode-45a408c6-90ed-5d8b-801d-f3f69c7a97f2-common": "17.2.1",
-    "@codingame/monaco-vscode-523730aa-81e6-55d7-9916-87ad537fe087-common": "17.2.1",
-    "@codingame/monaco-vscode-64322fa2-7385-5f46-935b-8f243d98004b-common": "17.2.1",
-    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "17.2.1",
-    "@codingame/monaco-vscode-6f9bc782-77e0-5716-93bd-b05210c768c5-common": "17.2.1",
-    "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common": "17.2.1",
-    "@codingame/monaco-vscode-97284942-b044-5fbb-b53b-3f46d2468746-common": "17.2.1",
-    "@codingame/monaco-vscode-api": "17.2.1",
-    "@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common": "17.2.1",
-    "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common": "17.2.1",
-    "@codingame/monaco-vscode-e67a0dae-5b2c-54e6-8d61-90102c78362d-common": "17.2.1",
-    "@codingame/monaco-vscode-ea14e352-8f1c-5569-b79a-8a96a53e8abe-common": "17.2.1"
+    "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common": "18.0.1",
+    "@codingame/monaco-vscode-3cf6a388-482f-5484-a806-0525ad9ad8af-common": "18.0.1",
+    "@codingame/monaco-vscode-45a408c6-90ed-5d8b-801d-f3f69c7a97f2-common": "18.0.1",
+    "@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common": "18.0.1",
+    "@codingame/monaco-vscode-523730aa-81e6-55d7-9916-87ad537fe087-common": "18.0.1",
+    "@codingame/monaco-vscode-64322fa2-7385-5f46-935b-8f243d98004b-common": "18.0.1",
+    "@codingame/monaco-vscode-85f7fb0f-70f5-5a5e-831b-15c743a8bd11-common": "18.0.1",
+    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "18.0.1",
+    "@codingame/monaco-vscode-api": "18.0.1",
+    "@codingame/monaco-vscode-bc8c28cd-7a80-54a9-af1a-e6b1e7a7f34a-common": "18.0.1",
+    "@codingame/monaco-vscode-dcfc2191-2da1-54c7-8fb7-e92c5d11ecef-common": "18.0.1",
+    "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common": "18.0.1",
+    "@codingame/monaco-vscode-ea14e352-8f1c-5569-b79a-8a96a53e8abe-common": "18.0.1",
+    "@codingame/monaco-vscode-f338ac19-278c-5fe1-bec8-b588de04a788-common": "18.0.1"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -3,13 +3,13 @@ import { DisposableStore, IDisposable } from "@codingame/monaco-vscode-api/vscod
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
-import { FastAndSlowPicks, IPickerQuickAccessItem, PickerQuickAccessProvider, Picks } from "@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess";
+import { FastAndSlowPicks, IPickerQuickAccessItem, PickerQuickAccessProvider, Picks } from "@codingame/monaco-vscode-dcfc2191-2da1-54c7-8fb7-e92c5d11ecef-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess";
 import { DefaultQuickAccessFilterValue, IQuickAccessProviderRunOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickAccess";
 import { IQuickPick, IQuickPickItem } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IViewsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service";
-import { ISearchTreeMatch } from "@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon";
+import { ISearchTreeMatch } from "@codingame/monaco-vscode-85f7fb0f-70f5-5a5e-831b-15c743a8bd11-common/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon";
 export declare const TEXT_SEARCH_QUICK_ACCESS_PREFIX = "%";
 interface ITextSearchQuickAccessItem extends IPickerQuickAccessItem {
     match?: ISearchTreeMatch;

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

@@ -10,13 +10,13 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { getSelectionKeyboardEvent } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService';
-import { PickerQuickAccessProvider, TriggerAction } from '@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
+import { PickerQuickAccessProvider, TriggerAction } from '@codingame/monaco-vscode-dcfc2191-2da1-54c7-8fb7-e92c5d11ecef-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
 import { DefaultQuickAccessFilterValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickAccess';
 import { QuickInputButtonLocation, QuickInputHideReason } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
-import { searchDetailsIcon, searchOpenInFileIcon, searchActivityBarIcon } from '@codingame/monaco-vscode-45a408c6-90ed-5d8b-801d-f3f69c7a97f2-common/vscode/vs/workbench/contrib/search/browser/searchIcons';
-import { getEditorSelectionFromMatch } from '../searchView.js';
-import { getOutOfWorkspaceEditorResources } from '@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/search/common/search';
+import { searchDetailsIcon, searchOpenInFileIcon, searchActivityBarIcon } from '@codingame/monaco-vscode-85f7fb0f-70f5-5a5e-831b-15c743a8bd11-common/vscode/vs/workbench/contrib/search/browser/searchIcons';
+import { getEditorSelectionFromMatch } from '@codingame/monaco-vscode-bc8c28cd-7a80-54a9-af1a-e6b1e7a7f34a-common/vscode/vs/workbench/contrib/search/browser/searchView';
+import { getOutOfWorkspaceEditorResources } from '@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/workbench/contrib/search/common/search';
 import { SIDE_GROUP, ACTIVE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { QueryBuilder } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/queryBuilder';
@@ -27,8 +27,8 @@ import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/
 import { Sequencer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { SearchModelImpl } from '../searchTreeModel/searchModel.js';
-import { SearchModelLocation } from '@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon';
-import { searchComparer } from '@codingame/monaco-vscode-45a408c6-90ed-5d8b-801d-f3f69c7a97f2-common/vscode/vs/workbench/contrib/search/browser/searchCompare';
+import { SearchModelLocation } from '@codingame/monaco-vscode-85f7fb0f-70f5-5a5e-831b-15c743a8bd11-common/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon';
+import { searchComparer } from '@codingame/monaco-vscode-85f7fb0f-70f5-5a5e-831b-15c743a8bd11-common/vscode/vs/workbench/contrib/search/browser/searchCompare';
 
 const TEXT_SEARCH_QUICK_ACCESS_PREFIX = '%';
 const DEFAULT_TEXT_QUERY_BUILDER_OPTIONS = {
@@ -86,7 +86,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
         picker.buttons = [{
                 location: QuickInputButtonLocation.Inline,
                 iconClass: ThemeIcon.asClassName(Codicon.goToSearch),
-                tooltip: ( localize(9285, "Open in Search View"))
+                tooltip: ( localize(9537, "Open in Search View"))
             }];
         this.editorViewState.reset();
         disposables.add(picker.onDidTriggerButton(async () => {
@@ -200,7 +200,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                     type: 'separator',
                 });
                 picks.push({
-                    label: ( localize(9286, "See More Files")),
+                    label: ( localize(9538, "See More Files")),
                     iconClass: ThemeIcon.asClassName(searchDetailsIcon),
                     accept: async () => {
                         await this.moveToSearchViewlet(matches[limit]);
@@ -217,7 +217,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                 description,
                 buttons: [{
                         iconClass: ThemeIcon.asClassName(searchOpenInFileIcon),
-                        tooltip: ( localize(9287, "Open File"))
+                        tooltip: ( localize(9539, "Open File"))
                     }],
                 trigger: async () => {
                     await this.handleAccept(iFileInstanceMatch, {});
@@ -229,7 +229,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                 const element = results[matchIndex];
                 if (matchIndex === MAX_RESULTS_PER_FILE) {
                     picks.push({
-                        label: ( localize(9288, "More")),
+                        label: ( localize(9540, "More")),
                         iconClass: ThemeIcon.asClassName(searchDetailsIcon),
                         accept: async () => {
                             await this.moveToSearchViewlet(element);
@@ -250,7 +250,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                     },
                     buttons: [{
                             iconClass: ThemeIcon.asClassName(searchActivityBarIcon),
-                            tooltip: ( localize(9289, "Open in Search View")),
+                            tooltip: ( localize(9541, "Open in Search View")),
                         }],
                     ariaLabel: `Match at location ${element.range().startLineNumber}:${element.range().startColumn} - ${previewText}`,
                     accept: async (keyMods, event) => {
@@ -288,7 +288,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
         if (contentPattern === '') {
             this.searchModel.searchResult.clear();
             return [{
-                    label: ( localize(9290, "Enter a term to search for across your files."))
+                    label: ( localize(9542, "Enter a term to search for across your files."))
                 }];
         }
         const conditionalTokenCts = disposables.add(( new CancellationTokenSource()));
@@ -313,7 +313,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
             picks: syncResult,
             additionalPicks: allMatches.asyncResults
                 .then(asyncResults => (asyncResults.length + syncResult.length === 0) ? [{
-                    label: ( localize(9291, "No matching results"))
+                    label: ( localize(9543, "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.d.ts

@@ -11,7 +11,7 @@ import { ITextFileService } from "@codingame/monaco-vscode-api/vscode/vs/workben
 import { IBulkEditService } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService.service";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { INotebookEditorModelResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service";
-import { ISearchTreeFileMatch, ISearchTreeMatch, FileMatchOrMatch } from "@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon";
+import { ISearchTreeFileMatch, ISearchTreeMatch, FileMatchOrMatch } from "@codingame/monaco-vscode-85f7fb0f-70f5-5a5e-831b-15c743a8bd11-common/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon";
 export declare class ReplacePreviewContentProvider implements ITextModelContentProvider, IWorkbenchContribution {
     private readonly instantiationService;
     private readonly textModelResolverService;

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

@@ -23,8 +23,8 @@ import { Promises } from '@codingame/monaco-vscode-api/vscode/vs/base/common/asy
 import { SaveSourceRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookEditorModelResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service';
-import { isSearchTreeMatch, isSearchTreeFileMatch } from '@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon';
-import { isIMatchInNotebook } from '@codingame/monaco-vscode-45a408c6-90ed-5d8b-801d-f3f69c7a97f2-common/vscode/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchModelBase';
+import { isSearchTreeMatch, isSearchTreeFileMatch } from '@codingame/monaco-vscode-85f7fb0f-70f5-5a5e-831b-15c743a8bd11-common/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon';
+import { isIMatchInNotebook } from '@codingame/monaco-vscode-85f7fb0f-70f5-5a5e-831b-15c743a8bd11-common/vscode/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchModelBase';
 
 var ReplaceService_1;
 const REPLACE_PREVIEW = 'replacePreview';
@@ -90,7 +90,7 @@ ReplacePreviewModel = ( __decorate([
 ], ReplacePreviewModel));
 let ReplaceService = class ReplaceService {
     static { ReplaceService_1 = this; }
-    static { this.REPLACE_SAVE_SOURCE = SaveSourceRegistry.registerSource('searchReplace.source', ( localize(9292, "Search and Replace"))); }
+    static { this.REPLACE_SAVE_SOURCE = SaveSourceRegistry.registerSource('searchReplace.source', ( localize(9544, "Search and Replace"))); }
     constructor(textFileService, editorService, textModelResolverService, bulkEditorService, labelService, notebookEditorModelResolverService) {
         this.textFileService = textFileService;
         this.editorService = editorService;
@@ -128,7 +128,7 @@ let ReplaceService = class ReplaceService {
         const editor = await this.editorService.openEditor({
             original: { resource: fileMatch.resource },
             modified: { resource: toReplaceResource(fileMatch.resource) },
-            label: ( localize(9293, "{0} ↔ {1} (Replace Preview)", fileMatch.name(), fileMatch.name())),
+            label: ( localize(9545, "{0} ↔ {1} (Replace Preview)", fileMatch.name(), fileMatch.name())),
             description: this.labelService.getUriLabel(dirname(fileMatch.resource), { relative: true }),
             options: {
                 preserveFocus,