Revert proposals

Author: alexr00

src/@types/vscode.proposed.chatContextProvider.d.ts

@@ -11,45 +11,16 @@ declare module 'vscode' {
 	export namespace chat {
 
 		/**
-		 * Register a chat workspace context provider. Workspace context is automatically included in all chat requests.
+		 * Register a chat context provider. Chat context can be provided:
+		 * - For a resource. Make sure to pass a selector that matches the resource you want to provide context for.
+		 *   Providers registered without a selector will not be called for resource-based context.
+		 * - Explicitly. These context items are shown as options when the user explicitly attaches context.
 		 *
 		 * To ensure your extension is activated when chat context is requested, make sure to include the following activations events:
 		 * - If your extension implements `provideWorkspaceChatContext` or `provideChatContextForResource`, find an activation event which is a good signal to activate.
 		 *   Ex: `onLanguage:<languageId>`, `onWebviewPanel:<viewType>`, etc.`
 		 * - If your extension implements `provideChatContextExplicit`, your extension will be automatically activated when the user requests explicit context.
 		 *
-		 * @param id Unique identifier for the provider.
-		* @param provider The chat workspace context provider.
-		*/
-		export function registerChatWorkspaceContextProvider(id: string, provider: ChatWorkspaceContextProvider): Disposable;
-
-		/**
-		 * Register a chat explicit context provider. Explicit context items are shown as options when the user explicitly attaches context.
-		 *
-		 * To ensure your extension is activated when chat context is requested, make sure to include the `onChatContextProvider:<id>` activation event in your `package.json`.
-		 *
-		 * @param id Unique identifier for the provider.
-		 * @param provider The chat explicit context provider.
-		 */
-		export function registerChatExplicitContextProvider(id: string, provider: ChatExplicitContextProvider): Disposable;
-
-		/**
-		 * Register a chat resource context provider. Resource context is provided for a specific resource.
-		 * Make sure to pass a selector that matches the resource you want to provide context for.
-		 *
-		 * To ensure your extension is activated when chat context is requested, make sure to include the `onChatContextProvider:<id>` activation event in your `package.json`.
-		 *
-		 * @param selector Document selector to filter which resources the provider is called for.
-		 * @param id Unique identifier for the provider.
-		 * @param provider The chat resource context provider.
-		 */
-		export function registerChatResourceContextProvider(selector: DocumentSelector, id: string, provider: ChatResourceContextProvider): Disposable;
-
-		/**
-		 * Register a chat context provider.
-		 *
-		 * @deprecated Use {@link registerChatWorkspaceContextProvider}, {@link registerChatExplicitContextProvider}, or {@link registerChatResourceContextProvider} instead.
-		 *
 		 * @param selector Optional document selector to filter which resources the provider is called for. If omitted, the provider will only be called for explicit context requests.
 		 * @param id Unique identifier for the provider.
 		 * @param provider The chat context provider.
@@ -61,21 +32,12 @@ declare module 'vscode' {
 	export interface ChatContextItem {
 		/**
 		 * Icon for the context item.
-		 * - If `icon` is not defined, no icon is shown.
-		 * - If `icon` is defined and is a file or folder icon, the icon is derived from {@link resourceUri} if `resourceUri` is defined.
-		 * - Otherwise, `icon` is used.
 		 */
-		icon?: ThemeIcon;
+		icon: ThemeIcon;
 		/**
 		 * Human readable label for the context item.
-		 * If not set, the label is derived from {@link resourceUri}.
-		 */
-		label?: string;
-		/**
-		 * A resource URI for the context item.
-		 * Used to derive the {@link label} and {@link icon} if they are not set.
 		 */
-		resourceUri?: Uri;
+		label: string;
 		/**
 		 * An optional description of the context item, e.g. to describe the item to the language model.
 		 */
@@ -95,24 +57,23 @@ declare module 'vscode' {
 		command?: Command;
 	}
 
-	export interface ChatWorkspaceContextProvider<T extends ChatContextItem = ChatContextItem> {
+	export interface ChatContextProvider<T extends ChatContextItem = ChatContextItem> {
 
 		/**
 		 * An optional event that should be fired when the workspace chat context has changed.
 		 */
 		onDidChangeWorkspaceChatContext?: Event<void>;
 
 		/**
+		 * TODO @API: should this be a separate provider interface?
+		 *
 		 * Provide a list of chat context items to be included as workspace context for all chat requests.
 		 * This should be used very sparingly to avoid providing useless context and to avoid using up the context window.
 		 * A good example use case is to provide information about which branch the user is working on in a source control context.
 		 *
 		 * @param token A cancellation token.
 		 */
-		provideChatContext(token: CancellationToken): ProviderResult<T[]>;
-	}
-
-	export interface ChatExplicitContextProvider<T extends ChatContextItem = ChatContextItem> {
+		provideWorkspaceChatContext?(token: CancellationToken): ProviderResult<T[]>;
 
 		/**
 		 * Provide a list of chat context items that a user can choose from. These context items are shown as options when the user explicitly attaches context.
@@ -121,18 +82,7 @@ declare module 'vscode' {
 		 *
 		 * @param token A cancellation token.
 		 */
-		provideChatContext(token: CancellationToken): ProviderResult<T[]>;
-
-		/**
-		 * If a chat context item is provided without a `value`, this method is called to resolve the `value` for the item.
-		 *
-		 * @param context The context item to resolve.
-		 * @param token A cancellation token.
-		 */
-		resolveChatContext(context: T, token: CancellationToken): ProviderResult<ChatContextItem>;
-	}
-
-	export interface ChatResourceContextProvider<T extends ChatContextItem = ChatContextItem> {
+		provideChatContextExplicit?(token: CancellationToken): ProviderResult<T[]>;
 
 		/**
 		 * Given a particular resource, provide a chat context item for it. This is used for implicit context (see the settings `chat.implicitContext.enabled` and `chat.implicitContext.suggestedContext`).
@@ -144,51 +94,15 @@ declare module 'vscode' {
 		 * @param options Options include the resource for which to provide context.
 		 * @param token A cancellation token.
 		 */
-		provideChatContext(options: { resource: Uri }, token: CancellationToken): ProviderResult<T | undefined>;
+		provideChatContextForResource?(options: { resource: Uri }, token: CancellationToken): ProviderResult<T | undefined>;
 
 		/**
-		 * If a chat context item is provided without a `value`, this method is called to resolve the `value` for the item.
+		 * If a chat context item is provided without a `value`, from either of the `provide` methods, this method is called to resolve the `value` for the item.
 		 *
 		 * @param context The context item to resolve.
 		 * @param token A cancellation token.
 		 */
 		resolveChatContext(context: T, token: CancellationToken): ProviderResult<ChatContextItem>;
 	}
 
-	/**
-	 * @deprecated Use {@link ChatWorkspaceContextProvider}, {@link ChatExplicitContextProvider}, or {@link ChatResourceContextProvider} instead.
-	 */
-	export interface ChatContextProvider<T extends ChatContextItem = ChatContextItem> {
-
-		/**
-		 * An optional event that should be fired when the workspace chat context has changed.
-		 * @deprecated Use {@link ChatWorkspaceContextProvider.onDidChangeWorkspaceChatContext} instead.
-		 */
-		onDidChangeWorkspaceChatContext?: Event<void>;
-
-		/**
-		 * Provide a list of chat context items to be included as workspace context for all chat requests.
-		 * @deprecated Use {@link ChatWorkspaceContextProvider.provideChatContext} instead.
-		 */
-		provideWorkspaceChatContext?(token: CancellationToken): ProviderResult<T[]>;
-
-		/**
-		 * Provide a list of chat context items that a user can choose from.
-		 * @deprecated Use {@link ChatExplicitContextProvider.provideChatContext} instead.
-		 */
-		provideChatContextExplicit?(token: CancellationToken): ProviderResult<T[]>;
-
-		/**
-		 * Given a particular resource, provide a chat context item for it.
-		 * @deprecated Use {@link ChatResourceContextProvider.provideChatContext} instead.
-		 */
-		provideChatContextForResource?(options: { resource: Uri }, token: CancellationToken): ProviderResult<T | undefined>;
-
-		/**
-		 * If a chat context item is provided without a `value`, this method is called to resolve the `value` for the item.
-		 * @deprecated Use the `resolveChatContext` method on the specific provider type instead.
-		 */
-		resolveChatContext?(context: T, token: CancellationToken): ProviderResult<ChatContextItem>;
-	}
-
 }