@codingame/monaco-vscode-search-service-override 5.3.0 → 6.0.0

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

@@ -1,17 +1,13 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
+import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
-import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
-import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import 'vscode/vscode/vs/workbench/services/search/common/search';
-import { SearchService } from '../common/searchService.js';
+import '../common/searchService.js';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { SimpleWorkerClient, logOnceWebWorkerWarning } from 'vscode/vscode/vs/base/common/worker/simpleWorker';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { DefaultWorkerFactory } from 'vscode/vscode/vs/base/browser/defaultWorkerFactory';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { memoize } from 'vscode/vscode/vs/base/common/decorators';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
@@ -22,25 +18,6 @@ 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);
-        this.instantiationService = instantiationService;
-        const searchProvider = this.instantiationService.createInstance(LocalFileSearchWorkerClient);
-        this.registerSearchResultProvider(Schemas.file, 0 , searchProvider);
-        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)));
 let LocalFileSearchWorkerClient = class LocalFileSearchWorkerClient extends Disposable {
     constructor(fileService, uriIdentityService) {
         super();
@@ -175,4 +152,4 @@ LocalFileSearchWorkerClient = ( (__decorate([
     ( (__param(1, IUriIdentityService)))
 ], LocalFileSearchWorkerClient)));
 
-export { LocalFileSearchWorkerClient, RemoteSearchService };
+export { LocalFileSearchWorkerClient };

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { coalesce, flatten, uniqueFilter } from 'vscode/vscode/vs/base/common/arrays';
+import { coalesce, uniqueFilter } from 'vscode/vscode/vs/base/common/arrays';
 import { raceCancellationError, DeferredPromise } from 'vscode/vscode/vs/base/common/async';
 import { CancellationError } from 'vscode/vscode/vs/base/common/errors';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -15,7 +15,7 @@ import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/commo
 import { EditorResourceAccessor, SideBySideEditor } from 'vscode/vscode/vs/workbench/common/editor';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
-import { isFileMatch, isProgressMessage, deserializeSearchError, SearchErrorCode, SEARCH_RESULT_LANGUAGE_ID, FileMatch, pathIncludedInQuery } from 'vscode/vscode/vs/workbench/services/search/common/search';
+import { SearchProviderType, isFileMatch, isProgressMessage, QueryType, deserializeSearchError, SearchErrorCode, SEARCH_RESULT_LANGUAGE_ID, FileMatch, pathIncludedInQuery } from 'vscode/vscode/vs/workbench/services/search/common/search';
 import { editorMatchesToTextSearchResults, getTextSearchMatchWithModelContext } from 'vscode/vscode/vs/workbench/services/search/common/searchHelpers';
 
 let SearchService = class SearchService extends Disposable {
@@ -39,15 +39,15 @@ let SearchService = class SearchService extends Disposable {
     registerSearchResultProvider(scheme, type, provider) {
         let list;
         let deferredMap;
-        if (type === 0 ) {
+        if (type === SearchProviderType.file) {
             list = this.fileSearchProviders;
             deferredMap = this.deferredFileSearchesByScheme;
         }
-        else if (type === 1 ) {
+        else if (type === SearchProviderType.text) {
             list = this.textSearchProviders;
             deferredMap = this.deferredTextSearchesByScheme;
         }
-        else if (type === 2 ) {
+        else if (type === SearchProviderType.aiText) {
             list = this.aiTextSearchProviders;
             deferredMap = this.deferredAITextSearchesByScheme;
         }
@@ -156,8 +156,8 @@ let SearchService = class SearchService extends Disposable {
             return {
                 limitHit: completes[0] && completes[0].limitHit,
                 stats: completes[0].stats,
-                messages: coalesce(flatten(( completes.map(i => i.messages)))).filter(uniqueFilter(message => message.type + message.text + message.trusted)),
-                results: flatten(( completes.map((c) => c.results)))
+                messages: coalesce(completes.flatMap(i => i.messages)).filter(uniqueFilter(message => message.type + message.text + message.trusted)),
+                results: completes.flatMap((c) => c.results)
             };
         })();
         return token ? raceCancellationError(providerPromise, token) : providerPromise;
@@ -181,11 +181,11 @@ let SearchService = class SearchService extends Disposable {
     }
     getSearchProvider(type) {
         switch (type) {
-            case 1 :
+            case QueryType.File:
                 return this.fileSearchProviders;
-            case 2 :
+            case QueryType.Text:
                 return this.textSearchProviders;
-            case 3 :
+            case QueryType.aiText:
                 return this.aiTextSearchProviders;
             default:
                 throw ( new Error(`Unknown query type: ${type}`));
@@ -193,11 +193,11 @@ let SearchService = class SearchService extends Disposable {
     }
     getDeferredTextSearchesByScheme(type) {
         switch (type) {
-            case 1 :
+            case QueryType.File:
                 return this.deferredFileSearchesByScheme;
-            case 2 :
+            case QueryType.Text:
                 return this.deferredTextSearchesByScheme;
-            case 3 :
+            case QueryType.aiText:
                 return this.deferredAITextSearchesByScheme;
             default:
                 throw ( new Error(`Unknown query type: ${type}`));
@@ -210,7 +210,7 @@ let SearchService = class SearchService extends Disposable {
         const someSchemeHasProvider = ( [...( fqs.keys())].some(scheme => {
             return ( this.getSearchProvider(query.type).has(scheme));
         }));
-        if (query.type === 3  && !someSchemeHasProvider) {
+        if (query.type === QueryType.aiText && !someSchemeHasProvider) {
             return [];
         }
         await Promise.all(( [...( fqs.keys())].map(async (scheme) => {
@@ -240,9 +240,9 @@ let SearchService = class SearchService extends Disposable {
             };
             const doProviderSearch = () => {
                 switch (query.type) {
-                    case 1 :
+                    case QueryType.File:
                         return provider.fileSearch(oneSchemeQuery, token);
-                    case 2 :
+                    case QueryType.Text:
                         return provider.textSearch(oneSchemeQuery, onProviderProgress, token);
                     default:
                         return provider.textSearch(oneSchemeQuery, onProviderProgress, token);
@@ -281,7 +281,7 @@ let SearchService = class SearchService extends Disposable {
         const scheme = fileSchemeOnly ? Schemas.file :
             otherSchemeOnly ? 'other' :
                 'mixed';
-        if (query.type === 1  && complete && complete.stats) {
+        if (query.type === QueryType.File && complete && complete.stats) {
             const fileSearchStats = complete.stats;
             if (fileSearchStats.fromCache) {
                 const cacheStats = fileSearchStats.detailStats;
@@ -315,7 +315,7 @@ let SearchService = class SearchService extends Disposable {
                 });
             }
         }
-        else if (query.type === 2 ) {
+        else if (query.type === QueryType.Text) {
             let errorType;
             if (err) {
                 errorType = err.code === SearchErrorCode.regexParseError ? 'regex' :
@@ -338,7 +338,7 @@ let SearchService = class SearchService extends Disposable {
     getOpenEditorResults(query) {
         const openEditorResults = ( new ResourceMap(uri => this.uriIdentityService.extUri.getComparisonKey(uri)));
         let limitHit = false;
-        if (query.type === 2 ) {
+        if (query.type === QueryType.Text) {
             const canonicalToOriginalResources = ( new ResourceMap());
             for (const editorInput of this.editorService.editors) {
                 const canonical = EditorResourceAccessor.getCanonicalUri(editorInput, { supportSideBySide: SideBySideEditor.PRIMARY });