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

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

@@ -25,12 +25,9 @@ import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
 
 var SearchEditorInput_1;
+const _moduleId = "vs/workbench/contrib/searchEditor/browser/searchEditorInput";
 const SEARCH_EDITOR_EXT = '.code-search';
-const SearchEditorIcon = registerIcon('search-editor-label-icon', Codicon.search, ( localizeWithPath(
-    'vs/workbench/contrib/searchEditor/browser/searchEditorInput',
-    'searchEditorLabelIcon',
-    'Icon of the search editor label.'
-)));
+const SearchEditorIcon = registerIcon('search-editor-label-icon', Codicon.search, ( localizeWithPath(_moduleId, 0, 'Icon of the search editor label.')));
 let SearchEditorInput = class SearchEditorInput extends EditorInput {
     static { SearchEditorInput_1 = this; }
     static { this.ID = SearchEditorInputTypeId; }
@@ -65,16 +62,16 @@ let SearchEditorInput = class SearchEditorInput extends EditorInput {
         this.telemetryService = telemetryService;
         this.pathService = pathService;
         this.dirty = false;
-        this._onDidChangeContent = this._register(( new Emitter()));
+        this._onDidChangeContent = this._register(( (new Emitter())));
         this.onDidChangeContent = this._onDidChangeContent.event;
-        this._onDidSave = this._register(( new Emitter()));
+        this._onDidSave = this._register(( (new Emitter())));
         this.onDidSave = this._onDidSave.event;
         this.oldDecorationsIDs = [];
         this.model = instantiationService.createInstance(SearchEditorModel, modelUri);
         if (this.modelUri.scheme !== SearchEditorScheme) {
             throw Error('SearchEditorInput must be invoked with a SearchEditorScheme uri');
         }
-        this.memento = ( new Memento(SearchEditorInput_1.ID, storageService));
+        this.memento = ( (new Memento(SearchEditorInput_1.ID, storageService)));
         storageService.onWillSaveState(() => this.memento.saveMemento());
         const input = this;
         const workingCopyAdapter = new (class {
@@ -163,26 +160,17 @@ let SearchEditorInput = class SearchEditorInput extends EditorInput {
         if (this.backingUri) {
             const originalURI = EditorResourceAccessor.getOriginalUri(this);
             return ( localizeWithPath(
-                'vs/workbench/contrib/searchEditor/browser/searchEditorInput',
-                'searchTitle.withQuery',
+                _moduleId,
+                1,
                 "Search: {0}",
                 basename((originalURI ?? this.backingUri).path, SEARCH_EDITOR_EXT)
             ));
         }
         const query = this._cachedConfigurationModel?.config?.query?.trim();
         if (query) {
-            return ( localizeWithPath(
-                'vs/workbench/contrib/searchEditor/browser/searchEditorInput',
-                'searchTitle.withQuery',
-                "Search: {0}",
-                trimToMax(query)
-            ));
+            return ( localizeWithPath(_moduleId, 1, "Search: {0}", trimToMax(query)));
         }
-        return ( localizeWithPath(
-            'vs/workbench/contrib/searchEditor/browser/searchEditorInput',
-            'searchTitle',
-            "Search"
-        ));
+        return ( localizeWithPath(_moduleId, 2, "Search"));
     }
     setDirty(dirty) {
         const wasDirty = this.dirty;
@@ -216,15 +204,17 @@ let SearchEditorInput = class SearchEditorInput extends EditorInput {
         return false;
     }
     getMatchRanges() {
-        return ( (this._cachedResultsModel?.getAllDecorations() ?? [])
-            .filter(decoration => decoration.options.className === SearchEditorFindMatchClass)
-            .filter(({ range }) => !(range.startColumn === 1 && range.endColumn === 1))
-            .map(({ range }) => range));
+        return (
+             ((this._cachedResultsModel?.getAllDecorations() ?? [])
+                .filter(decoration => decoration.options.className === SearchEditorFindMatchClass)
+                .filter(({ range }) => !(range.startColumn === 1 && range.endColumn === 1))
+                .map(({ range }) => range))
+        );
     }
     async setMatchRanges(ranges) {
-        this.oldDecorationsIDs = (await this.resolveModels()).resultsModel.deltaDecorations(this.oldDecorationsIDs, ( ranges.map(
+        this.oldDecorationsIDs = (await this.resolveModels()).resultsModel.deltaDecorations(this.oldDecorationsIDs, ( (ranges.map(
             range => ({ range, options: { description: 'search-editor-find-match', className: SearchEditorFindMatchClass, stickiness: 1  } })
-        )));
+        ))));
     }
     async revert(group, options) {
         if (options?.soft) {
@@ -269,22 +259,22 @@ let SearchEditorInput = class SearchEditorInput extends EditorInput {
         };
     }
 };
-SearchEditorInput = SearchEditorInput_1 = ( __decorate([
-    ( __param(2, IModelService)),
-    ( __param(3, ITextFileService)),
-    ( __param(4, IFileDialogService)),
-    ( __param(5, IInstantiationService)),
-    ( __param(6, IWorkingCopyService)),
-    ( __param(7, ITelemetryService)),
-    ( __param(8, IPathService)),
-    ( __param(9, IStorageService))
-], SearchEditorInput));
+SearchEditorInput = SearchEditorInput_1 = ( (__decorate([
+    ( (__param(2, IModelService))),
+    ( (__param(3, ITextFileService))),
+    ( (__param(4, IFileDialogService))),
+    ( (__param(5, IInstantiationService))),
+    ( (__param(6, IWorkingCopyService))),
+    ( (__param(7, ITelemetryService))),
+    ( (__param(8, IPathService))),
+    ( (__param(9, IStorageService)))
+], SearchEditorInput)));
 const getOrMakeSearchEditorInput = (accessor, existingData) => {
     const storageService = accessor.get(IStorageService);
     const configurationService = accessor.get(IConfigurationService);
     const instantiationService = accessor.get(IInstantiationService);
-    const modelUri = existingData.from === 'model' ? existingData.modelUri : ( URI.from({ scheme: SearchEditorScheme, fragment: `${Math.random()}` }));
-    if (!( searchEditorModelFactory.models.has(modelUri))) {
+    const modelUri = existingData.from === 'model' ? existingData.modelUri : ( (URI.from({ scheme: SearchEditorScheme, fragment: `${Math.random()}` })));
+    if (!( (searchEditorModelFactory.models.has(modelUri)))) {
         if (existingData.from === 'existingFile') {
             instantiationService.invokeFunction(accessor => searchEditorModelFactory.initializeModelFromExistingFile(accessor, modelUri, existingData.fileUri));
         }
@@ -292,7 +282,7 @@ const getOrMakeSearchEditorInput = (accessor, existingData) => {
             const searchEditorSettings = configurationService.getValue('search').searchEditor;
             const reuseOldSettings = searchEditorSettings.reusePriorSearchConfiguration;
             const defaultNumberOfContextLines = searchEditorSettings.defaultNumberOfContextLines;
-            const priorConfig = reuseOldSettings ? ( new Memento(SearchEditorInput.ID, storageService)).getMemento(1 , 1 ).searchConfig : {};
+            const priorConfig = reuseOldSettings ? ( (new Memento(SearchEditorInput.ID, storageService))).getMemento(1 , 1 ).searchConfig : {};
             const defaultConfig = defaultSearchConfig();
             const config = { ...defaultConfig, ...priorConfig, ...existingData.config };
             if (defaultNumberOfContextLines !== null && defaultNumberOfContextLines !== undefined) {

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

@@ -5,13 +5,14 @@ import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { searchMatchComparer } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
 import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
 
+const _moduleId = "vs/workbench/contrib/searchEditor/browser/searchEditorSerialization";
 const lineDelimiter = '\n';
-const translateRangeLines = (n) => (range) => ( new Range(
+const translateRangeLines = (n) => (range) => ( (new Range(
     range.startLineNumber + n,
     range.startColumn,
     range.endLineNumber + n,
     range.endColumn
-));
+)));
 const matchToSearchResultFormat = (match, longestLineNumber) => {
     const getLinePrefix = (i) => `${match.range().startLineNumber + i}`;
     const fullMatchLines = match.fullPreviewLines();
@@ -23,12 +24,12 @@ const matchToSearchResultFormat = (match, longestLineNumber) => {
         const prefix = `  ${paddingStr}${lineNumber}: `;
         const prefixOffset = prefix.length;
         const line = prefix + (sourceLine.split(/\r?\n?$/, 1)[0] || '');
-        const rangeOnThisLine = ({ start, end }) => ( new Range(
+        const rangeOnThisLine = ({ start, end }) => ( (new Range(
             1,
             (start ?? 1) + prefixOffset,
             1,
             (end ?? sourceLine.length + 1) + prefixOffset
-        ));
+        )));
         const matchRange = match.rangeInPreview();
         const matchIsSingleLine = matchRange.startLineNumber === matchRange.endLineNumber;
         let lineRange;
@@ -50,13 +51,13 @@ const matchToSearchResultFormat = (match, longestLineNumber) => {
 };
 function fileMatchToSearchResultFormat(fileMatch, labelFormatter) {
     const textSerializations = fileMatch.textMatches().length > 0 ? matchesToSearchResultFormat(fileMatch.resource, fileMatch.textMatches().sort(searchMatchComparer), fileMatch.context, labelFormatter) : undefined;
-    const cellSerializations = ( fileMatch.cellMatches().sort((a, b) => a.cellIndex - b.cellIndex).sort().filter(cellMatch => cellMatch.contentMatches.length > 0).map(
+    const cellSerializations = ( (fileMatch.cellMatches().sort((a, b) => a.cellIndex - b.cellIndex).sort().filter(cellMatch => cellMatch.contentMatches.length > 0).map(
         (cellMatch, index) => cellMatchToSearchResultFormat(cellMatch, labelFormatter, index === 0)
-    ));
+    )));
     return [textSerializations, ...cellSerializations].filter(x => !!x);
 }
 function matchesToSearchResultFormat(resource, sortedMatches, matchContext, labelFormatter, shouldUseHeader = true) {
-    const longestLineNumber = ( sortedMatches[sortedMatches.length - 1].range().endLineNumber.toString()).length;
+    const longestLineNumber = ( (sortedMatches[sortedMatches.length - 1].range().endLineNumber.toString())).length;
     const text = shouldUseHeader ? [`${labelFormatter(resource)}:`] : [];
     const matchRanges = [];
     const targetLineNumberToOffset = {};
@@ -64,10 +65,10 @@ function matchesToSearchResultFormat(resource, sortedMatches, matchContext, labe
     matchContext.forEach((line, lineNumber) => context.push({ line, lineNumber }));
     context.sort((a, b) => a.lineNumber - b.lineNumber);
     let lastLine = undefined;
-    const seenLines = ( new Set());
+    const seenLines = ( (new Set()));
     sortedMatches.forEach(match => {
         matchToSearchResultFormat(match, longestLineNumber).forEach(match => {
-            if (!( seenLines.has(match.lineNumber))) {
+            if (!( (seenLines.has(match.lineNumber)))) {
                 while (context.length && context[0].lineNumber < +match.lineNumber) {
                     const { line, lineNumber } = context.shift();
                     if (lastLine !== undefined && lineNumber !== lastLine + 1) {
@@ -81,7 +82,7 @@ function matchesToSearchResultFormat(resource, sortedMatches, matchContext, labe
                 text.push(match.line);
                 lastLine = +match.lineNumber;
             }
-            matchRanges.push(...( match.ranges.map(translateRangeLines(targetLineNumberToOffset[match.lineNumber]))));
+            matchRanges.push(...( (match.ranges.map(translateRangeLines(targetLineNumberToOffset[match.lineNumber])))));
         });
     });
     while (context.length) {
@@ -164,7 +165,7 @@ const extractSearchQueryFromLines = (lines) => {
                     out += '\\';
                 }
                 else {
-                    throw Error(localizeWithPath('vs/workbench/contrib/searchEditor/browser/searchEditorSerialization', 'invalidQueryStringError', "All backslashes in Query string must be escaped (\\\\)"));
+                    throw Error(localizeWithPath(_moduleId, 0, "All backslashes in Query string must be escaped (\\\\)"));
                 }
             }
             else {
@@ -210,49 +211,27 @@ const serializeSearchResultForEditor = (searchResult, rawIncludePattern, rawExcl
         throw Error('Internal Error: Expected query, got null');
     }
     const config = contentPatternToSearchConfiguration(searchResult.query, rawIncludePattern, rawExcludePattern, contextLines);
-    const filecount = searchResult.fileCount() > 1 ? ( localizeWithPath(
-        'vs/workbench/contrib/searchEditor/browser/searchEditorSerialization',
-        'numFiles',
-        "{0} files",
-        searchResult.fileCount()
-    )) : ( localizeWithPath(
-        'vs/workbench/contrib/searchEditor/browser/searchEditorSerialization',
-        'oneFile',
-        "1 file"
-    ));
-    const resultcount = searchResult.count() > 1 ? ( localizeWithPath(
-        'vs/workbench/contrib/searchEditor/browser/searchEditorSerialization',
-        'numResults',
-        "{0} results",
-        searchResult.count()
-    )) : ( localizeWithPath(
-        'vs/workbench/contrib/searchEditor/browser/searchEditorSerialization',
-        'oneResult',
-        "1 result"
-    ));
+    const filecount = searchResult.fileCount() > 1 ? ( localizeWithPath(_moduleId, 1, "{0} files", searchResult.fileCount())) : ( localizeWithPath(_moduleId, 2, "1 file"));
+    const resultcount = searchResult.count() > 1 ? ( localizeWithPath(_moduleId, 3, "{0} results", searchResult.count())) : ( localizeWithPath(_moduleId, 4, "1 result"));
     const info = [
         searchResult.count()
             ? `${resultcount} - ${filecount}`
-            : ( localizeWithPath(
-            'vs/workbench/contrib/searchEditor/browser/searchEditorSerialization',
-            'noResults',
-            "No Results"
-        )),
+            : ( localizeWithPath(_moduleId, 5, "No Results")),
     ];
     if (limitHit) {
         info.push(( localizeWithPath(
-            'vs/workbench/contrib/searchEditor/browser/searchEditorSerialization',
-            'searchMaxResultsWarning',
+            _moduleId,
+            6,
             "The result set only contains a subset of all matches. Be more specific in your search to narrow down the results."
         )));
     }
     info.push('');
     const matchComparer = (a, b) => searchMatchComparer(a, b, sortOrder);
-    const allResults = flattenSearchResultSerializations(flatten(( searchResult.folderMatches().sort(matchComparer)
+    const allResults = flattenSearchResultSerializations(flatten(( (searchResult.folderMatches().sort(matchComparer)
         .map(folderMatch => folderMatch.allDownstreamFileMatches().sort(matchComparer)
-        .flatMap(fileMatch => fileMatchToSearchResultFormat(fileMatch, labelFormatter))))));
+        .flatMap(fileMatch => fileMatchToSearchResultFormat(fileMatch, labelFormatter)))))));
     return {
-        matchRanges: ( allResults.matchRanges.map(translateRangeLines(info.length))),
+        matchRanges: ( (allResults.matchRanges.map(translateRangeLines(info.length)))),
         text: info.concat(allResults.text).join(lineDelimiter),
         config
     };
@@ -261,7 +240,7 @@ const flattenSearchResultSerializations = (serializations) => {
     const text = [];
     const matchRanges = [];
     serializations.forEach(serialized => {
-        ( serialized.matchRanges.map(translateRangeLines(text.length))).forEach(range => matchRanges.push(range));
+        ( (serialized.matchRanges.map(translateRangeLines(text.length)))).forEach(range => matchRanges.push(range));
         serialized.text.forEach(line => text.push(line));
         text.push('');
     });

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

@@ -21,6 +21,7 @@ import { WebFileSystemAccess } from 'vscode/vscode/vs/platform/files/browser/web
 import { revive } from 'vscode/vscode/vs/base/common/marshalling';
 import { TextSearchCompleteMessageType } from 'vscode/vscode/vs/workbench/services/search/common/searchExtTypes';
 
+const _moduleId = "vs/workbench/services/search/browser/searchService";
 let RemoteSearchService = class RemoteSearchService extends SearchService {
     constructor(modelService, editorService, telemetryService, logService, extensionService, fileService, instantiationService, uriIdentityService) {
         super(modelService, editorService, telemetryService, logService, extensionService, fileService, uriIdentityService);
@@ -30,26 +31,26 @@ let RemoteSearchService = class RemoteSearchService extends SearchService {
         this.registerSearchResultProvider(Schemas.file, 1 , searchProvider);
     }
 };
-RemoteSearchService = ( __decorate([
-    ( __param(0, IModelService)),
-    ( __param(1, IEditorService)),
-    ( __param(2, ITelemetryService)),
-    ( __param(3, ILogService)),
-    ( __param(4, IExtensionService)),
-    ( __param(5, IFileService)),
-    ( __param(6, IInstantiationService)),
-    ( __param(7, IUriIdentityService))
-], RemoteSearchService));
+RemoteSearchService = ( (__decorate([
+    ( (__param(0, IModelService))),
+    ( (__param(1, IEditorService))),
+    ( (__param(2, ITelemetryService))),
+    ( (__param(3, ILogService))),
+    ( (__param(4, IExtensionService))),
+    ( (__param(5, IFileService))),
+    ( (__param(6, IInstantiationService))),
+    ( (__param(7, IUriIdentityService)))
+], RemoteSearchService)));
 let LocalFileSearchWorkerClient = class LocalFileSearchWorkerClient extends Disposable {
     constructor(fileService, uriIdentityService) {
         super();
         this.fileService = fileService;
         this.uriIdentityService = uriIdentityService;
-        this._onDidReceiveTextSearchMatch = ( new Emitter());
+        this._onDidReceiveTextSearchMatch = ( (new Emitter()));
         this.onDidReceiveTextSearchMatch = this._onDidReceiveTextSearchMatch.event;
         this.queryId = 0;
         this._worker = null;
-        this._workerFactory = ( new DefaultWorkerFactory('localFileSearchWorker'));
+        this._workerFactory = ( (new DefaultWorkerFactory('localFileSearchWorker')));
     }
     sendTextSearchMatch(match, queryId) {
         this._onDidReceiveTextSearchMatch.fire({ match, queryId });
@@ -63,11 +64,11 @@ let LocalFileSearchWorkerClient = class LocalFileSearchWorkerClient extends Disp
     }
     async textSearch(query, onProgress, token) {
         try {
-            const queryDisposables = ( new DisposableStore());
+            const queryDisposables = ( (new DisposableStore()));
             const proxy = await this._getOrCreateWorker().getProxyObject();
             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);
                 const handle = await this.fileSystemProvider.getHandle(fq.folder);
@@ -92,7 +93,7 @@ let LocalFileSearchWorkerClient = class LocalFileSearchWorkerClient extends Disp
                 if (folderResults.limitHit) {
                     limitHit = true;
                 }
-            })));
+            }))));
             queryDisposables.dispose();
             const result = { messages: [], results, limitHit };
             return result;
@@ -102,22 +103,18 @@ let LocalFileSearchWorkerClient = class LocalFileSearchWorkerClient extends Disp
             return {
                 results: [],
                 messages: [{
-                        text: ( localizeWithPath(
-                            'vs/workbench/services/search/browser/searchService',
-                            'errorSearchText',
-                            "Unable to search with Web Worker text searcher"
-                        )), type: TextSearchCompleteMessageType.Warning
+                        text: ( localizeWithPath(_moduleId, 0, "Unable to search with Web Worker text searcher")), type: TextSearchCompleteMessageType.Warning
                     }],
             };
         }
     }
     async fileSearch(query, token) {
         try {
-            const queryDisposables = ( new DisposableStore());
+            const queryDisposables = ( (new DisposableStore()));
             let limitHit = false;
             const proxy = await this._getOrCreateWorker().getProxyObject();
             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);
                 const handle = await this.fileSystemProvider.getHandle(fq.folder);
@@ -133,7 +130,7 @@ let LocalFileSearchWorkerClient = class LocalFileSearchWorkerClient extends Disp
                 if (folderResults.limitHit) {
                     limitHit = true;
                 }
-            })));
+            }))));
             queryDisposables.dispose();
             const result = { messages: [], results, limitHit };
             return result;
@@ -143,11 +140,7 @@ let LocalFileSearchWorkerClient = class LocalFileSearchWorkerClient extends Disp
             return {
                 results: [],
                 messages: [{
-                        text: ( localizeWithPath(
-                            'vs/workbench/services/search/browser/searchService',
-                            'errorSearchFile',
-                            "Unable to search with Web Worker file searcher"
-                        )), type: TextSearchCompleteMessageType.Warning
+                        text: ( localizeWithPath(_moduleId, 1, "Unable to search with Web Worker file searcher")), type: TextSearchCompleteMessageType.Warning
                     }],
             };
         }
@@ -160,11 +153,11 @@ let LocalFileSearchWorkerClient = class LocalFileSearchWorkerClient extends Disp
     _getOrCreateWorker() {
         if (!this._worker) {
             try {
-                this._worker = this._register(( new SimpleWorkerClient(
+                this._worker = this._register(( (new SimpleWorkerClient(
                     this._workerFactory,
                     'vs/workbench/services/search/worker/localFileSearch',
                     this
-                )));
+                ))));
             }
             catch (err) {
                 logOnceWebWorkerWarning(err);
@@ -174,12 +167,12 @@ let LocalFileSearchWorkerClient = class LocalFileSearchWorkerClient extends Disp
         return this._worker;
     }
 };
-LocalFileSearchWorkerClient.__decorator = ( __decorate([
+LocalFileSearchWorkerClient.__decorator = ( (__decorate([
     memoize
-], LocalFileSearchWorkerClient.prototype, "fileSystemProvider", null));
-LocalFileSearchWorkerClient = ( __decorate([
-    ( __param(0, IFileService)),
-    ( __param(1, IUriIdentityService))
-], LocalFileSearchWorkerClient));
+], LocalFileSearchWorkerClient.prototype, "fileSystemProvider", null)));
+LocalFileSearchWorkerClient = ( (__decorate([
+    ( (__param(0, IFileService))),
+    ( (__param(1, IUriIdentityService)))
+], LocalFileSearchWorkerClient)));
 
 export { LocalFileSearchWorkerClient, RemoteSearchService };

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

@@ -52,7 +52,7 @@ let SearchService = class SearchService extends Disposable {
             deferredMap = this.deferredAITextSearchesByScheme;
         }
         else {
-            throw new Error('Unknown SearchProviderType');
+            throw ( new Error('Unknown SearchProviderType'));
         }
         list.set(scheme, provider);
         if (( deferredMap.has(scheme))) {
@@ -188,7 +188,7 @@ let SearchService = class SearchService extends Disposable {
             case 3 :
                 return this.aiTextSearchProviders;
             default:
-                throw new Error(`Unknown query type: ${type}`);
+                throw ( new Error(`Unknown query type: ${type}`));
         }
     }
     getDeferredTextSearchesByScheme(type) {
@@ -200,7 +200,7 @@ let SearchService = class SearchService extends Disposable {
             case 3 :
                 return this.deferredAITextSearchesByScheme;
             default:
-                throw new Error(`Unknown query type: ${type}`);
+                throw ( new Error(`Unknown query type: ${type}`));
         }
     }
     async searchWithProviders(query, onProviderProgress, token) {