@codingame/monaco-vscode-api 8.0.4 → 9.0.2

package/vscode-dts/vscode.proposed.findFiles2New.d.ts

@@ -7,8 +7,19 @@ declare module 'vscode' {
 
 	export interface FindFiles2OptionsNew {
 		/**
-		 * A {@link GlobPattern glob pattern} that defines files and folders to exclude. The glob pattern
-		 * will be matched against the file paths of resulting matches relative to their workspace.
+		 * An array of {@link GlobPattern GlobPattern} that defines files to exclude.
+		 * The glob patterns will be matched against the file paths of files relative to their workspace or {@link RelativePattern.baseUri} if applicable.
+		 *
+		 * If more than one value is used, the values are combined with a logical AND.
+		 * For example, consider the following code:
+		 *
+		 * ```ts
+		 * const ab = findFiles(['**​/*.js'], {exclude: ['*.ts', '*.js']});
+		 * const a = findFiles(['**​/*.js'], {exclude: ['*.ts']});
+		 * const b = findFiles(['**​/*.js'], {exclude: ['*.js']});
+		 * ```
+		 *
+		 * In this, `ab` will be the intersection of results from `a` and `b`.
 		 */
 		exclude?: GlobPattern[];
 
@@ -18,19 +29,21 @@ declare module 'vscode' {
 		useExcludeSettings?: ExcludeSettingOptions;
 
 		/**
-		 * The maximum number of results to search for
+		 * The maximum number of results to search for. Defaults to 20000 results.
 		 */
 		maxResults?: number;
 
 		/**
-		 * Which file locations we should look for ignore (.gitignore or .ignore) files to respect.
+		 * Which file locations have ignore (`.gitignore` or `.ignore`) files to follow.
 		 *
-		 * When any of these fields are `undefined`, we will:
-		 * - assume the value if possible (e.g. if only one is valid)
-		 * or
-		 * - follow settings using the value for the corresponding `search.use*IgnoreFiles` settting.
+		 * When any of these fields are `undefined`, the value will either be assumed (e.g. if only one is valid),
+		 * or it will follow settings based on the corresponding `search.use*IgnoreFiles` setting.
 		 *
 		 * Will log an error if an invalid combination is set.
+		 *
+		 * Although `.ignore` files are uncommon, they can be leveraged if there are patterns
+		 * that should not be known to git, but should be known to the search providers.
+		 * They should be in the same locations where `.gitignore` files are found, and they follow the same format.
 		 */
 		useIgnoreFiles?: {
 			/**
@@ -67,9 +80,21 @@ declare module 'vscode' {
 		 * @example
 		 * findFiles(['**​/*.js'], {exclude: ['**​/out/**'], useIgnoreFiles: true, maxResults: 10})
 		 *
-		 * @param filePattern A {@link GlobPattern glob pattern} that defines the files to search for. The glob pattern
-		 * will be matched against the file paths of resulting matches relative to their workspace. Use a {@link RelativePattern relative pattern}
-		 * to restrict the search results to a {@link WorkspaceFolder workspace folder}.
+		 * @param filePattern An array of {@link GlobPattern GlobPattern} that defines the files to search for.
+		 * The glob patterns will be matched against the file paths of files relative to their workspace or {@link baseUri GlobPattern.baseUri} if applicable.
+		 * Use a {@link RelativePattern RelativePatten} to restrict the search results to a {@link WorkspaceFolder workspace folder}.
+		 *
+		 * If more than one value is used, the values are combined with a logical OR.
+		 *
+		 * For example, consider the following code:
+		 *
+		 * ```ts
+		 * const ab = findFiles(['*.ts', '*.js']);
+		 * const a = findFiles(['**​/*.ts']);
+		 * const b = findFiles(['**​/*.js']);
+		 * ```
+		 *
+		 * In this, `ab` will be the union of results from `a` and `b`.
 		 * @param options A set of {@link FindFiles2Options FindFiles2Options} that defines where and how to search (e.g. exclude settings).
 		 * @param token A token that can be used to signal cancellation to the underlying search engine.
 		 * @returns A thenable that resolves to an array of resource identifiers. Will return no results if no

package/vscode-dts/vscode.proposed.findTextInFilesNew.d.ts

@@ -9,15 +9,38 @@ declare module 'vscode' {
 
 	export interface FindTextInFilesOptionsNew {
 		/**
-		 * A {@link GlobPattern glob pattern} that defines the files to search for. The glob pattern
-		 * will be matched against the file paths of files relative to their workspace. Use a {@link RelativePattern relative pattern}
-		 * to restrict the search results to a {@link WorkspaceFolder workspace folder}.
+		 * An array of {@link GlobPattern GlobPattern} that defines the files to search for.
+		 * The glob patterns will be matched against the file paths of files relative to their workspace or {@link baseUri GlobPattern.baseUri} if applicable.
+		 * Use a {@link RelativePattern RelativePattern} to restrict the search results to a {@link WorkspaceFolder workspace folder}.
+		 *
+		 * If more than one value is used, the values are combined with a logical OR.
+		 *
+		 * For example, consider the following code:
+		 *
+		 * ```ts
+		 * const ab = findTextInFilesNew('foo', {include: ['*.ts', '*.js']});
+		 * const a = findTextInFilesNew('foo', {include: ['*.ts']});
+		 * const b = findTextInFilesNew('foo', {include: ['*.js']});
+		 * ```
+		 *
+		 * In this, `ab` will be the union of results from `a` and `b`.
 		 */
 		include?: GlobPattern[];
 
 		/**
-		 * A {@link GlobPattern glob pattern} that defines files and folders to exclude. The glob pattern
-		 * will be matched against the file paths of resulting matches relative to their workspace.
+		 * An array of {@link GlobPattern GlobPattern} that defines files to exclude.
+		 * The glob patterns will be matched against the file paths of files relative to their workspace or {@link RelativePattern.baseUri} if applicable.
+		 *
+		 * If more than one value is used, the values are combined with a logical AND.
+		 * For example, consider the following code:
+		 *
+		 * ```ts
+		 * const ab = findTextInFilesNew('foo', {exclude: ['*.ts', '*.js']});
+		 * const a = findTextInFilesNew('foo', {exclude: ['*.ts']});
+		 * const b = findTextInFilesNew('foo', {exclude: ['*.js']});
+		 * ```
+		 *
+		 * In this, `ab` will be the intersection of results from `a` and `b`.
 		 */
 		exclude?: GlobPattern[];
 
@@ -27,20 +50,21 @@ declare module 'vscode' {
 		useExcludeSettings?: ExcludeSettingOptions;
 
 		/**
-		 * The maximum number of results to search for
+		 * The maximum number of results to search for. Defaults to 20000 results.
 		 */
 		maxResults?: number;
 
-
 		/**
-		 * Which file locations we should look for ignore (.gitignore or .ignore) files to respect.
+		 * Which file locations have ignore (`.gitignore` or `.ignore`) files to follow.
 		 *
-		 * When any of these fields are `undefined`, we will:
-		 * - assume the value if possible (e.g. if only one is valid)
-		 * or
-		 * - follow settings using the value for the corresponding `search.use*IgnoreFiles` settting.
+		 * When any of these fields are `undefined`, the value will either be assumed (e.g. if only one is valid),
+		 * or it will follow settings based on the corresponding `search.use*IgnoreFiles` setting.
 		 *
 		 * Will log an error if an invalid combination is set.
+		 *
+		 * Although `.ignore` files are uncommon, they can be leveraged if there are patterns
+		 * that should not be known to git, but should be known to the search providers.
+		 * They should be in the same locations where `.gitignore` files are found, and they follow the same format.
 		 */
 		useIgnoreFiles?: {
 			/**
@@ -78,10 +102,10 @@ declare module 'vscode' {
 		 */
 		previewOptions?: {
 			/**
-			 * The maximum number of lines in the preview.
+			 * The maximum number of lines in the preview of the match itself (not including surrounding context lines).
 			 * Only search providers that support multiline search will ever return more than one line in the match.
 			 */
-			matchLines?: number;
+			numMatchLines?: number;
 
 			/**
 			 * The maximum number of characters included per line.
@@ -106,25 +130,22 @@ declare module 'vscode' {
 		complete: Thenable<TextSearchCompleteNew>;
 	}
 
-	/*
-	* Options for following search.exclude and files.exclude settings.
-	*/
+	/**
+	 * Options for following search.exclude and files.exclude settings.
+	 */
 	export enum ExcludeSettingOptions {
-		/*
+		/**
 		 * Don't use any exclude settings.
 		 */
-		none = 1,
-		/*
-		 * Use:
-		 * - files.exclude setting
+		None = 1,
+		/**
+		 * Use the `files.exclude` setting
 		 */
-		filesExclude = 2,
-		/*
-		 * Use:
-		 * - files.exclude setting
-		 * - search.exclude setting
+		FilesExclude = 2,
+		/**
+		 * Use the `files.exclude` and `search.exclude` settings
 		 */
-		searchAndFilesExclude = 3
+		SearchAndFilesExclude = 3
 	}
 
 	export namespace workspace {
@@ -133,8 +154,8 @@ declare module 'vscode' {
 		 *
 		 * Search text in files across all {@link workspace.workspaceFolders workspace folders} in the workspace.
 		 * @param query The query parameters for the search - the search string, whether it's case-sensitive, or a regex, or matches whole words.
-		 * @param options An optional set of query options. Include and exclude patterns, maxResults, etc.
-		 * @param callback A callback, called for each result
+		 * @param options An optional set of query options.
+		 * @param callback A callback, called for each {@link TextSearchResultNew result}. This can be a direct match, or context that surrounds a match.
 		 * @param token A token that can be used to signal cancellation to the underlying search engine.
 		 * @return A thenable that resolves when the search is complete.
 		 */

package/vscode-dts/vscode.proposed.interactive.d.ts

@@ -6,8 +6,6 @@
 declare module 'vscode' {
 
 	export namespace interactive {
-		// Can be deleted after another insiders
-		export const _version: number;
 		export function transferActiveChat(toWorkspace: Uri): void;
 	}
 }

package/vscode-dts/vscode.proposed.lmTools.d.ts

@@ -3,17 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// version: 2
+// version: 6
 // https://github.com/microsoft/vscode/issues/213274
 
 declare module 'vscode' {
 
 	// TODO@API capabilities
 
-	export type JSONSchema = object;
-
 	// API -> LM: an tool/function that is available to the language model
-	export interface LanguageModelChatFunction {
+	export interface LanguageModelChatTool {
+		// TODO@API should use "id" here to match vscode tools, or keep name to match OpenAI?
 		name: string;
 		description: string;
 		parametersSchema?: JSONSchema;
@@ -21,8 +20,8 @@ declare module 'vscode' {
 
 	// API -> LM: add tools as request option
 	export interface LanguageModelChatRequestOptions {
-		// TODO@API this will a heterogeneous array of different types of tools
-		tools?: LanguageModelChatFunction[];
+		// TODO@API this will be a heterogeneous array of different types of tools
+		tools?: LanguageModelChatTool[];
 
 		/**
 		 * Force a specific tool to be used.
@@ -31,11 +30,12 @@ declare module 'vscode' {
 	}
 
 	// LM -> USER: function that should be used
-	export class LanguageModelChatResponseFunctionUsePart {
+	export class LanguageModelChatResponseToolCallPart {
 		name: string;
+		toolCallId: string;
 		parameters: any;
 
-		constructor(name: string, parameters: any);
+		constructor(name: string, toolCallId: string, parameters: any);
 	}
 
 	// LM -> USER: text chunk
@@ -46,22 +46,41 @@ declare module 'vscode' {
 	}
 
 	export interface LanguageModelChatResponse {
-
-		stream: AsyncIterable<LanguageModelChatResponseTextPart | LanguageModelChatResponseFunctionUsePart>;
+		stream: AsyncIterable<LanguageModelChatResponseTextPart | LanguageModelChatResponseToolCallPart>;
 	}
 
 
 	// USER -> LM: the result of a function call
-	export class LanguageModelChatMessageFunctionResultPart {
-		name: string;
+	export class LanguageModelChatMessageToolResultPart {
+		toolCallId: string;
 		content: string;
 		isError: boolean;
 
-		constructor(name: string, content: string, isError?: boolean);
+		constructor(toolCallId: string, content: string, isError?: boolean);
 	}
 
 	export interface LanguageModelChatMessage {
-		content2: string | LanguageModelChatMessageFunctionResultPart;
+		/**
+		 * A heterogeneous array of other things that a message can contain as content.
+		 * Some parts would be message-type specific for some models and wouldn't go together,
+		 * but it's up to the chat provider to decide what to do about that.
+		 * Can drop parts that are not valid for the message type.
+		 * LanguageModelChatMessageToolResultPart: only on User messages
+		 * LanguageModelChatResponseToolCallPart: only on Assistant messages
+		 */
+		content2: (string | LanguageModelChatMessageToolResultPart | LanguageModelChatResponseToolCallPart)[];
+	}
+
+	export interface LanguageModelToolResult {
+		/**
+		 * The result can contain arbitrary representations of the content. An example might be a `PromptElementJSON` from `@vscode/prompt-tsx`, using the `contentType` exported by that library.
+		 */
+		[contentType: string]: any;
+
+		/**
+		 * A string representation of the result which can be incorporated back into an LLM prompt without any special handling.
+		 */
+		toString(): string;
 	}
 
 	// Tool registration/invoking between extensions
@@ -70,7 +89,7 @@ declare module 'vscode' {
 		/**
 		 * Register a LanguageModelTool. The tool must also be registered in the package.json `languageModelTools` contribution point.
 		 */
-		export function registerTool(name: string, tool: LanguageModelTool): Disposable;
+		export function registerTool(id: string, tool: LanguageModelTool): Disposable;
 
 		/**
 		 * A list of all available tools.
@@ -79,18 +98,98 @@ declare module 'vscode' {
 
 		/**
 		 * Invoke a tool with the given parameters.
+		 * TODO@API Could request a set of contentTypes to be returned so they don't all need to be computed?
 		 */
-		export function invokeTool(name: string, parameters: Object, token: CancellationToken): Thenable<string>;
+		export function invokeTool(id: string, options: LanguageModelToolInvocationOptions, token: CancellationToken): Thenable<LanguageModelToolResult>;
 	}
 
-	// Is the same as LanguageModelChatFunction now, but could have more details in the future
+	export interface LanguageModelToolInvocationOptions {
+		/**
+		 * Parameters with which to invoke the tool.
+		 */
+		parameters: Object;
+
+		/**
+		 * Options to hint at how many tokens the tool should return in its response.
+		 */
+		tokenOptions?: {
+			/**
+			 * If known, the maximum number of tokens the tool should emit in its result.
+			 */
+			tokenBudget: number;
+
+			/**
+			 * Count the number of tokens in a message using the model specific tokenizer-logic.
+			 * @param text A string.
+			 * @param token Optional cancellation token.  See {@link CancellationTokenSource} for how to create one.
+			 * @returns A thenable that resolves to the number of tokens.
+			 */
+			countTokens(text: string, token?: CancellationToken): Thenable<number>;
+		};
+	}
+
+	export type JSONSchema = object;
+
 	export interface LanguageModelToolDescription {
-		name: string;
-		description: string;
+		/**
+		 * A unique identifier for the tool.
+		 */
+		id: string;
+
+		/**
+		 * A human-readable name for this tool that may be used to describe it in the UI.
+		 */
+		displayName: string | undefined;
+
+		/**
+		 * A description of this tool that may be passed to a language model.
+		 */
+		modelDescription: string;
+
+		/**
+		 * A JSON schema for the parameters this tool accepts.
+		 */
 		parametersSchema?: JSONSchema;
 	}
 
 	export interface LanguageModelTool {
-		invoke(parameters: any, token: CancellationToken): Thenable<string>;
+		// TODO@API should it be LanguageModelToolResult | string?
+		invoke(options: LanguageModelToolInvocationOptions, token: CancellationToken): ProviderResult<LanguageModelToolResult>;
+	}
+
+	export interface ChatLanguageModelToolReference {
+		/**
+		 * The tool's ID. Refers to a tool listed in {@link lm.tools}.
+		 */
+		readonly id: string;
+
+		/**
+		 * The start and end index of the reference in the {@link ChatRequest.prompt prompt}. When undefined, the reference was not part of the prompt text.
+		 *
+		 * *Note* that the indices take the leading `#`-character into account which means they can
+		 * used to modify the prompt as-is.
+		 */
+		readonly range?: [start: number, end: number];
+	}
+
+	export interface ChatRequest {
+		/**
+		 * The list of tools that the user attached to their request.
+		 *
+		 * *Note* that if tools are referenced in the text of the prompt, using `#`, the prompt contains
+		 * references as authored and that it is up to the participant
+		 * to further modify the prompt, for instance by inlining reference values or creating links to
+		 * headings which contain the resolved values. References are sorted in reverse by their range
+		 * in the prompt. That means the last reference in the prompt is the first in this list. This simplifies
+		 * string-manipulation of the prompt.
+		 */
+		readonly toolReferences: readonly ChatLanguageModelToolReference[];
+	}
+
+	export interface ChatRequestTurn {
+		/**
+		 * The list of tools were attached to this request.
+		 */
+		readonly toolReferences?: readonly ChatLanguageModelToolReference[];
 	}
 }

package/vscode-dts/vscode.proposed.notebookReplDocument.d.ts

@@ -0,0 +1,20 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+declare module 'vscode' {
+
+	export interface NotebookDocumentShowOptions {
+		/**
+		 * The notebook should be opened in a REPL editor,
+		 * where the last cell of the notebook is an input box and the rest are read-only.
+		 */
+		readonly asRepl?: boolean;
+
+		/**
+		 * The label to be used for the editor tab.
+		 */
+		readonly label?: string;
+	}
+}

package/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts

@@ -35,6 +35,7 @@ declare module 'vscode' {
 
 	export interface SourceControlHistoryOptions {
 		readonly cursor?: string;
+		readonly skip?: number;
 		readonly limit?: number | { id?: string };
 		readonly historyItemGroupIds?: readonly string[];
 	}

package/vscode-dts/vscode.proposed.testObserver.d.ts

@@ -102,6 +102,12 @@ declare module 'vscode' {
 		 * were passed in the {@link tests.runTests} method.
 		 */
 		readonly results: ReadonlyArray<Readonly<TestResultSnapshot>>;
+
+		/**
+		 * Gets coverage information for a URI. This function is available only
+		 * when a test run reported coverage.
+		 */
+		getDetailedCoverage?(uri: Uri, token?: CancellationToken): Thenable<FileCoverageDetail[]>;
 	}
 
 	/**

package/vscode-dts/vscode.proposed.textSearchCompleteNew.d.ts

@@ -33,14 +33,6 @@ declare module 'vscode' {
 		/**
 		 * The message type, this affects how the message will be rendered.
 		 */
-		type: TextSearchCompleteMessageTypeNew;
-	}
-
-	/**
-	 * Represents the severity of a TextSearchComplete message.
-	 */
-	export enum TextSearchCompleteMessageTypeNew {
-		Information = 1,
-		Warning = 2,
+		type: TextSearchCompleteMessageType;
 	}
 }

package/vscode-dts/vscode.proposed.textSearchProviderNew.d.ts

@@ -8,31 +8,47 @@ declare module 'vscode' {
 	// https://github.com/microsoft/vscode/issues/59921
 
 	/**
-	 * The parameters of a query for text search.
+	 * The parameters of a query for text search. All optional booleans default to `false`.
 	 */
 	export interface TextSearchQueryNew {
 		/**
 		 * The text pattern to search for.
+		 *
+		 * If explicitly contains a newline character (`\n`), the default search behavior
+		 * will automatically enable {@link isMultiline}.
 		 */
 		pattern: string;
 
 		/**
 		 * Whether or not `pattern` should match multiple lines of text.
+		 *
+		 * If using the default search provider, this will be interpreted as `true` if
+		 * `pattern` contains a newline character (`\n`).
 		 */
 		isMultiline?: boolean;
 
 		/**
 		 * Whether or not `pattern` should be interpreted as a regular expression.
+		 *
+		 * If using the default search provider, this will be interpreted case-insensitively
+		 * if {@link isCaseSensitive} is `false` or not set.
 		 */
 		isRegExp?: boolean;
 
 		/**
 		 * Whether or not the search should be case-sensitive.
+		 *
+		 * If using the default search provider, this can be affected by the `search.smartCase` setting.
+		 * See the setting description for more information.
 		 */
 		isCaseSensitive?: boolean;
 
 		/**
 		 * Whether or not to search for whole word matches only.
+		 *
+		 * If enabled, the default search provider will check for boundary characters
+		 * (regex pattern `\b`) surrounding the {@link pattern} to see whether something
+		 * is a word match.
 		 */
 		isWordMatch?: boolean;
 	}
@@ -40,7 +56,7 @@ declare module 'vscode' {
 	/**
 	 * Options that apply to text search.
 	 */
-	export interface TextSearchProviderOptionsNew {
+	export interface TextSearchProviderOptions {
 
 		folderOptions: {
 			/**
@@ -73,14 +89,20 @@ declare module 'vscode' {
 				 */
 				local: boolean;
 				/**
-				 * Use ignore files at the parent directory. If set, {@link TextSearchProviderOptionsNew.useIgnoreFiles.local} should also be `true`.
+				 * Use ignore files at the parent directory. If set, {@link TextSearchProviderOptions.useIgnoreFiles.local} should also be `true`.
 				 */
 				parent: boolean;
 				/**
-				 * Use global ignore files. If set, {@link TextSearchProviderOptionsNew.useIgnoreFiles.local} should also be `true`.
+				 * Use global ignore files. If set, {@link TextSearchProviderOptions.useIgnoreFiles.local} should also be `true`.
 				 */
 				global: boolean;
 			};
+
+			/**
+			 * Interpret files using this encoding.
+			 * See the vscode setting `"files.encoding"`
+			 */
+			encoding: string;
 		}[];
 
 		/**
@@ -109,13 +131,7 @@ declare module 'vscode' {
 		/**
 		 * Exclude files larger than `maxFileSize` in bytes.
 		 */
-		maxFileSize: number;
-
-		/**
-		 * Interpret files using this encoding.
-		 * See the vscode setting `"files.encoding"`
-		 */
-		encoding: string;
+		maxFileSize: number | undefined;
 
 		/**
 		 * Number of lines of context to include before and after each match.
@@ -129,7 +145,7 @@ declare module 'vscode' {
 	export interface TextSearchCompleteNew {
 		/**
 		 * Whether the search hit the limit on the maximum number of search results.
-		 * `maxResults` on {@linkcode TextSearchProviderOptionsNew} specifies the max number of results.
+		 * `maxResults` on {@linkcode TextSearchProviderOptions} specifies the max number of results.
 		 * - If exactly that number of matches exist, this should be false.
 		 * - If `maxResults` matches are returned and more exist, this should be true.
 		 * - If search hits an internal limit which is less than `maxResults`, this should be true.
@@ -138,7 +154,17 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * The main match information for a {@link TextSearchResultNew}.
+	 * A query match instance in a file.
+	 *
+	 * For example, consider this excerpt:
+	 *
+	 * ```ts
+	 * const bar = 1;
+	 * console.log(bar);
+	 * const foo = bar;
+	 * ```
+	 *
+	 * If the query is `log`, then the line `console.log(bar);` should be represented using a {@link TextSearchMatchNew}.
 	 */
 	export class TextSearchMatchNew {
 		/**
@@ -171,7 +197,20 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * The potential context information for a {@link TextSearchResultNew}.
+	 * The context lines of text that are not a part of a match,
+	 * but that surround a match line of type {@link TextSearchMatchNew}.
+	 *
+	 * For example, consider this excerpt:
+	 *
+	 * ```ts
+	 * const bar = 1;
+	 * console.log(bar);
+	 * const foo = bar;
+	 * ```
+	 *
+	 * If the query is `log`, then the lines `const bar = 1;` and `const foo = bar;`
+	 * should be represented using two separate {@link TextSearchContextNew} for the search instance.
+	 * This example assumes that the finder requests one line of surrounding context.
 	 */
 	export class TextSearchContextNew {
 		/**
@@ -199,7 +238,8 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * A result payload for a text search, pertaining to matches within a single file.
+	 * A result payload for a text search, pertaining to {@link TextSearchMatchNew matches}
+	 * and its associated {@link TextSearchContextNew context} within a single file.
 	 */
 	export type TextSearchResultNew = TextSearchMatchNew | TextSearchContextNew;
 
@@ -213,10 +253,11 @@ declare module 'vscode' {
 		 * Provide results that match the given text pattern.
 		 * @param query The parameters for this query.
 		 * @param options A set of options to consider while searching.
-		 * @param progress A progress callback that must be invoked for all results.
+		 * @param progress A progress callback that must be invoked for all {@link TextSearchResultNew results}.
+		 * These results can be direct matches, or context that surrounds matches.
 		 * @param token A cancellation token.
 		 */
-		provideTextSearchResults(query: TextSearchQueryNew, options: TextSearchProviderOptionsNew, progress: Progress<TextSearchResultNew>, token: CancellationToken): ProviderResult<TextSearchCompleteNew>;
+		provideTextSearchResults(query: TextSearchQueryNew, options: TextSearchProviderOptions, progress: Progress<TextSearchResultNew>, token: CancellationToken): ProviderResult<TextSearchCompleteNew>;
 	}
 
 	export namespace workspace {

package/workers/editor.worker.js

@@ -1 +1 @@
-export { initialize } from '../vscode/src/vs/editor/editor.worker.js';
+export { bootstrapSimpleEditorWorker, initialize } from '../vscode/src/vs/editor/common/services/editorWorkerBootstrap.js';

package/workers/extensionHost.worker.js

@@ -1,3 +1 @@
-import { create } from '../vscode/src/vs/workbench/api/worker/extensionHostWorker.js';
-const messageHandler = create();
-globalThis.onmessage = (e) => messageHandler.onmessage(e.data);
+import '../vscode/src/vs/workbench/api/worker/extensionHostWorker.esm.js';