finalize debug hover API; fixes #89084

src/vs/vscode.d.ts

@@ -2465,6 +2465,53 @@ declare module 'vscode' {
 		provideHover(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Hover>;
 	}
 
+	/**
+	 * An EvaluatableExpression represents an expression in a document that can be evaluated by an active debugger or runtime.
+	 * The result of this evaluation is shown in a tooltip-like widget.
+	 * If only a range is specified, the expression will be extracted from the underlying document.
+	 * An optional expression can be used to override the extracted expression.
+	 * In this case the range is still used to highlight the range in the document.
+	 */
+	export class EvaluatableExpression {
+
+		/*
+		 * The range is used to extract the evaluatable expression from the underlying document and to highlight it.
+		 */
+		readonly range: Range;
+
+		/*
+		 * If specified the expression overrides the extracted expression.
+		 */
+		readonly expression?: string;
+
+		/**
+		 * Creates a new evaluatable expression object.
+		 *
+		 * @param range The range in the underlying document from which the evaluatable expression is extracted.
+		 * @param expression If specified overrides the extracted expression.
+		 */
+		constructor(range: Range, expression?: string);
+	}
+
+	/**
+	 * The evaluatable expression provider interface defines the contract between extensions and
+	 * the debug hover.
+	 */
+	export interface EvaluatableExpressionProvider {
+
+		/**
+		 * Provide an evaluatable expression for the given document and position.
+		 * The expression can be implicitly specified by the range in the underlying document or by explicitly returning an expression.
+		 *
+		 * @param document The document in which the debug hover is opened.
+		 * @param position The position in the document where the debug hover is opened.
+		 * @param token A cancellation token.
+		 * @return An EvaluatableExpression or a thenable that resolves to such. The lack of a result can be
+		 * signaled by returning `undefined` or `null`.
+		 */
+		provideEvaluatableExpression(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<EvaluatableExpression>;
+	}
+
 	/**
 	 * A document highlight kind.
 	 */
@@ -9080,6 +9127,17 @@ declare module 'vscode' {
 		 */
 		export function registerHoverProvider(selector: DocumentSelector, provider: HoverProvider): Disposable;
 
+		/**
+		 * Register a provider that locates evaluatable expressions in text documents.
+		 *
+		 * If multiple providers are registered for a language an arbitrary provider will be used.
+		 *
+		 * @param selector A selector that defines the documents this provider is applicable to.
+		 * @param provider An evaluatable expression provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerEvaluatableExpressionProvider(selector: DocumentSelector, provider: EvaluatableExpressionProvider): Disposable;
+
 		/**
 		 * Register a document highlight provider.
 		 *

src/vs/vscode.proposed.d.ts

@@ -876,67 +876,7 @@ declare module 'vscode' {
 
 	//#endregion
 
-	//#region locate evaluatable expressions for debug hover: https://github.com/microsoft/vscode/issues/89084
-
-	/**
-	* An EvaluatableExpression represents an expression in a document that can be evaluated by an active debugger or runtime.
-	* The result of this evaluation is shown in a tooltip-like widget.
-	* If only a range is specified, the expression will be extracted from the underlying document.
-	* An optional expression can be used to override the extracted expression.
-	* In this case the range is still used to highlight the range in the document.
-	*/
-	export class EvaluatableExpression {
-		/*
-		 * The range is used to extract the evaluatable expression from the underlying document and to highlight it.
-		 */
-		readonly range: Range;
-		/*
-		 * If specified the expression overrides the extracted expression.
-		 */
-		readonly expression?: string;
-
-		/**
-		 * Creates a new evaluatable expression object.
-		 *
-		 * @param range The range in the underlying document from which the evaluatable expression is extracted.
-		 * @param expression If specified overrides the extracted expression.
-		 */
-		constructor(range: Range, expression?: string);
-	}
-
-	/**
-	 * The evaluatable expression provider interface defines the contract between extensions and
-	 * the debug hover.
-	 */
-	export interface EvaluatableExpressionProvider {
-
-		/**
-		 * Provide an evaluatable expression for the given document and position.
-		 * The expression can be implicitly specified by the range in the underlying document or by explicitly returning an expression.
-		 *
-		 * @param document The document in which the debug hover is opened.
-		 * @param position The position in the document where the debug hover is opened.
-		 * @param token A cancellation token.
-		 * @return An EvaluatableExpression or a thenable that resolves to such. The lack of a result can be
-		 * signaled by returning `undefined` or `null`.
-		 */
-		provideEvaluatableExpression(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<EvaluatableExpression>;
-	}
-
-	export namespace languages {
-		/**
-		 * Register a provider that locates evaluatable expressions in text documents.
-		 *
-		 * If multiple providers are registered for a language an arbitrary provider will be used.
-		 *
-		 * @param selector A selector that defines the documents this provider is applicable to.
-		 * @param provider An evaluatable expression provider.
-		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
-		 */
-		export function registerEvaluatableExpressionProvider(selector: DocumentSelector, provider: EvaluatableExpressionProvider): Disposable;
-	}
-
-	// deprecated
+	//#region deprecated debug API
 
 	export interface DebugConfigurationProvider {
 		/**