@codingame/monaco-vscode-api 8.0.3 → 9.0.0

package/vscode/src/vs/workbench/api/common/extHostTypes.js

@@ -3203,9 +3203,9 @@ TestTag = ( __decorate([
     es5ClassCompat
 ], TestTag));
 class TestMessageStackFrame {
-    constructor(label, file, position) {
+    constructor(label, uri, position) {
         this.label = label;
-        this.file = file;
+        this.uri = uri;
         this.position = position;
     }
 }
@@ -3509,6 +3509,12 @@ class ChatResponseCodeCitationPart {
         this.snippet = snippet;
     }
 }
+class ChatResponseMovePart {
+    constructor(uri, range) {
+        this.uri = uri;
+        this.range = range;
+    }
+}
 class ChatResponseTextEditPart {
     constructor(uri, edits) {
         this.uri = uri;
@@ -3564,9 +3570,9 @@ var LanguageModelChatMessageRole;
     LanguageModelChatMessageRole[LanguageModelChatMessageRole["Assistant"] = 2] = "Assistant";
     LanguageModelChatMessageRole[LanguageModelChatMessageRole["System"] = 3] = "System";
 })(LanguageModelChatMessageRole || (LanguageModelChatMessageRole = {})));
-class LanguageModelFunctionResultPart {
-    constructor(name, content, isError) {
-        this.name = name;
+class LanguageModelToolResultPart {
+    constructor(toolCallId, content, isError) {
+        this.toolCallId = toolCallId;
         this.content = content;
         this.isError = isError ?? false;
     }
@@ -3578,7 +3584,7 @@ class LanguageModelChatMessage {
             typeof content === 'string' ? content : '',
             name
         ));
-        value.content2 = content;
+        value.content2 = [content];
         return value;
     }
     static Assistant(content, name) {
@@ -3587,13 +3593,14 @@ class LanguageModelChatMessage {
     constructor(role, content, name) {
         this.role = role;
         this.content = content;
-        this.content2 = content;
+        this.content2 = [content];
         this.name = name;
     }
 }
-class LanguageModelFunctionUsePart {
-    constructor(name, parameters) {
+class LanguageModelToolCallPart {
+    constructor(name, toolCallId, parameters) {
         this.name = name;
+        this.toolCallId = toolCallId;
         this.parameters = parameters;
     }
 }
@@ -3655,4 +3662,4 @@ var InlineEditTriggerKind;
     InlineEditTriggerKind[InlineEditTriggerKind["Invoke"] = 0] = "Invoke";
     InlineEditTriggerKind[InlineEditTriggerKind["Automatic"] = 1] = "Automatic";
 })(InlineEditTriggerKind || (InlineEditTriggerKind = {})));
-export { BranchCoverage, Breakpoint, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatCompletionItem, ChatCopyKind, ChatEditorTabInput, ChatLocation, ChatRequestEditorData, ChatRequestNotebookData, ChatRequestTurn, ChatResponseAnchorPart, ChatResponseCodeCitationPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseDetectedParticipantPart, ChatResponseFileTreePart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseProgressPart, ChatResponseProgressPart2, ChatResponseReferencePart, ChatResponseReferencePartStatusKind, ChatResponseTextEditPart, ChatResponseTurn, ChatResponseWarningPart, ChatResultFeedbackKind, ChatVariableLevel, CodeAction, CodeActionKind, CodeActionTriggerKind, CodeLens, Color, ColorInformation, ColorPresentation, ColorTheme, ColorThemeKind, CommentMode, CommentState, CommentThreadApplicability, CommentThreadCollapsibleState, CommentThreadFocus, CommentThreadState, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionList, CompletionTriggerKind, ConfigurationTarget, CustomEditorTabInput, CustomExecution, DataBreakpoint, DataTransfer, DataTransferFile, DataTransferItem, DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer, DebugConsoleMode, DebugStackFrame, DebugThread, DebugVisualization, DeclarationCoverage, DecorationRangeBehavior, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Disposable, DocumentDropEdit, DocumentDropOrPasteEditKind, DocumentHighlight, DocumentHighlightKind, DocumentLink, DocumentPasteEdit, DocumentPasteTriggerKind, DocumentSymbol, EndOfLine, EnvironmentVariableMutatorType, EvaluatableExpression, ExtensionKind, ExtensionMode, ExtensionRuntime, ExternalUriOpenerPriority, FileChangeType, FileCoverage, FileDecoration, FileEditType, FileSystemError, FoldingRange, FoldingRangeKind, FunctionBreakpoint, Hover, HoverVerbosityAction, InlayHint, InlayHintKind, InlayHintLabelPart, InlineCompletionTriggerKind, InlineEdit, InlineEditTriggerKind, InlineSuggestion, InlineSuggestionList, InlineValueContext, InlineValueEvaluatableExpression, InlineValueText, InlineValueVariableLookup, InputBoxValidationSeverity, InteractiveEditorResponseFeedbackKind, InteractiveSessionVoteDirection, InteractiveWindowInput, InternalDataTransferItem, InternalFileDataTransferItem, KeywordRecognitionStatus, LanguageModelChatMessage, LanguageModelChatMessageRole, LanguageModelError, LanguageModelFunctionResultPart, LanguageModelFunctionUsePart, LanguageModelTextPart, LanguageStatusSeverity, LinkedEditingRanges, Location, ManagedResolvedAuthority, MarkdownString, MultiDocumentHighlight, NewSymbolName, NewSymbolNameTag, NewSymbolNameTriggerKind, NotebookCellData, NotebookCellExecutionState, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookCellStatusBarAlignment, NotebookCellStatusBarItem, NotebookControllerAffinity, NotebookControllerAffinity2, NotebookData, NotebookDiffEditorTabInput, NotebookEdit, NotebookEditorRevealType, NotebookEditorTabInput, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookVariablesRequestKind, ParameterInformation, PartialAcceptTriggerKind, PortAttributes, PortAutoForwardAction, Position, ProcessExecution, ProgressLocation, QuickInputButtonLocation, QuickInputButtons, QuickPickItemKind, Range, RelatedInformationType, RelativePattern, RemoteAuthorityResolverError, ResolvedAuthority, Selection, SelectionRange, SemanticTokens, SemanticTokensBuilder, SemanticTokensEdit, SemanticTokensEdits, SemanticTokensLegend, ShellExecution, ShellQuoting, SignatureHelp, SignatureHelpTriggerKind, SignatureInformation, SnippetString, SnippetTextEdit, SourceBreakpoint, SourceControlInputBoxValidationType, SpeechToTextStatus, StandardTokenType, StatementCoverage, StatusBarAlignment, SymbolInformation, SymbolKind, SymbolTag, SyntaxTokenType, Task, TaskGroup, TaskPanelKind, TaskRevealKind, TaskScope, TerminalEditorTabInput, TerminalExitReason, TerminalLink, TerminalLocation, TerminalOutputAnchor, TerminalProfile, TerminalQuickFixCommand, TerminalQuickFixOpener, TerminalShellExecutionCommandLineConfidence, TestCoverageCount, TestMessage, TestMessageStackFrame, TestResultState, TestRunProfileKind, TestRunRequest, TestTag, TextDiffTabInput, TextDocumentChangeReason, TextDocumentSaveReason, TextEdit, TextEditorLineNumbersStyle, TextEditorRevealType, TextEditorSelectionChangeKind, TextMergeTabInput, TextMultiDiffTabInput, TextTabInput, TextToSpeechStatus, ThemeColor, ThemeIcon, TimelineItem, TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState, TypeHierarchyItem, VerboseHover, ViewBadge, ViewColumn, WebviewEditorTabInput, WorkspaceEdit, WorkspaceTrustState, asStatusBarItemIdentifier, getDebugDescriptionOfRange, getDebugDescriptionOfSelection, setBreakpointId, validateTestCoverageCount };
+export { BranchCoverage, Breakpoint, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatCompletionItem, ChatCopyKind, ChatEditorTabInput, ChatLocation, ChatRequestEditorData, ChatRequestNotebookData, ChatRequestTurn, ChatResponseAnchorPart, ChatResponseCodeCitationPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseDetectedParticipantPart, ChatResponseFileTreePart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseMovePart, ChatResponseProgressPart, ChatResponseProgressPart2, ChatResponseReferencePart, ChatResponseReferencePartStatusKind, ChatResponseTextEditPart, ChatResponseTurn, ChatResponseWarningPart, ChatResultFeedbackKind, ChatVariableLevel, CodeAction, CodeActionKind, CodeActionTriggerKind, CodeLens, Color, ColorInformation, ColorPresentation, ColorTheme, ColorThemeKind, CommentMode, CommentState, CommentThreadApplicability, CommentThreadCollapsibleState, CommentThreadFocus, CommentThreadState, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionList, CompletionTriggerKind, ConfigurationTarget, CustomEditorTabInput, CustomExecution, DataBreakpoint, DataTransfer, DataTransferFile, DataTransferItem, DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer, DebugConsoleMode, DebugStackFrame, DebugThread, DebugVisualization, DeclarationCoverage, DecorationRangeBehavior, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Disposable, DocumentDropEdit, DocumentDropOrPasteEditKind, DocumentHighlight, DocumentHighlightKind, DocumentLink, DocumentPasteEdit, DocumentPasteTriggerKind, DocumentSymbol, EndOfLine, EnvironmentVariableMutatorType, EvaluatableExpression, ExtensionKind, ExtensionMode, ExtensionRuntime, ExternalUriOpenerPriority, FileChangeType, FileCoverage, FileDecoration, FileEditType, FileSystemError, FoldingRange, FoldingRangeKind, FunctionBreakpoint, Hover, HoverVerbosityAction, InlayHint, InlayHintKind, InlayHintLabelPart, InlineCompletionTriggerKind, InlineEdit, InlineEditTriggerKind, InlineSuggestion, InlineSuggestionList, InlineValueContext, InlineValueEvaluatableExpression, InlineValueText, InlineValueVariableLookup, InputBoxValidationSeverity, InteractiveEditorResponseFeedbackKind, InteractiveSessionVoteDirection, InteractiveWindowInput, InternalDataTransferItem, InternalFileDataTransferItem, KeywordRecognitionStatus, LanguageModelChatMessage, LanguageModelChatMessageRole, LanguageModelError, LanguageModelTextPart, LanguageModelToolCallPart, LanguageModelToolResultPart, LanguageStatusSeverity, LinkedEditingRanges, Location, ManagedResolvedAuthority, MarkdownString, MultiDocumentHighlight, NewSymbolName, NewSymbolNameTag, NewSymbolNameTriggerKind, NotebookCellData, NotebookCellExecutionState, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookCellStatusBarAlignment, NotebookCellStatusBarItem, NotebookControllerAffinity, NotebookControllerAffinity2, NotebookData, NotebookDiffEditorTabInput, NotebookEdit, NotebookEditorRevealType, NotebookEditorTabInput, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookVariablesRequestKind, ParameterInformation, PartialAcceptTriggerKind, PortAttributes, PortAutoForwardAction, Position, ProcessExecution, ProgressLocation, QuickInputButtonLocation, QuickInputButtons, QuickPickItemKind, Range, RelatedInformationType, RelativePattern, RemoteAuthorityResolverError, ResolvedAuthority, Selection, SelectionRange, SemanticTokens, SemanticTokensBuilder, SemanticTokensEdit, SemanticTokensEdits, SemanticTokensLegend, ShellExecution, ShellQuoting, SignatureHelp, SignatureHelpTriggerKind, SignatureInformation, SnippetString, SnippetTextEdit, SourceBreakpoint, SourceControlInputBoxValidationType, SpeechToTextStatus, StandardTokenType, StatementCoverage, StatusBarAlignment, SymbolInformation, SymbolKind, SymbolTag, SyntaxTokenType, Task, TaskGroup, TaskPanelKind, TaskRevealKind, TaskScope, TerminalEditorTabInput, TerminalExitReason, TerminalLink, TerminalLocation, TerminalOutputAnchor, TerminalProfile, TerminalQuickFixCommand, TerminalQuickFixOpener, TerminalShellExecutionCommandLineConfidence, TestCoverageCount, TestMessage, TestMessageStackFrame, TestResultState, TestRunProfileKind, TestRunRequest, TestTag, TextDiffTabInput, TextDocumentChangeReason, TextDocumentSaveReason, TextEdit, TextEditorLineNumbersStyle, TextEditorRevealType, TextEditorSelectionChangeKind, TextMergeTabInput, TextMultiDiffTabInput, TextTabInput, TextToSpeechStatus, ThemeColor, ThemeIcon, TimelineItem, TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState, TypeHierarchyItem, VerboseHover, ViewBadge, ViewColumn, WebviewEditorTabInput, WorkspaceEdit, WorkspaceTrustState, asStatusBarItemIdentifier, getDebugDescriptionOfRange, getDebugDescriptionOfSelection, setBreakpointId, validateTestCoverageCount };

package/vscode/src/vs/workbench/api/common/extHostWorkspace.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { mapArrayOrNot, delta as delta$1 } from '../../../base/common/arrays.js';
-import { Barrier } from '../../../base/common/async.js';
+import { delta as delta$1, mapArrayOrNot } from '../../../base/common/arrays.js';
+import { Barrier, AsyncIterableObject } from '../../../base/common/async.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { Emitter, AsyncEmitter } from '../../../base/common/event.js';
 import { toDisposable } from '../../../base/common/lifecycle.js';
@@ -25,6 +25,7 @@ import { IURITransformerService } from './extHostUriTransformerService.js';
 import { resultIsMatch } from '../../services/search/common/search.js';
 import { MainContext } from './extHost.protocol.js';
 import { revive } from '../../../base/common/marshalling.js';
+import { ExcludeSettingOptions, TextSearchMatchNew, TextSearchContextNew } from '../../services/search/common/searchExtTypes.js';
 import Severity$1 from '../../../base/common/severity.js';
 function isFolderEqual(folderA, folderB, extHostFileSystemInfo) {
     return ( (new ExtUri(uri => ignorePathCasing(uri, extHostFileSystemInfo)))).isEqual(folderA, folderB);
@@ -244,7 +245,7 @@ let ExtHostWorkspace = class ExtHostWorkspace {
                 this._unconfirmedWorkspace = undefined;
                 const options = { source: { identifier: extension.identifier, label: extension.displayName || extension.name } };
                 this._messageService.$showMessage(Severity$1.Error, ( localize(
-                    572,
+                    950,
                     "Extension '{0}' failed to update workspace folders: {1}",
                     extName,
                      (error.toString())
@@ -347,60 +348,191 @@ let ExtHostWorkspace = class ExtHostWorkspace {
             }
         }
         return this._findFilesImpl(include, undefined, {
-            exclude: excludeString,
+            exclude: [excludeString],
             maxResults,
-            useDefaultExcludes: useFileExcludes,
-            useDefaultSearchExcludes: false,
-            useIgnoreFiles: false
+            useExcludeSettings: useFileExcludes ? ExcludeSettingOptions.FilesExclude : ExcludeSettingOptions.None,
+            useIgnoreFiles: {
+                local: false
+            }
         }, token);
     }
     findFiles2(filePattern, options = {}, extensionId, token = CancellationToken.None) {
         this._logService.trace(`extHostWorkspace#findFiles2: fileSearch, extension: ${extensionId.value}, entryPoint: findFiles2`);
-        return this._findFilesImpl(undefined, filePattern, options, token);
+        const useDefaultExcludes = options.useDefaultExcludes ?? true;
+        const useDefaultSearchExcludes = options.useDefaultSearchExcludes ?? true;
+        const excludeSetting = useDefaultExcludes ?
+            (useDefaultSearchExcludes ? ExcludeSettingOptions.SearchAndFilesExclude : ExcludeSettingOptions.FilesExclude) :
+            ExcludeSettingOptions.None;
+        const newOptions = {
+            exclude: options.exclude ? [options.exclude] : undefined,
+            useIgnoreFiles: {
+                local: options.useIgnoreFiles,
+                global: options.useGlobalIgnoreFiles,
+                parent: options.useParentIgnoreFiles
+            },
+            useExcludeSettings: excludeSetting,
+            followSymlinks: options.followSymlinks,
+            maxResults: options.maxResults,
+        };
+        return this._findFilesImpl(undefined, filePattern !== undefined ? [filePattern] : [], newOptions, token);
+    }
+    findFiles2New(filePatterns, options = {}, extensionId, token = CancellationToken.None) {
+        this._logService.trace(`extHostWorkspace#findFiles2New: fileSearch, extension: ${extensionId.value}, entryPoint: findFiles2New`);
+        return this._findFilesImpl(undefined, filePatterns, options, token);
     }
     async _findFilesImpl(
-    include, filePattern, options, token = CancellationToken.None) {
+    include, filePatterns, options, token = CancellationToken.None) {
         if (token && token.isCancellationRequested) {
             return Promise.resolve([]);
         }
-        const excludePattern = (typeof options.exclude === 'string') ? options.exclude :
-            options.exclude ? options.exclude.pattern : undefined;
-        const fileQueries = {
-            ignoreSymlinks: typeof options.followSymlinks === 'boolean' ? !options.followSymlinks : undefined,
-            disregardIgnoreFiles: typeof options.useIgnoreFiles === 'boolean' ? !options.useIgnoreFiles : undefined,
-            disregardGlobalIgnoreFiles: typeof options.useGlobalIgnoreFiles === 'boolean' ? !options.useGlobalIgnoreFiles : undefined,
-            disregardParentIgnoreFiles: typeof options.useParentIgnoreFiles === 'boolean' ? !options.useParentIgnoreFiles : undefined,
-            disregardExcludeSettings: typeof options.useDefaultExcludes === 'boolean' ? !options.useDefaultExcludes : false,
-            disregardSearchExcludeSettings: typeof options.useDefaultSearchExcludes === 'boolean' ? !options.useDefaultSearchExcludes : false,
-            maxResults: options.maxResults,
-            excludePattern: excludePattern,
-            shouldGlobSearch: typeof options.fuzzy === 'boolean' ? !options.fuzzy : true,
-            _reason: 'startFileSearch'
+        const filePatternsToUse = include !== undefined ? [include] : filePatterns;
+        const queryOptions = filePatternsToUse?.map(filePattern => {
+            const excludePatterns = globsToISearchPatternBuilder(options.exclude);
+            const fileQueries = {
+                ignoreSymlinks: typeof options.followSymlinks === 'boolean' ? !options.followSymlinks : undefined,
+                disregardIgnoreFiles: typeof options.useIgnoreFiles?.local === 'boolean' ? !options.useIgnoreFiles.local : undefined,
+                disregardGlobalIgnoreFiles: typeof options.useIgnoreFiles?.global === 'boolean' ? !options.useIgnoreFiles.global : undefined,
+                disregardParentIgnoreFiles: typeof options.useIgnoreFiles?.parent === 'boolean' ? !options.useIgnoreFiles.parent : undefined,
+                disregardExcludeSettings: options.useExcludeSettings !== undefined && options.useExcludeSettings === ExcludeSettingOptions.None,
+                disregardSearchExcludeSettings: options.useExcludeSettings !== undefined && (options.useExcludeSettings !== ExcludeSettingOptions.SearchAndFilesExclude),
+                maxResults: options.maxResults,
+                excludePattern: excludePatterns.length > 0 ? excludePatterns : undefined,
+                _reason: 'startFileSearch',
+                shouldGlobSearch: include ? undefined : true,
+            };
+            const parseInclude = parseSearchExcludeInclude(GlobPattern.from(filePattern));
+            const folderToUse = parseInclude?.folder;
+            if (include) {
+                fileQueries.includePattern = parseInclude?.pattern;
+            }
+            else {
+                fileQueries.filePattern = parseInclude?.pattern;
+            }
+            return {
+                folder: folderToUse,
+                options: fileQueries
+            };
+        }) ?? [];
+        return this._findFilesBase(queryOptions, token);
+    }
+    async _findFilesBase(queryOptions, token) {
+        const result = await Promise.all(queryOptions?.map(option => this._proxy.$startFileSearch(option.folder ?? null, option.options, token).then(data => Array.isArray(data) ? ( (data.map(d => URI.revive(d)))) : [])) ?? []);
+        return result.flat();
+    }
+    findTextInFilesNew(query, extensionId, options, token) {
+        this._logService.trace(`extHostWorkspace#findTextInFilesNew: textSearch, extension: ${extensionId.value}, entryPoint: findTextInFilesNew`);
+        const getOptions = (include) => {
+            if (!options) {
+                return {
+                    folder: undefined,
+                    options: {}
+                };
+            }
+            const parsedInclude = include ? parseSearchExcludeInclude(GlobPattern.from(include)) : undefined;
+            const excludePatterns = globsToISearchPatternBuilder(options.exclude);
+            return {
+                options: {
+                    ignoreSymlinks: typeof options.followSymlinks === 'boolean' ? !options.followSymlinks : undefined,
+                    disregardIgnoreFiles: typeof options.useIgnoreFiles === 'boolean' ? !options.useIgnoreFiles : undefined,
+                    disregardGlobalIgnoreFiles: typeof options.useIgnoreFiles?.global === 'boolean' ? !options.useIgnoreFiles?.global : undefined,
+                    disregardParentIgnoreFiles: typeof options.useIgnoreFiles?.parent === 'boolean' ? !options.useIgnoreFiles?.parent : undefined,
+                    disregardExcludeSettings: options.useExcludeSettings !== undefined && options.useExcludeSettings === ExcludeSettingOptions.None,
+                    disregardSearchExcludeSettings: options.useExcludeSettings !== undefined && (options.useExcludeSettings !== ExcludeSettingOptions.SearchAndFilesExclude),
+                    fileEncoding: options.encoding,
+                    maxResults: options.maxResults,
+                    previewOptions: options.previewOptions ? {
+                        matchLines: options.previewOptions?.numMatchLines ?? 100,
+                        charsPerLine: options.previewOptions?.charsPerLine ?? 10000,
+                    } : undefined,
+                    surroundingContext: options.surroundingContext,
+                    includePattern: parsedInclude?.pattern,
+                    excludePattern: excludePatterns
+                },
+                folder: parsedInclude?.folder
+            };
         };
-        let folderToUse;
-        if (include) {
-            const { includePattern, folder } = parseSearchInclude(GlobPattern.from(include));
-            folderToUse = folder;
-            fileQueries.includePattern = includePattern;
+        const queryOptionsRaw = ((options?.include?.map((include) => getOptions(include)))) ?? [getOptions(undefined)];
+        const queryOptions = queryOptionsRaw.filter((queryOps) => !!queryOps);
+        const complete = Promise.resolve(undefined);
+        const asyncIterable = ( (new AsyncIterableObject(async (emitter) => {
+            const progress = (result, uri) => {
+                if (resultIsMatch(result)) {
+                    emitter.emitOne(( (new TextSearchMatchNew(uri,  (result.rangeLocations.map((range) => ({
+                        previewRange: ( (new Range(
+                            range.preview.startLineNumber,
+                            range.preview.startColumn,
+                            range.preview.endLineNumber,
+                            range.preview.endColumn
+                        ))),
+                        sourceRange: ( (new Range(
+                            range.source.startLineNumber,
+                            range.source.startColumn,
+                            range.source.endLineNumber,
+                            range.source.endColumn
+                        )))
+                    }))), result.previewText))));
+                }
+                else {
+                    emitter.emitOne(( (new TextSearchContextNew(uri, result.text, result.lineNumber))));
+                }
+                return result;
+            };
+            await complete.then(e => {
+                return this.findTextInFilesBase(query, queryOptions, progress, token);
+            });
+        })));
+        return {
+            results: asyncIterable,
+            complete: complete.then((e) => {
+                return {
+                    limitHit: e?.limitHit ?? false
+                };
+            }),
+        };
+    }
+    async findTextInFilesBase(query, queryOptions, callback, token = CancellationToken.None) {
+        const requestId = this._requestIdProvider.getNext();
+        let isCanceled = false;
+        token.onCancellationRequested(_ => {
+            isCanceled = true;
+        });
+        this._activeSearchCallbacks[requestId] = p => {
+            if (isCanceled) {
+                return;
+            }
+            const uri = URI.revive(p.resource);
+            p.results.forEach(rawResult => {
+                const result = revive(rawResult);
+                callback(result, uri);
+            });
+        };
+        if (token.isCancellationRequested) {
+            return {};
         }
-        else {
-            const { includePattern, folder } = parseSearchInclude(GlobPattern.from(filePattern));
-            folderToUse = folder;
-            fileQueries.filePattern = includePattern;
+        try {
+            const result = await Promise.all(queryOptions?.map(option => this._proxy.$startTextSearch(query, option.folder ?? null, option.options, requestId, token) || {}) ?? []);
+            delete this._activeSearchCallbacks[requestId];
+            return result.reduce((acc, val) => {
+                return {
+                    limitHit: acc?.limitHit || (val?.limitHit ?? false),
+                    message: [acc?.message ?? [], val?.message ?? []].flat(),
+                };
+            }, {}) ?? { limitHit: false };
+        }
+        catch (err) {
+            delete this._activeSearchCallbacks[requestId];
+            throw err;
         }
-        return this._proxy.$startFileSearch(folderToUse ?? null, fileQueries, token)
-            .then(data => Array.isArray(data) ? ( (data.map(d => URI.revive(d)))) : []);
     }
     async findTextInFiles(query, options, callback, extensionId, token = CancellationToken.None) {
         this._logService.trace(`extHostWorkspace#findTextInFiles: textSearch, extension: ${extensionId.value}, entryPoint: findTextInFiles`);
-        const requestId = this._requestIdProvider.getNext();
         const previewOptions = typeof options.previewOptions === 'undefined' ?
             {
                 matchLines: 100,
                 charsPerLine: 10000
             } :
             options.previewOptions;
-        const { includePattern, folder } = parseSearchInclude(GlobPattern.from(options.include));
+        const parsedInclude = parseSearchExcludeInclude(GlobPattern.from(options.include));
         const excludePattern = (typeof options.exclude === 'string') ? options.exclude :
             options.exclude ? options.exclude.pattern : undefined;
         const queryOptions = {
@@ -413,46 +545,40 @@ let ExtHostWorkspace = class ExtHostWorkspace {
             fileEncoding: options.encoding,
             maxResults: options.maxResults,
             previewOptions,
-            afterContext: options.afterContext,
-            beforeContext: options.beforeContext,
-            includePattern: includePattern,
-            excludePattern: excludePattern
+            surroundingContext: options.afterContext,
+            includePattern: parsedInclude?.pattern,
+            excludePattern: excludePattern ? [{ pattern: excludePattern }] : undefined,
         };
-        this._activeSearchCallbacks[requestId] = p => {
-            const uri = URI.revive(p.resource);
-            p.results.forEach(rawResult => {
-                const result = revive(rawResult);
-                if (resultIsMatch(result)) {
-                    callback({
-                        uri,
-                        preview: {
-                            text: result.preview.text,
-                            matches: mapArrayOrNot(result.preview.matches, m => ( (new Range(m.startLineNumber, m.startColumn, m.endLineNumber, m.endColumn))))
-                        },
-                        ranges: mapArrayOrNot(result.ranges, r => ( (new Range(r.startLineNumber, r.startColumn, r.endLineNumber, r.endColumn))))
-                    });
-                }
-                else {
-                    callback({
-                        uri,
-                        text: result.text,
-                        lineNumber: result.lineNumber
-                    });
-                }
-            });
+        const progress = (result, uri) => {
+            if (resultIsMatch(result)) {
+                callback({
+                    uri,
+                    preview: {
+                        text: result.previewText,
+                        matches: mapArrayOrNot(result.rangeLocations, m => ( (new Range(
+                            m.preview.startLineNumber,
+                            m.preview.startColumn,
+                            m.preview.endLineNumber,
+                            m.preview.endColumn
+                        ))))
+                    },
+                    ranges: mapArrayOrNot(result.rangeLocations, r => ( (new Range(
+                        r.source.startLineNumber,
+                        r.source.startColumn,
+                        r.source.endLineNumber,
+                        r.source.endColumn
+                    ))))
+                });
+            }
+            else {
+                callback({
+                    uri,
+                    text: result.text,
+                    lineNumber: result.lineNumber
+                });
+            }
         };
-        if (token.isCancellationRequested) {
-            return {};
-        }
-        try {
-            const result = await this._proxy.$startTextSearch(query, folder ?? null, queryOptions, requestId, token);
-            delete this._activeSearchCallbacks[requestId];
-            return result || {};
-        }
-        catch (err) {
-            delete this._activeSearchCallbacks[requestId];
-            throw err;
-        }
+        return this.findTextInFilesBase(query, [{ options: queryOptions, folder: parsedInclude?.folder }], progress, token);
     }
     $handleTextSearchResult(result, requestId) {
         this._activeSearchCallbacks[requestId]?.(result);
@@ -604,21 +730,45 @@ ExtHostWorkspace = ( (__decorate([
     ( (__param(4, IURITransformerService)))
 ], ExtHostWorkspace)));
 const IExtHostWorkspace = ( (createDecorator('IExtHostWorkspace')));
-function parseSearchInclude(include) {
-    let includePattern;
+function parseSearchExcludeInclude(include) {
+    let pattern;
     let includeFolder;
     if (include) {
         if (typeof include === 'string') {
-            includePattern = include;
+            pattern = include;
         }
         else {
-            includePattern = include.pattern;
+            pattern = include.pattern;
             includeFolder = URI.revive(include.baseUri);
         }
+        return {
+            pattern,
+            folder: includeFolder
+        };
     }
-    return {
-        includePattern,
-        folder: includeFolder
-    };
+    return undefined;
+}
+function globsToISearchPatternBuilder(excludes) {
+    return (excludes?.map((exclude) => {
+        if (typeof exclude === 'string') {
+            if (exclude === '') {
+                return undefined;
+            }
+            return {
+                pattern: exclude,
+                uri: undefined
+            };
+        }
+        else {
+            const parsedExclude = parseSearchExcludeInclude(exclude);
+            if (!parsedExclude) {
+                return undefined;
+            }
+            return {
+                pattern: parsedExclude.pattern,
+                uri: parsedExclude.folder
+            };
+        }
+    }) ?? []).filter((e) => !!e);
 }
 export { ExtHostWorkspace, IExtHostWorkspace };

package/vscode/src/vs/workbench/api/common/jsonValidationExtensionPoint.js

@@ -14,7 +14,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'jsonValidation',
     defaultExtensionKind: ['workspace', 'web'],
     jsonSchema: {
-        description: ( localize(578, 'Contributes json schema configuration.')),
+        description: ( localize(831, 'Contributes json schema configuration.')),
         type: 'array',
         defaultSnippets: [{ body: [{ fileMatch: '${1:file.json}', url: '${2:url}' }] }],
         items: {
@@ -24,7 +24,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                 fileMatch: {
                     type: ['string', 'array'],
                     description: ( localize(
-                        579,
+                        832,
                         'The file pattern (or an array of patterns) to match, for example "package.json" or "*.launch". Exclusion patterns start with \'!\''
                     )),
                     items: {
@@ -33,7 +33,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                 },
                 url: {
                     description: ( localize(
-                        580,
+                        833,
                         'A schema URL (\'http:\', \'https:\') or relative path to the extension folder (\'./\').'
                     )),
                     type: 'string'
@@ -50,20 +50,20 @@ class JSONValidationExtensionPoint {
                 const collector = extension.collector;
                 const extensionLocation = extension.description.extensionLocation;
                 if (!extensionValue || !Array.isArray(extensionValue)) {
-                    collector.error(( localize(581, "'configuration.jsonValidation' must be a array")));
+                    collector.error(( localize(834, "'configuration.jsonValidation' must be a array")));
                     return;
                 }
                 extensionValue.forEach(extension => {
                     if (!isString(extension.fileMatch) && !(Array.isArray(extension.fileMatch) && extension.fileMatch.every(isString))) {
                         collector.error(( localize(
-                            582,
+                            835,
                             "'configuration.jsonValidation.fileMatch' must be defined as a string or an array of strings."
                         )));
                         return;
                     }
                     const uri = extension.url;
                     if (!isString(uri)) {
-                        collector.error(( localize(583, "'configuration.jsonValidation.url' must be a URL or relative path")));
+                        collector.error(( localize(836, "'configuration.jsonValidation.url' must be a URL or relative path")));
                         return;
                     }
                     if (uri.startsWith('./')) {
@@ -71,7 +71,7 @@ class JSONValidationExtensionPoint {
                             const colorThemeLocation = joinPath(extensionLocation, uri);
                             if (!isEqualOrParent(colorThemeLocation, extensionLocation)) {
                                 collector.warn(( localize(
-                                    584,
+                                    837,
                                     "Expected `contributes.{0}.url` ({1}) to be included inside extension's folder ({2}). This might make the extension non-portable.",
                                     configurationExtPoint.name,
                                      (colorThemeLocation.toString()),
@@ -81,7 +81,7 @@ class JSONValidationExtensionPoint {
                         }
                         catch (e) {
                             collector.error(( localize(
-                                585,
+                                838,
                                 "'configuration.jsonValidation.url' is an invalid relative URL: {0}",
                                 e.message
                             )));
@@ -89,7 +89,7 @@ class JSONValidationExtensionPoint {
                     }
                     else if (!/^[^:/?#]+:\/\//.test(uri)) {
                         collector.error(( localize(
-                            586,
+                            839,
                             "'configuration.jsonValidation.url' must be an absolute URL or start with './'  to reference schemas located in the extension."
                         )));
                         return;
@@ -113,8 +113,8 @@ class JSONValidationDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(587, "File Match")),
-            ( localize(588, "Schema")),
+            ( localize(840, "File Match")),
+            ( localize(841, "Schema")),
         ];
         const rows = ( (contrib.map(v => {
             return [
@@ -133,7 +133,7 @@ class JSONValidationDataRenderer extends Disposable {
 }
 ( (Registry.as(Extensions.ExtensionFeaturesRegistry))).registerExtensionFeature({
     id: 'jsonValidation',
-    label: ( localize(589, "JSON Validation")),
+    label: ( localize(842, "JSON Validation")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/api/worker/extensionHostWorker.esm.js

@@ -0,0 +1,3 @@
+import { create } from './extensionHostWorker.js';
+const data = create();
+self.onmessage = (e) => data.onmessage(e.data);