@codingame/monaco-vscode-search-service-override 37.2.0 → 37.3.0

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

@@ -55,24 +55,24 @@ const SelectAllSearchEditorMatchesCommandId = "selectAllSearchEditorMatches";
             type: "string",
             enum: ["selectWord", "goToLocation", "openLocationToSide"],
             default: "goToLocation",
-            enumDescriptions: [( localize(16165, "Double-clicking selects the word under the cursor.")), ( localize(16166, "Double-clicking opens the result in the active editor group.")), ( localize(
-                16167,
+            enumDescriptions: [( localize(18304, "Double-clicking selects the word under the cursor.")), ( localize(18305, "Double-clicking opens the result in the active editor group.")), ( localize(
+                18306,
                 "Double-clicking opens the result in the editor group to the side, creating one if it does not yet exist."
             ))],
-            markdownDescription: ( localize(16168, "Configure effect of double-clicking a result in a search editor."))
+            markdownDescription: ( localize(18307, "Configure effect of double-clicking a result in a search editor."))
         },
         "search.searchEditor.singleClickBehaviour": {
             type: "string",
             enum: ["default", "peekDefinition"],
             default: "default",
-            enumDescriptions: [( localize(16169, "Single-clicking does nothing.")), ( localize(16170, "Single-clicking opens a Peek Definition window."))],
-            markdownDescription: ( localize(16171, "Configure effect of single-clicking a result in a search editor."))
+            enumDescriptions: [( localize(18308, "Single-clicking does nothing.")), ( localize(18309, "Single-clicking opens a Peek Definition window."))],
+            markdownDescription: ( localize(18310, "Configure effect of single-clicking a result in a search editor."))
         },
         "search.searchEditor.reusePriorSearchConfiguration": {
             type: "boolean",
             default: false,
             markdownDescription: ( localize(
-                16172,
+                18311,
                 "When enabled, new Search Editors will reuse the includes, excludes, and flags of the previously opened Search Editor."
             ))
         },
@@ -80,7 +80,7 @@ const SelectAllSearchEditorMatchesCommandId = "selectAllSearchEditorMatches";
             type: ["number", "null"],
             default: 1,
             markdownDescription: ( localize(
-                16173,
+                18312,
                 "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."
             ))
         },
@@ -88,13 +88,13 @@ const SelectAllSearchEditorMatchesCommandId = "selectAllSearchEditorMatches";
             type: "boolean",
             default: false,
             markdownDescription: ( localize(
-                16174,
+                18313,
                 "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(16175, "Search Editor"))), [( new SyncDescriptor(SearchEditorInput))]);
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(SearchEditor, SearchEditor.ID, ( localize(18314, "Search Editor"))), [( new SyncDescriptor(SearchEditorInput))]);
 let SearchEditorContribution = class SearchEditorContribution {
     static {
         this.ID = "workbench.contrib.searchEditor";
@@ -102,7 +102,7 @@ let SearchEditorContribution = class SearchEditorContribution {
     constructor(editorResolverService, instantiationService) {
         editorResolverService.registerEditor("*" + SEARCH_EDITOR_EXT, {
             id: SearchEditorInput.ID,
-            label: ( localize(16176, "Search Editor")),
+            label: ( localize(18315, "Search Editor")),
             detail: DEFAULT_EDITOR_ASSOCIATION.providerDisplayName,
             priority: RegisteredEditorPriority.default
         }, {
@@ -209,7 +209,7 @@ CommandsRegistry.registerCommand(CleanSearchEditorStateCommandId, accessor => {
         activeEditorPane.cleanState();
     }
 });
-const category = ( localize2(16177, "Search Editor"));
+const category = ( localize2(18316, "Search Editor"));
 const translateLegacyConfig = (legacyConfig = {}) => {
     const config = {};
     const overrides = {
@@ -275,7 +275,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "search.searchEditor.action.deleteFileResults",
-            title: ( localize2(16178, "Delete File Results")),
+            title: ( localize2(18317, "Delete File Results")),
             keybinding: {
                 weight: KeybindingWeight.EditorContrib,
                 primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Backspace
@@ -296,7 +296,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: OpenNewEditorCommandId,
-            title: ( localize2(16179, "New Search Editor")),
+            title: ( localize2(18318, "New Search Editor")),
             category,
             f1: true,
             metadata: openArgMetadata
@@ -313,7 +313,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: OpenEditorCommandId,
-            title: ( localize2(16180, "Open Search Editor")),
+            title: ( localize2(18319, "Open Search Editor")),
             category,
             f1: true,
             metadata: openArgMetadata
@@ -330,7 +330,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: OpenNewEditorToSideCommandId,
-            title: ( localize2(16181, "Open New Search Editor to the Side")),
+            title: ( localize2(18320, "Open New Search Editor to the Side")),
             category,
             f1: true,
             metadata: openArgMetadata
@@ -344,7 +344,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: OpenInEditorCommandId,
-            title: ( localize2(16182, "Open Results in Editor")),
+            title: ( localize2(18321, "Open Results in Editor")),
             category,
             f1: true,
             keybinding: {
@@ -379,7 +379,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: RerunSearchEditorSearchCommandId,
-            title: ( localize2(16183, "Search Again")),
+            title: ( localize2(18322, "Search Again")),
             category,
             keybinding: {
                 primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyR,
@@ -387,11 +387,11 @@ registerAction2(class extends Action2 {
                 weight: KeybindingWeight.EditorContrib
             },
             icon: searchRefreshIcon,
-            menu: [...( [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].map(id => ({
+            menu: [...[MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].map(id => ({
                 id,
                 group: "navigation",
                 when: ( ActiveEditorContext.isEqualTo(SearchEditorID))
-            }))), {
+            })), {
                 id: MenuId.CommandPalette,
                 when: ( ActiveEditorContext.isEqualTo(SearchEditorID))
             }]
@@ -411,7 +411,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: FocusQueryEditorWidgetCommandId,
-            title: ( localize2(16184, "Focus Search Editor Input")),
+            title: ( localize2(18323, "Focus Search Editor Input")),
             category,
             f1: true,
             precondition: InSearchEditor,
@@ -433,7 +433,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: FocusQueryEditorFilesToIncludeCommandId,
-            title: ( localize2(16185, "Focus Search Editor Files to Include")),
+            title: ( localize2(18324, "Focus Search Editor Files to Include")),
             category,
             f1: true,
             precondition: InSearchEditor
@@ -451,7 +451,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: FocusQueryEditorFilesToExcludeCommandId,
-            title: ( localize2(16186, "Focus Search Editor Files to Exclude")),
+            title: ( localize2(18325, "Focus Search Editor Files to Exclude")),
             category,
             f1: true,
             precondition: InSearchEditor
@@ -469,7 +469,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: ToggleSearchEditorCaseSensitiveCommandId,
-            title: ( localize2(16187, "Toggle Match Case")),
+            title: ( localize2(18326, "Toggle Match Case")),
             category,
             f1: true,
             precondition: InSearchEditor,
@@ -487,7 +487,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: ToggleSearchEditorWholeWordCommandId,
-            title: ( localize2(16188, "Toggle Match Whole Word")),
+            title: ( localize2(18327, "Toggle Match Whole Word")),
             category,
             f1: true,
             precondition: InSearchEditor,
@@ -505,7 +505,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: ToggleSearchEditorRegexCommandId,
-            title: ( localize2(16189, "Toggle Use Regular Expression")),
+            title: ( localize2(18328, "Toggle Use Regular Expression")),
             category,
             f1: true,
             precondition: InSearchEditor,
@@ -523,7 +523,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: ToggleSearchEditorContextLinesCommandId,
-            title: ( localize2(16190, "Toggle Context Lines")),
+            title: ( localize2(18329, "Toggle Context Lines")),
             category,
             f1: true,
             precondition: InSearchEditor,
@@ -544,7 +544,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: IncreaseSearchEditorContextLinesCommandId,
-            title: ( localize2(16191, "Increase Context Lines")),
+            title: ( localize2(18330, "Increase Context Lines")),
             category,
             f1: true,
             precondition: InSearchEditor,
@@ -562,7 +562,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: DecreaseSearchEditorContextLinesCommandId,
-            title: ( localize2(16192, "Decrease Context Lines")),
+            title: ( localize2(18331, "Decrease Context Lines")),
             category,
             f1: true,
             precondition: InSearchEditor,
@@ -580,7 +580,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SelectAllSearchEditorMatchesCommandId,
-            title: ( localize2(16193, "Select All Matches")),
+            title: ( localize2(18332, "Select All Matches")),
             category,
             f1: true,
             precondition: InSearchEditor,
@@ -598,7 +598,7 @@ registerAction2(class OpenSearchEditorAction extends Action2 {
     constructor() {
         super({
             id: "search.action.openNewEditorFromView",
-            title: ( localize(16194, "Open New Search Editor")),
+            title: ( localize(18333, "Open New Search Editor")),
             category,
             icon: searchNewEditorIcon,
             menu: [{

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

@@ -67,7 +67,7 @@ import { getDefaultHoverDelegate } from '@codingame/monaco-vscode-api/vscode/vs/
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 
 var SearchEditor_1;
-registerCss(searchEditor);
+registerCss(searchEditor, 1);
 const RESULT_LINE_REGEX = /^(\s+)(\d+)(: |  )(\s*)(.*)$/;
 const FILE_LINE_REGEX = /^(\S.*):$/;
 const DEFAULT_QUERY_EDITOR_LAYOUT_OFFSET = 28;
@@ -187,7 +187,7 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
             resetCursor: false
         })));
         this.includesExcludesContainer = append(container, $(".includes-excludes"));
-        const toggleQueryDetailsLabel = ( localize(16195, "Toggle Search Details"));
+        const toggleQueryDetailsLabel = ( localize(18334, "Toggle Search Details"));
         this.toggleQueryDetailsButton = append(
             this.includesExcludesContainer,
             $(".expand" + ThemeIcon.asCSSSelector(searchDetailsIcon), {
@@ -230,11 +230,11 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
             })
         );
         const folderIncludesList = append(this.includesExcludesContainer, $(".file-types.includes"));
-        const filesToIncludeTitle = ( localize(16196, "files to include"));
+        const filesToIncludeTitle = ( localize(18335, "files to include"));
         append(folderIncludesList, $("h4", undefined, filesToIncludeTitle));
         this.inputPatternIncludes = this._register(
             scopedInstantiationService.createInstance(IncludePatternInputWidget, folderIncludesList, this.contextViewService, {
-                ariaLabel: ( localize(16197, "Search Include Patterns")),
+                ariaLabel: ( localize(18336, "Search Include Patterns")),
                 inputBoxStyles: searchEditorInputboxStyles
             })
         );
@@ -246,11 +246,11 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
             this.inputPatternIncludes.onChangeSearchInEditorsBox(() => this.triggerSearch())
         );
         const excludesList = append(this.includesExcludesContainer, $(".file-types.excludes"));
-        const excludesTitle = ( localize(16198, "files to exclude"));
+        const excludesTitle = ( localize(18337, "files to exclude"));
         append(excludesList, $("h4", undefined, excludesTitle));
         this.inputPatternExcludes = this._register(
             scopedInstantiationService.createInstance(ExcludePatternInputWidget, excludesList, this.contextViewService, {
-                ariaLabel: ( localize(16199, "Search Exclude Patterns")),
+                ariaLabel: ( localize(18338, "Search Exclude Patterns")),
                 inputBoxStyles: searchEditorInputboxStyles
             })
         );
@@ -279,7 +279,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(16200, "Run Search"))));
+            const runAgainLink = append(this.messageBox, $("a.pointer.prominent.message", {}, ( localize(18339, "Run Search"))));
             this.messageDisposables.add(addDisposableListener(runAgainLink, EventType.CLICK, async () => {
                 await this.triggerSearch();
                 this.searchResultEditor.focus();
@@ -456,10 +456,10 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
             endingCursorLines.push(1);
         }
         const isDefined = x => x !== undefined;
-        model.pushEditOperations(this.searchResultEditor.getSelections(), ( [...linesToDelete].map(line => ({
+        model.pushEditOperations(this.searchResultEditor.getSelections(), [...linesToDelete].map(line => ({
             range: ( new Range(line, 1, line + 1, 1)),
             text: ""
-        }))), () => ( endingCursorLines.filter(isDefined).map(line => ( new Selection(line, 1, line, 1)))));
+        })), () => endingCursorLines.filter(isDefined).map(line => ( new Selection(line, 1, line, 1))));
     }
     cleanState() {
         this.getInput()?.setDirty(false);
@@ -498,7 +498,7 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
             }
         }
         alert(( localize(
-            16201,
+            18340,
             "Matched {0} at {1} in file {2}",
             matchText,
             matchLineText,
@@ -512,12 +512,12 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
         this.iterateThroughMatches(true);
     }
     focusAllResults() {
-        this.searchResultEditor.setSelections(( (this.getInput()?.getMatchRanges() ?? []).map(range => ( new Selection(
+        this.searchResultEditor.setSelections((this.getInput()?.getMatchRanges() ?? []).map(range => ( new Selection(
             range.startLineNumber,
             range.startColumn,
             range.endLineNumber,
             range.endColumn
-        )))));
+        ))));
         this.searchResultEditor.focus();
     }
     async triggerSearch(_options) {
@@ -624,7 +624,7 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
         let query;
         try {
             const queryBuilder = this.instantiationService.createInstance(QueryBuilder);
-            query = queryBuilder.text(content, ( folderResources.map(folder => folder.uri)), options);
+            query = queryBuilder.text(content, folderResources.map(folder => folder.uri), options);
         } catch (err) {
             return;
         }
@@ -701,7 +701,7 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
         ));
     }
     async retrieveFileStats(searchResult) {
-        const files = ( searchResult.matches().filter(f => !f.fileStat).map(f => f.resolveFileStat(this.fileService)));
+        const files = searchResult.matches().filter(f => !f.fileStat).map(f => f.resolveFileStat(this.fileService));
         await Promise.all(files);
     }
     layout(dimension) {
@@ -846,11 +846,11 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
         }
     }
     getAriaLabel() {
-        return this.getInput()?.getName() ?? ( localize(16202, "Search"));
+        return this.getInput()?.getName() ?? ( localize(18341, "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(16203, "Search editor text input box border.")));
+const searchEditorTextInputBorder = registerColor("searchEditor.textInputBorder", inputBorder, ( localize(18342, "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

@@ -53,7 +53,7 @@ let LocalFileSearchWorkerClient = class LocalFileSearchWorkerClient extends Disp
             const proxy = this._getOrCreateWorker().proxy;
             const results = [];
             let limitHit = false;
-            await Promise.all(( query.folderQueries.map(async fq => {
+            await Promise.all(query.folderQueries.map(async fq => {
                 const queryId = this.queryId++;
                 queryDisposables.add(
                     token?.onCancellationRequested(e => this.cancelQuery(queryId)) || Disposable.None
@@ -80,7 +80,7 @@ let LocalFileSearchWorkerClient = class LocalFileSearchWorkerClient extends Disp
                 if (folderResults.limitHit) {
                     limitHit = true;
                 }
-            })));
+            }));
             queryDisposables.dispose();
             const result = {
                 messages: [],
@@ -93,7 +93,7 @@ let LocalFileSearchWorkerClient = class LocalFileSearchWorkerClient extends Disp
             return {
                 results: [],
                 messages: [{
-                    text: ( localize(20014, "Unable to search with Web Worker text searcher")),
+                    text: ( localize(22157, "Unable to search with Web Worker text searcher")),
                     type: TextSearchCompleteMessageType.Warning
                 }]
             };
@@ -105,7 +105,7 @@ let LocalFileSearchWorkerClient = class LocalFileSearchWorkerClient extends Disp
             let limitHit = false;
             const proxy = this._getOrCreateWorker().proxy;
             const results = [];
-            await Promise.all(( query.folderQueries.map(async fq => {
+            await Promise.all(query.folderQueries.map(async fq => {
                 const queryId = this.queryId++;
                 queryDisposables.add(
                     token?.onCancellationRequested(e => this.cancelQuery(queryId)) || Disposable.None
@@ -125,7 +125,7 @@ let LocalFileSearchWorkerClient = class LocalFileSearchWorkerClient extends Disp
                 if (folderResults.limitHit) {
                     limitHit = true;
                 }
-            })));
+            }));
             queryDisposables.dispose();
             const result = {
                 messages: [],
@@ -138,7 +138,7 @@ let LocalFileSearchWorkerClient = class LocalFileSearchWorkerClient extends Disp
             return {
                 results: [],
                 messages: [{
-                    text: ( localize(20015, "Unable to search with Web Worker file searcher")),
+                    text: ( localize(22158, "Unable to search with Web Worker file searcher")),
                     type: TextSearchCompleteMessageType.Warning
                 }]
             };

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

@@ -162,7 +162,7 @@ let SearchService = class SearchService extends Disposable {
                 }
                 onProgress?.(item);
             };
-            const exists = await Promise.all(( query.folderQueries.map(query => this.fileService.exists(query.folder))));
+            const exists = await Promise.all(query.folderQueries.map(query => this.fileService.exists(query.folder)));
             query.folderQueries = query.folderQueries.filter((_, i) => exists[i]);
             let completes = await this.searchWithProviders(query, progressCallback, token);
             completes = coalesce(completes);
@@ -232,7 +232,7 @@ let SearchService = class SearchService extends Disposable {
         const someSchemeHasProvider = ( [...( fqs.keys())].some(scheme => {
             return ( this.getSearchProvider(query.type).has(scheme));
         }));
-        await Promise.all(( [...( fqs.keys())].map(async scheme => {
+        await Promise.all([...( fqs.keys())].map(async scheme => {
             if (query.onlyFileScheme && scheme !== Schemas.file) {
                 return;
             }
@@ -272,7 +272,7 @@ let SearchService = class SearchService extends Disposable {
                 }
             };
             searchPs.push(doProviderSearch());
-        })));
+        }));
         return Promise.all(searchPs).then(completes => {
             const endToEndTime = e2eSW.elapsed();
             this.logService.trace(`SearchService#search: ${endToEndTime}ms`);
@@ -425,7 +425,7 @@ let SearchService = class SearchService extends Disposable {
         return pathIncludedInQuery(query, resource.fsPath);
     }
     async clearCache(cacheKey) {
-        const clearPs = ( Array.from(( this.fileSearchProviders.values())).map(provider => provider && provider.clearCache(cacheKey)));
+        const clearPs = Array.from(( this.fileSearchProviders.values())).map(provider => provider && provider.clearCache(cacheKey));
         await Promise.all(clearPs);
     }
 };

package/vscode/src/vs/workbench/services/search/worker/localFileSearch.js

@@ -166,13 +166,13 @@ class LocalFileSearchWorker {
                     directory.getFileHandle(".gitignore").catch(e => undefined),
                     directory.getFileHandle(".ignore").catch(e => undefined)
                 ]);
-                await Promise.all(( ignoreFiles.map(async file => {
+                await Promise.all(ignoreFiles.map(async file => {
                     if (!file) {
                         return;
                     }
                     const ignoreContents = ( new TextDecoder("utf8")).decode(( new Uint8Array(await (await file.getFile()).arrayBuffer())));
                     ignoreFile = ( new IgnoreFile(ignoreContents, prior, ignoreFile, ignoreGlobCase));
-                })));
+                }));
             }
             const entries = Promises.withAsyncBody(async c => {
                 const files = [];
@@ -210,13 +210,15 @@ class LocalFileSearchWorker {
             if (token.isCancellationRequested) {
                 return;
             }
-            await Promise.all(( (await directory.entries).sort((a, b) => -(a.type === "dir" ? 0 : 1) + (b.type === "dir" ? 0 : 1)).map(async entry => {
-                if (entry.type === "dir") {
-                    return resolveDirectory(entry, onFile);
-                } else {
-                    return onFile(entry);
-                }
-            })));
+            await Promise.all(
+                (await directory.entries).sort((a, b) => -(a.type === "dir" ? 0 : 1) + (b.type === "dir" ? 0 : 1)).map(async entry => {
+                    if (entry.type === "dir") {
+                        return resolveDirectory(entry, onFile);
+                    } else {
+                        return onFile(entry);
+                    }
+                })
+            );
         };
         const processed = await time("process", () => processDirectory(handle, "/"));
         await time("resolve", () => resolveDirectory(processed, onFile));
@@ -245,7 +247,7 @@ function reviveQueryProps(queryProps) {
     return {
         ...queryProps,
         extraFileResources: queryProps.extraFileResources?.map(r => URI.revive(r)),
-        folderQueries: ( queryProps.folderQueries.map(fq => reviveFolderQuery(fq)))
+        folderQueries: queryProps.folderQueries.map(fq => reviveFolderQuery(fq))
     };
 }
 function pathExcludedInQuery(queryProps, fsPath) {

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

@@ -1 +0,0 @@
-export declare function registerContributions(): void;

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

@@ -1,15 +0,0 @@
-
-import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { ReplacePreviewContentProvider } from './replaceService.js';
-import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
-
-function registerContributions() {
-    registerWorkbenchContribution2(
-        ReplacePreviewContentProvider.ID,
-        ReplacePreviewContentProvider,
-        WorkbenchPhase.BlockStartup
-    );
-}
-
-export { registerContributions };

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

@@ -1,40 +0,0 @@
-import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { IReplaceService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/search/browser/replace.service";
-import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
-import { IProgress, IProgressStep } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress";
-import { ITextModelContentProvider } from "@codingame/monaco-vscode-model-service-override/vscode/vs/editor/common/services/resolverService";
-import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
-import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
-import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
-import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { ITextFileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service";
-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-api/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon";
-export declare class ReplacePreviewContentProvider implements ITextModelContentProvider, IWorkbenchContribution {
-    private readonly instantiationService;
-    private readonly textModelResolverService;
-    static readonly ID = "workbench.contrib.replacePreviewContentProvider";
-    constructor(instantiationService: IInstantiationService, textModelResolverService: ITextModelService);
-    provideTextContent(uri: URI): Promise<ITextModel> | null;
-}
-export declare class ReplaceService implements IReplaceService {
-    private readonly textFileService;
-    private readonly editorService;
-    private readonly textModelResolverService;
-    private readonly bulkEditorService;
-    private readonly labelService;
-    private readonly notebookEditorModelResolverService;
-    readonly _serviceBrand: undefined;
-    private static readonly REPLACE_SAVE_SOURCE;
-    constructor(textFileService: ITextFileService, editorService: IEditorService, textModelResolverService: ITextModelService, bulkEditorService: IBulkEditService, labelService: ILabelService, notebookEditorModelResolverService: INotebookEditorModelResolverService);
-    replace(match: ISearchTreeMatch): Promise<any>;
-    replace(files: ISearchTreeFileMatch[], progress?: IProgress<IProgressStep>): Promise<any>;
-    replace(match: FileMatchOrMatch, progress?: IProgress<IProgressStep>, resource?: URI): Promise<any>;
-    openReplacePreview(element: FileMatchOrMatch, preserveFocus?: boolean, sideBySide?: boolean, pinned?: boolean): Promise<any>;
-    updateReplacePreview(fileMatch: ISearchTreeFileMatch, override?: boolean): Promise<void>;
-    private applyEditsToPreview;
-    private createEdits;
-    private createEdit;
-}