@codingame/monaco-vscode-search-service-override 4.5.0 → 4.5.2

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

@@ -26,6 +26,7 @@ import { PickerEditorState } from 'vscode/vscode/vs/workbench/browser/quickacces
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { Sequencer } from 'vscode/vscode/vs/base/common/async';
 
+const _moduleId = "vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess";
 const TEXT_SEARCH_QUICK_ACCESS_PREFIX = '%';
 const DEFAULT_TEXT_QUERY_BUILDER_OPTIONS = {
     _reason: 'quickAccessSearch',
@@ -68,14 +69,14 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
         this.searchModel = this._register(this._instantiationService.createInstance(SearchModel));
         this.editorViewState = this._register(this._instantiationService.createInstance(PickerEditorState));
         this.searchModel.location = SearchModelLocation.QUICK_ACCESS;
-        this.editorSequencer = ( new Sequencer());
+        this.editorSequencer = ( (new Sequencer()));
     }
     dispose() {
         this.searchModel.dispose();
         super.dispose();
     }
     provide(picker, token, runOptions) {
-        const disposables = ( new DisposableStore());
+        const disposables = ( (new DisposableStore()));
         if (TEXT_SEARCH_QUICK_ACCESS_PREFIX.length < picker.value.length) {
             picker.valueSelection = [TEXT_SEARCH_QUICK_ACCESS_PREFIX.length, picker.value.length];
         }
@@ -143,13 +144,13 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
         };
         this.searchModel.searchResult.toggleHighlights(false);
         const charsPerLine = content.isRegExp ? 10000 : 1000;
-        const query = this.queryBuilder.text(content, ( folderResources.map(folder => folder.uri)), this._getTextQueryBuilderOptions(charsPerLine));
+        const query = this.queryBuilder.text(content, ( (folderResources.map(folder => folder.uri))), this._getTextQueryBuilderOptions(charsPerLine));
         const result = this.searchModel.search(query, undefined, token);
         const getAsyncResults = async () => {
             this.currentAsyncSearch = result.asyncResults;
             await result.asyncResults;
-            const syncResultURIs = ( new ResourceSet(( result.syncResults.map(e => e.resource))));
-            return this.searchModel.searchResult.matches().filter(e => !( syncResultURIs.has(e.resource)));
+            const syncResultURIs = ( (new ResourceSet( (result.syncResults.map(e => e.resource)))));
+            return this.searchModel.searchResult.matches().filter(e => !( (syncResultURIs.has(e.resource))));
         };
         return {
             syncResults: this.searchModel.searchResult.matches(),
@@ -182,11 +183,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                     type: 'separator',
                 });
                 picks.push({
-                    label: ( localizeWithPath(
-                        'vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess',
-                        'QuickSearchSeeMoreFiles',
-                        "See More Files"
-                    )),
+                    label: ( localizeWithPath(_moduleId, 0, "See More Files")),
                     iconClass: ThemeIcon.asClassName(searchDetailsIcon),
                     accept: async () => {
                         this.moveToSearchViewlet(matches[limit]);
@@ -203,11 +200,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                 description,
                 buttons: [{
                         iconClass: ThemeIcon.asClassName(searchOpenInFileIcon),
-                        tooltip: ( localizeWithPath(
-                            'vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess',
-                            'QuickSearchOpenInFile',
-                            "Open File"
-                        ))
+                        tooltip: ( localizeWithPath(_moduleId, 1, "Open File"))
                     }],
                 trigger: async () => {
                     await this.handleAccept(fileMatch, {});
@@ -219,11 +212,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                 const element = results[matchIndex];
                 if (matchIndex === MAX_RESULTS_PER_FILE) {
                     picks.push({
-                        label: ( localizeWithPath(
-                            'vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess',
-                            'QuickSearchMore',
-                            "More"
-                        )),
+                        label: ( localizeWithPath(_moduleId, 2, "More")),
                         iconClass: ThemeIcon.asClassName(searchDetailsIcon),
                         accept: async () => {
                             this.moveToSearchViewlet(element);
@@ -244,11 +233,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                     },
                     buttons: [{
                             iconClass: ThemeIcon.asClassName(searchActivityBarIcon),
-                            tooltip: ( localizeWithPath(
-                                'vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess',
-                                'showMore',
-                                "See in Search Panel"
-                            )),
+                            tooltip: ( localizeWithPath(_moduleId, 3, "See in Search Panel")),
                         }],
                     ariaLabel: `Match at location ${element.range().startLineNumber}:${element.range().startColumn} - ${previewText}`,
                     accept: async (keyMods, event) => {
@@ -286,14 +271,10 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
         if (contentPattern === '') {
             this.searchModel.searchResult.clear();
             return [{
-                    label: ( localizeWithPath(
-                        'vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess',
-                        'enterSearchTerm',
-                        "Enter a term to search for across your files."
-                    ))
+                    label: ( localizeWithPath(_moduleId, 4, "Enter a term to search for across your files."))
                 }];
         }
-        const conditionalTokenCts = disposables.add(( new CancellationTokenSource()));
+        const conditionalTokenCts = disposables.add(( (new CancellationTokenSource())));
         disposables.add(token.onCancellationRequested(() => {
             if (searchModelAtTimeOfSearch.location === SearchModelLocation.QUICK_ACCESS) {
                 conditionalTokenCts.cancel();
@@ -315,11 +296,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
             picks: syncResult,
             additionalPicks: allMatches.asyncResults
                 .then(asyncResults => (asyncResults.length + syncResult.length === 0) ? [{
-                    label: ( localizeWithPath(
-                        'vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess',
-                        'noAnythingResults',
-                        "No matching results"
-                    ))
+                    label: ( localizeWithPath(_moduleId, 5, "No matching results"))
                 }] : this._getPicksFromMatches(asyncResults, MAX_FILES_SHOWN - matches.length))
                 .then(picks => {
                 if (picks.length > 0) {
@@ -330,13 +307,13 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
         };
     }
 };
-TextSearchQuickAccess = ( __decorate([
-    ( __param(0, IInstantiationService)),
-    ( __param(1, IWorkspaceContextService)),
-    ( __param(2, IEditorService)),
-    ( __param(3, ILabelService)),
-    ( __param(4, IViewsService)),
-    ( __param(5, IConfigurationService))
-], TextSearchQuickAccess));
+TextSearchQuickAccess = ( (__decorate([
+    ( (__param(0, IInstantiationService))),
+    ( (__param(1, IWorkspaceContextService))),
+    ( (__param(2, IEditorService))),
+    ( (__param(3, ILabelService))),
+    ( (__param(4, IViewsService))),
+    ( (__param(5, IConfigurationService)))
+], TextSearchQuickAccess)));
 
 export { TEXT_SEARCH_QUICK_ACCESS_PREFIX, TextSearchQuickAccess };

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

@@ -23,6 +23,7 @@ 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 }) });
@@ -44,10 +45,10 @@ let ReplacePreviewContentProvider = class ReplacePreviewContentProvider {
         return null;
     }
 };
-ReplacePreviewContentProvider = ( __decorate([
-    ( __param(0, IInstantiationService)),
-    ( __param(1, ITextModelService))
-], ReplacePreviewContentProvider));
+ReplacePreviewContentProvider = ( (__decorate([
+    ( (__param(0, IInstantiationService))),
+    ( (__param(1, ITextModelService)))
+], ReplacePreviewContentProvider)));
 let ReplacePreviewModel = class ReplacePreviewModel extends Disposable {
     constructor(modelService, languageService, textModelResolverService, replaceService, searchWorkbenchService) {
         super();
@@ -59,7 +60,7 @@ let ReplacePreviewModel = class ReplacePreviewModel extends Disposable {
     }
     async resolve(replacePreviewUri) {
         const fileResource = toFileResource(replacePreviewUri);
-        const fileMatch = this.searchWorkbenchService.searchModel.searchResult.matches().filter(match => ( match.resource.toString()) === ( fileResource.toString()))[0];
+        const fileMatch = this.searchWorkbenchService.searchModel.searchResult.matches().filter(match => ( (match.resource.toString())) === ( (fileResource.toString())))[0];
         const ref = this._register(await this.textModelResolverService.createModelReference(fileResource));
         const sourceModel = ref.object.textEditorModel;
         const sourceModelLanguageId = sourceModel.getLanguageId();
@@ -77,20 +78,16 @@ let ReplacePreviewModel = class ReplacePreviewModel extends Disposable {
         }
     }
 };
-ReplacePreviewModel = ( __decorate([
-    ( __param(0, IModelService)),
-    ( __param(1, ILanguageService)),
-    ( __param(2, ITextModelService)),
-    ( __param(3, IReplaceService)),
-    ( __param(4, ISearchViewModelWorkbenchService))
-], ReplacePreviewModel));
+ReplacePreviewModel = ( (__decorate([
+    ( (__param(0, IModelService))),
+    ( (__param(1, ILanguageService))),
+    ( (__param(2, ITextModelService))),
+    ( (__param(3, IReplaceService))),
+    ( (__param(4, ISearchViewModelWorkbenchService)))
+], ReplacePreviewModel)));
 let ReplaceService = class ReplaceService {
     static { ReplaceService_1 = this; }
-    static { this.REPLACE_SAVE_SOURCE = SaveSourceRegistry.registerSource('searchReplace.source', ( localizeWithPath(
-        'vs/workbench/contrib/search/browser/replaceService',
-        'searchReplace.source',
-        "Search and Replace"
-    ))); }
+    static { this.REPLACE_SAVE_SOURCE = SaveSourceRegistry.registerSource('searchReplace.source', ( localizeWithPath(_moduleId, 0, "Search and Replace"))); }
     constructor(textFileService, editorService, textModelResolverService, bulkEditorService, labelService, notebookEditorModelResolverService) {
         this.textFileService = textFileService;
         this.editorService = editorService;
@@ -102,7 +99,7 @@ let ReplaceService = class ReplaceService {
     async replace(arg, progress = undefined, resource = null) {
         const edits = this.createEdits(arg, resource);
         await this.bulkEditorService.apply(edits, { progress });
-        const rawTextPromises = ( edits.map(async (e) => {
+        const rawTextPromises = ( (edits.map(async (e) => {
             if (e.resource.scheme === Schemas.vscodeNotebookCell) {
                 const notebookResource = CellUri.parse(e.resource)?.notebook;
                 if (notebookResource) {
@@ -120,7 +117,7 @@ let ReplaceService = class ReplaceService {
             else {
                 return this.textFileService.files.get(e.resource)?.save({ source: ReplaceService_1.REPLACE_SAVE_SOURCE });
             }
-        }));
+        })));
         return Promises.settled(rawTextPromises);
     }
     async openReplacePreview(element, preserveFocus, sideBySide, pinned) {
@@ -129,8 +126,8 @@ let ReplaceService = class ReplaceService {
             original: { resource: fileMatch.resource },
             modified: { resource: toReplaceResource(fileMatch.resource) },
             label: ( localizeWithPath(
-                'vs/workbench/contrib/search/browser/replaceService',
-                'fileReplaceChanges',
+                _moduleId,
+                1,
                 "{0} ↔ {1} (Replace Preview)",
                 fileMatch.name(),
                 fileMatch.name()
@@ -213,21 +210,23 @@ let ReplaceService = class ReplaceService {
     }
     createEdit(match, text, resource = null) {
         const fileMatch = match.parent();
-        return ( new ResourceTextEdit(
-            resource ?? fileMatch.resource,
-            { range: match.range(), text },
-            undefined,
-            undefined
-        ));
+        return (
+             (new ResourceTextEdit(
+                resource ?? fileMatch.resource,
+                { range: match.range(), text },
+                undefined,
+                undefined
+            ))
+        );
     }
 };
-ReplaceService = ReplaceService_1 = ( __decorate([
-    ( __param(0, ITextFileService)),
-    ( __param(1, IEditorService)),
-    ( __param(2, ITextModelService)),
-    ( __param(3, IBulkEditService)),
-    ( __param(4, ILabelService)),
-    ( __param(5, INotebookEditorModelResolverService))
-], ReplaceService));
+ReplaceService = ReplaceService_1 = ( (__decorate([
+    ( (__param(0, ITextFileService))),
+    ( (__param(1, IEditorService))),
+    ( (__param(2, ITextModelService))),
+    ( (__param(3, IBulkEditService))),
+    ( (__param(4, ILabelService))),
+    ( (__param(5, INotebookEditorModelResolverService)))
+], ReplaceService)));
 
 export { ReplacePreviewContentProvider, ReplaceService };