@codingame/monaco-vscode-search-service-override 8.0.4 → 9.0.2

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

@@ -119,8 +119,9 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
         }
         this._register(this.queryEditorWidget.onDidToggleContext(() => this.triggerSearch({ resetCursor: false })));
         this.includesExcludesContainer = append(container, $('.includes-excludes'));
-        this.toggleQueryDetailsButton = append(this.includesExcludesContainer, $('.expand' + ThemeIcon.asCSSSelector(searchDetailsIcon), { tabindex: 0, role: 'button' }));
-        this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), this.toggleQueryDetailsButton, ( localize(8432, "Toggle Search Details"))));
+        const toggleQueryDetailsLabel = ( localize(8476, "Toggle Search Details"));
+        this.toggleQueryDetailsButton = append(this.includesExcludesContainer, $('.expand' + ThemeIcon.asCSSSelector(searchDetailsIcon), { tabindex: 0, role: 'button', 'aria-label': toggleQueryDetailsLabel }));
+        this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), this.toggleQueryDetailsButton, toggleQueryDetailsLabel));
         this._register(addDisposableListener(this.toggleQueryDetailsButton, EventType.CLICK, e => {
             EventHelper.stop(e);
             this.toggleIncludesExcludes();
@@ -145,19 +146,19 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
             }
         }));
         const folderIncludesList = append(this.includesExcludesContainer, $('.file-types.includes'));
-        const filesToIncludeTitle = ( localize(8433, "files to include"));
+        const filesToIncludeTitle = ( localize(8477, "files to include"));
         append(folderIncludesList, $('h4', undefined, filesToIncludeTitle));
         this.inputPatternIncludes = this._register(scopedInstantiationService.createInstance(IncludePatternInputWidget, folderIncludesList, this.contextViewService, {
-            ariaLabel: ( localize(8434, 'Search Include Patterns')),
+            ariaLabel: ( localize(8478, 'Search Include Patterns')),
             inputBoxStyles: searchEditorInputboxStyles
         }));
         this.inputPatternIncludes.onSubmit(triggeredOnType => this.triggerSearch({ resetCursor: false, delay: triggeredOnType ? this.searchConfig.searchOnTypeDebouncePeriod : 0 }));
         this._register(this.inputPatternIncludes.onChangeSearchInEditorsBox(() => this.triggerSearch()));
         const excludesList = append(this.includesExcludesContainer, $('.file-types.excludes'));
-        const excludesTitle = ( localize(8435, "files to exclude"));
+        const excludesTitle = ( localize(8479, "files to exclude"));
         append(excludesList, $('h4', undefined, excludesTitle));
         this.inputPatternExcludes = this._register(scopedInstantiationService.createInstance(ExcludePatternInputWidget, excludesList, this.contextViewService, {
-            ariaLabel: ( localize(8436, 'Search Exclude Patterns')),
+            ariaLabel: ( localize(8480, 'Search Exclude Patterns')),
             inputBoxStyles: searchEditorInputboxStyles
         }));
         this.inputPatternExcludes.onSubmit(triggeredOnType => this.triggerSearch({ resetCursor: false, delay: triggeredOnType ? this.searchConfig.searchOnTypeDebouncePeriod : 0 }));
@@ -176,7 +177,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(8437, "Run Search"))));
+            const runAgainLink = append(this.messageBox, $('a.pointer.prominent.message', {}, ( localize(8481, "Run Search"))));
             this.messageDisposables.add(addDisposableListener(runAgainLink, EventType.CLICK, async () => {
                 await this.triggerSearch();
                 this.searchResultEditor.focus();
@@ -389,7 +390,7 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
             }
         }
         alert(( localize(
-            8438,
+            8482,
             "Matched {0} at {1} in file {2}",
             matchText,
             matchLineText,
@@ -413,7 +414,17 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
         this.searchResultEditor.focus();
     }
     async triggerSearch(_options) {
+        const focusResults = this.searchConfig.searchEditor.focusResultsOnSearch;
+        if (_options === undefined) {
+            _options = { focusResults: focusResults };
+        }
+        else if (_options.focusResults === undefined) {
+            _options.focusResults = focusResults;
+        }
         const options = { resetCursor: true, delay: 0, ..._options };
+        if (!(this.queryEditorWidget.searchInput?.inputBox.isInputValid())) {
+            return;
+        }
         if (!this.pauseSearching) {
             await this.runSearchDelayer.trigger(async () => {
                 this.toggleRunAgainMessage(false);
@@ -475,15 +486,14 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
             maxResults: this.searchConfig.maxResults ?? undefined,
             disregardIgnoreFiles: !config.useExcludeSettingsAndIgnoreFiles || undefined,
             disregardExcludeSettings: !config.useExcludeSettingsAndIgnoreFiles || undefined,
-            excludePattern: config.filesToExclude,
+            excludePattern: [{ pattern: config.filesToExclude }],
             includePattern: config.filesToInclude,
             onlyOpenEditors: config.onlyOpenEditors,
             previewOptions: {
                 matchLines: 1,
                 charsPerLine: 1000
             },
-            afterContext: config.contextLines,
-            beforeContext: config.contextLines,
+            surroundingContext: config.contextLines,
             isSmartCase: this.searchConfig.smartCase,
             expandPatterns: true,
             notebookSearchConfig: {
@@ -687,7 +697,7 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
         }
     }
     getAriaLabel() {
-        return this.getInput()?.getName() ?? ( localize(8439, "Search"));
+        return this.getInput()?.getName() ?? ( localize(8483, "Search"));
     }
 };
 SearchEditor = SearchEditor_1 = ( (__decorate([
@@ -711,7 +721,7 @@ SearchEditor = SearchEditor_1 = ( (__decorate([
     ( (__param(18, ILogService))),
     ( (__param(19, IHoverService)))
 ], SearchEditor)));
-const searchEditorTextInputBorder = registerColor('searchEditor.textInputBorder', inputBorder, ( localize(8440, "Search editor text input box border.")));
+const searchEditorTextInputBorder = registerColor('searchEditor.textInputBorder', inputBorder, ( localize(8484, "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/contrib/searchEditor/browser/searchEditorActions.js

@@ -184,7 +184,7 @@ const createEditorFromSearchResult = async (accessor, searchResult, rawIncludePa
     else {
         const input = instantiationService.invokeFunction(getOrMakeSearchEditorInput, { from: 'rawData', resultsContents: '', config: { ...config, contextLines } });
         const editor = await editorService.openEditor(input, { pinned: true });
-        editor.triggerSearch({ focusResults: true });
+        editor.triggerSearch();
     }
 };
 

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

@@ -29,7 +29,7 @@ import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistr
 
 var SearchEditorInput_1;
 const SEARCH_EDITOR_EXT = '.code-search';
-const SearchEditorIcon = registerIcon('search-editor-label-icon', Codicon.search, ( localize(8429, 'Icon of the search editor label.')));
+const SearchEditorIcon = registerIcon('search-editor-label-icon', Codicon.search, ( localize(8485, 'Icon of the search editor label.')));
 let SearchEditorInput = class SearchEditorInput extends EditorInput {
     static { SearchEditorInput_1 = this; }
     static { this.ID = SearchEditorInputTypeId; }
@@ -162,16 +162,16 @@ let SearchEditorInput = class SearchEditorInput extends EditorInput {
         if (this.backingUri) {
             const originalURI = EditorResourceAccessor.getOriginalUri(this);
             return ( localize(
-                8430,
+                8486,
                 "Search: {0}",
                 basename((originalURI ?? this.backingUri).path, SEARCH_EDITOR_EXT)
             ));
         }
         const query = this._cachedConfigurationModel?.config?.query?.trim();
         if (query) {
-            return ( localize(8430, "Search: {0}", trimToMax(query)));
+            return ( localize(8486, "Search: {0}", trimToMax(query)));
         }
-        return ( localize(8431, "Search"));
+        return ( localize(8487, "Search"));
     }
     setDirty(dirty) {
         const wasDirty = this.dirty;

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

@@ -164,7 +164,7 @@ const extractSearchQueryFromLines = (lines) => {
                     out += '\\';
                 }
                 else {
-                    throw Error(localize(10787, "All backslashes in Query string must be escaped (\\\\)"));
+                    throw Error(localize(10848, "All backslashes in Query string must be escaped (\\\\)"));
                 }
             }
             else {
@@ -210,16 +210,16 @@ 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 ? ( localize(10788, "{0} files", searchResult.fileCount())) : ( localize(10789, "1 file"));
-    const resultcount = searchResult.count() > 1 ? ( localize(10790, "{0} results", searchResult.count())) : ( localize(10791, "1 result"));
+    const filecount = searchResult.fileCount() > 1 ? ( localize(10849, "{0} files", searchResult.fileCount())) : ( localize(10850, "1 file"));
+    const resultcount = searchResult.count() > 1 ? ( localize(10851, "{0} results", searchResult.count())) : ( localize(10852, "1 result"));
     const info = [
         searchResult.count()
             ? `${resultcount} - ${filecount}`
-            : ( localize(10792, "No Results")),
+            : ( localize(10853, "No Results")),
     ];
     if (limitHit) {
         info.push(( localize(
-            10793,
+            10854,
             "The result set only contains a subset of all matches. Be more specific in your search to narrow down the results."
         )));
     }

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

@@ -4,10 +4,11 @@ import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.servi
 import 'vscode/vscode/vs/workbench/services/search/common/search';
 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 { 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 { createWebWorker } from 'vscode/vscode/vs/base/browser/defaultWorkerFactory';
 import 'vscode/vscode/vs/platform/instantiation/common/extensions';
+import { LocalFileSearchSimpleWorkerHost } from '../common/localFileSearchWorkerTypes.js';
 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';
@@ -26,7 +27,6 @@ let LocalFileSearchWorkerClient = class LocalFileSearchWorkerClient extends Disp
         this.onDidReceiveTextSearchMatch = this._onDidReceiveTextSearchMatch.event;
         this.queryId = 0;
         this._worker = null;
-        this._workerFactory = ( (new DefaultWorkerFactory('localFileSearchWorker')));
     }
     sendTextSearchMatch(match, queryId) {
         this._onDidReceiveTextSearchMatch.fire({ match, queryId });
@@ -35,13 +35,13 @@ let LocalFileSearchWorkerClient = class LocalFileSearchWorkerClient extends Disp
         return this.fileService.getProvider(Schemas.file);
     }
     async cancelQuery(queryId) {
-        const proxy = await this._getOrCreateWorker().getProxyObject();
-        proxy.cancelQuery(queryId);
+        const proxy = this._getOrCreateWorker().proxy;
+        proxy.$cancelQuery(queryId);
     }
     async textSearch(query, onProgress, token) {
         try {
             const queryDisposables = ( (new DisposableStore()));
-            const proxy = await this._getOrCreateWorker().getProxyObject();
+            const proxy = this._getOrCreateWorker().proxy;
             const results = [];
             let limitHit = false;
             await Promise.all(( (query.folderQueries.map(async (fq) => {
@@ -62,7 +62,7 @@ let LocalFileSearchWorkerClient = class LocalFileSearchWorkerClient extends Disp
                     }
                 }));
                 const ignorePathCasing = this.uriIdentityService.extUri.ignorePathCasing(fq.folder);
-                const folderResults = await proxy.searchDirectory(handle, query, fq, ignorePathCasing, queryId);
+                const folderResults = await proxy.$searchDirectory(handle, query, fq, ignorePathCasing, queryId);
                 for (const folderResult of folderResults.results) {
                     results.push(revive(folderResult));
                 }
@@ -79,7 +79,7 @@ let LocalFileSearchWorkerClient = class LocalFileSearchWorkerClient extends Disp
             return {
                 results: [],
                 messages: [{
-                        text: ( localize(3369, "Unable to search with Web Worker text searcher")), type: TextSearchCompleteMessageType.Warning
+                        text: ( localize(3366, "Unable to search with Web Worker text searcher")), type: TextSearchCompleteMessageType.Warning
                     }],
             };
         }
@@ -88,7 +88,7 @@ let LocalFileSearchWorkerClient = class LocalFileSearchWorkerClient extends Disp
         try {
             const queryDisposables = ( (new DisposableStore()));
             let limitHit = false;
-            const proxy = await this._getOrCreateWorker().getProxyObject();
+            const proxy = this._getOrCreateWorker().proxy;
             const results = [];
             await Promise.all(( (query.folderQueries.map(async (fq) => {
                 const queryId = this.queryId++;
@@ -99,7 +99,7 @@ let LocalFileSearchWorkerClient = class LocalFileSearchWorkerClient extends Disp
                     return;
                 }
                 const caseSensitive = this.uriIdentityService.extUri.ignorePathCasing(fq.folder);
-                const folderResults = await proxy.listDirectory(handle, query, fq, caseSensitive, queryId);
+                const folderResults = await proxy.$listDirectory(handle, query, fq, caseSensitive, queryId);
                 for (const folderResult of folderResults.results) {
                     results.push({ resource: URI.joinPath(fq.folder, folderResult) });
                 }
@@ -116,7 +116,7 @@ let LocalFileSearchWorkerClient = class LocalFileSearchWorkerClient extends Disp
             return {
                 results: [],
                 messages: [{
-                        text: ( localize(3370, "Unable to search with Web Worker file searcher")), type: TextSearchCompleteMessageType.Warning
+                        text: ( localize(3367, "Unable to search with Web Worker file searcher")), type: TextSearchCompleteMessageType.Warning
                     }],
             };
         }
@@ -129,11 +129,12 @@ let LocalFileSearchWorkerClient = class LocalFileSearchWorkerClient extends Disp
     _getOrCreateWorker() {
         if (!this._worker) {
             try {
-                this._worker = this._register(( (new SimpleWorkerClient(
-                    this._workerFactory,
-                    'vs/workbench/services/search/worker/localFileSearch',
-                    this
-                ))));
+                this._worker = this._register(createWebWorker('vs/workbench/services/search/worker/localFileSearch', 'LocalFileSearchWorker'));
+                LocalFileSearchSimpleWorkerHost.setChannel(this._worker, {
+                    $sendTextSearchMatch: (match, queryId) => {
+                        return this.sendTextSearchMatch(match, queryId);
+                    }
+                });
             }
             catch (err) {
                 logOnceWebWorkerWarning(err);

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

@@ -49,8 +49,8 @@ const getFileResults = (bytes, pattern, options) => {
             while (Boolean(lineRanges[endLine + 1]) && matchStartIndex + matchedText.length > lineRanges[endLine].end) {
                 endLine++;
             }
-            if (options.beforeContext) {
-                for (let contextLine = Math.max(0, startLine - options.beforeContext); contextLine < startLine; contextLine++) {
+            if (options.surroundingContext) {
+                for (let contextLine = Math.max(0, startLine - options.surroundingContext); contextLine < startLine; contextLine++) {
                     contextLinesNeeded.add(contextLine);
                 }
             }
@@ -78,12 +78,15 @@ const getFileResults = (bytes, pattern, options) => {
                 matchStartIndex + matchedText.length - lineRanges[endLine].start - (endLine === startLine ? offset : 0)
             ));
             const match = {
-                ranges: fileRange,
-                preview: { text: previewText, matches: previewRange },
+                rangeLocations: [{
+                        source: fileRange,
+                        preview: previewRange,
+                    }],
+                previewText: previewText
             };
             results.push(match);
-            if (options.afterContext) {
-                for (let contextLine = endLine + 1; contextLine <= Math.min(endLine + options.afterContext, lineRanges.length - 1); contextLine++) {
+            if (options.surroundingContext) {
+                for (let contextLine = endLine + 1; contextLine <= Math.min(endLine + options.surroundingContext, lineRanges.length - 1); contextLine++) {
                     contextLinesNeeded.add(contextLine);
                 }
             }

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

@@ -0,0 +1,11 @@
+class LocalFileSearchSimpleWorkerHost {
+    static { this.CHANNEL_NAME = 'localFileSearchWorkerHost'; }
+    static getChannel(workerServer) {
+        return workerServer.getChannel(LocalFileSearchSimpleWorkerHost.CHANNEL_NAME);
+    }
+    static setChannel(workerClient, obj) {
+        workerClient.setChannel(LocalFileSearchSimpleWorkerHost.CHANNEL_NAME, obj);
+    }
+}
+
+export { LocalFileSearchSimpleWorkerHost };

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

@@ -214,6 +214,9 @@ let SearchService = class SearchService extends Disposable {
             return [];
         }
         await Promise.all(( [...( fqs.keys())].map(async (scheme) => {
+            if (query.onlyFileScheme && scheme !== Schemas.file) {
+                return;
+            }
             const schemeFQs = fqs.get(scheme);
             let provider = this.getSearchProvider(query.type).get(scheme);
             if (!provider) {

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

@@ -1,5 +1,6 @@
 import { parse, match } from 'vscode/vscode/vs/base/common/glob';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { LocalFileSearchSimpleWorkerHost } from '../common/localFileSearchWorkerTypes.js';
 import { relative } from 'vscode/vscode/vs/base/common/path';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { getFileResults } from '../common/getFileResults.js';
@@ -7,21 +8,22 @@ import { IgnoreFile } from 'vscode/vscode/vs/workbench/services/search/common/ig
 import { createRegExp } from 'vscode/vscode/vs/base/common/strings';
 import { Promises } from 'vscode/vscode/vs/base/common/async';
 import { ExtUri } from 'vscode/vscode/vs/base/common/resources';
+import { revive } from 'vscode/vscode/vs/base/common/marshalling';
 
 const time = async (name, task) => {
     {
         return task();
     }
 };
-function create(host) {
-    return ( new LocalFileSearchSimpleWorker(host));
+function create(workerServer) {
+    return ( new LocalFileSearchSimpleWorker(workerServer));
 }
 class LocalFileSearchSimpleWorker {
-    constructor(host) {
-        this.host = host;
+    constructor(workerServer) {
         this.cancellationTokens = ( new Map());
+        this.host = LocalFileSearchSimpleWorkerHost.getChannel(workerServer);
     }
-    cancelQuery(queryId) {
+    $cancelQuery(queryId) {
         this.cancellationTokens.get(queryId)?.cancel();
     }
     registerCancellationToken(queryId) {
@@ -29,7 +31,7 @@ class LocalFileSearchSimpleWorker {
         this.cancellationTokens.set(queryId, source);
         return source;
     }
-    async listDirectory(handle, query, folderQuery, ignorePathCasing, queryId) {
+    async $listDirectory(handle, query, folderQuery, ignorePathCasing, queryId) {
         const revivedFolderQuery = reviveFolderQuery(folderQuery);
         const extUri = ( new ExtUri(() => ignorePathCasing));
         const token = this.registerCancellationToken(queryId);
@@ -56,7 +58,7 @@ class LocalFileSearchSimpleWorker {
             limitHit
         };
     }
-    async searchDirectory(handle, query, folderQuery, ignorePathCasing, queryId) {
+    async $searchDirectory(handle, query, folderQuery, ignorePathCasing, queryId) {
         const revivedQuery = reviveFolderQuery(folderQuery);
         const extUri = ( new ExtUri(() => ignorePathCasing));
         return time('searchInFiles', async () => {
@@ -76,8 +78,7 @@ class LocalFileSearchSimpleWorker {
                 }
                 const bytes = ( new Uint8Array(contents));
                 const fileResults = getFileResults(bytes, pattern, {
-                    afterContext: query.afterContext ?? 0,
-                    beforeContext: query.beforeContext ?? 0,
+                    surroundingContext: query.surroundingContext ?? 0,
                     previewOptions: query.previewOptions,
                     remainingResultQuota: query.maxResults ? (query.maxResults - resultCount) : 10000,
                 });
@@ -90,7 +91,7 @@ class LocalFileSearchSimpleWorker {
                         resource: URI.joinPath(revivedQuery.folder, file.path),
                         results: fileResults,
                     };
-                    this.host.sendTextSearchMatch(match, queryId);
+                    this.host.$sendTextSearchMatch(match, queryId);
                     results.push(match);
                 }
             };
@@ -103,10 +104,15 @@ class LocalFileSearchSimpleWorker {
         });
     }
     async walkFolderQuery(handle, queryProps, folderQuery, extUri, onFile, token) {
-        const folderExcludes = parse(folderQuery.excludePattern ?? {}, { trimForExclusions: true });
+        const folderExcludes = folderQuery.excludePattern?.map(excludePattern => parse(excludePattern.pattern ?? {}, { trimForExclusions: true }));
+        const evalFolderExcludes = (path, basename, hasSibling) => {
+            return folderExcludes?.some(folderExclude => {
+                return folderExclude(path, basename, hasSibling);
+            });
+        };
         const isFolderExcluded = (path, basename, hasSibling) => {
             path = path.slice(1);
-            if (folderExcludes(path, basename, hasSibling)) {
+            if (evalFolderExcludes(path, basename, hasSibling)) {
                 return true;
             }
             if (pathExcludedInQuery(queryProps, path)) {
@@ -116,7 +122,7 @@ class LocalFileSearchSimpleWorker {
         };
         const isFileIncluded = (path, basename, hasSibling) => {
             path = path.slice(1);
-            if (folderExcludes(path, basename, hasSibling)) {
+            if (evalFolderExcludes(path, basename, hasSibling)) {
                 return false;
             }
             if (!pathIncludedInQuery(queryProps, path, extUri)) {
@@ -215,10 +221,7 @@ function createSearchRegExp(options) {
     });
 }
 function reviveFolderQuery(folderQuery) {
-    return {
-        ...folderQuery,
-        folder: URI.revive(folderQuery.folder),
-    };
+    return revive(folderQuery);
 }
 function reviveQueryProps(queryProps) {
     return {