allow passing in info

Author: meganrogge

src/vs/editor/contrib/hover/browser/contentHover.ts

@@ -24,17 +24,26 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { Context as SuggestContext } from 'vs/editor/contrib/suggest/browser/suggest';
 import { AsyncIterableObject } from 'vs/base/common/async';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { withNullAsUndefined } from 'vs/base/common/types';
 
 const $ = dom.$;
 
+export interface IHoverElementInfo {
+	dimensions?: { width: number; height: number }; content?: string;
+}
+
 export class ContentHoverController extends Disposable {
 
 	private readonly _participants: IEditorHoverParticipant[];
 
 	private readonly _widget = this._register(this._instantiationService.createInstance(ContentHoverWidget, this._editor));
 
-	getWidgetContents(): string | undefined { return withNullAsUndefined(this._widget.getDomNode()?.textContent); }
+	getWidgetInfo(): IHoverElementInfo | undefined {
+		const node = this._widget.getDomNode();
+		if (!node.textContent) {
+			return undefined;
+		}
+		return { content: node.textContent, dimensions: { width: node.clientWidth, height: node.clientHeight } };
+	}
 
 	private readonly _computer: ContentHoverComputer;
 	private readonly _hoverOperation: HoverOperation<IHoverPart>;

src/vs/editor/contrib/hover/browser/hover.ts

@@ -15,7 +15,7 @@ import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { ILanguageService } from 'vs/editor/common/languages/language';
 import { GotoDefinitionAtPositionEditorContribution } from 'vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition';
 import { HoverStartMode, HoverStartSource } from 'vs/editor/contrib/hover/browser/hoverOperation';
-import { ContentHoverWidget, ContentHoverController } from 'vs/editor/contrib/hover/browser/contentHover';
+import { ContentHoverWidget, ContentHoverController, IHoverElementInfo } from 'vs/editor/contrib/hover/browser/contentHover';
 import { MarginHoverWidget } from 'vs/editor/contrib/hover/browser/marginHover';
 import * as nls from 'vs/nls';
 import { AccessibilitySupport } from 'vs/platform/accessibility/common/accessibility';
@@ -41,7 +41,7 @@ export class ModesHoverController implements IEditorContribution {
 
 	private _contentWidget: ContentHoverController | null;
 
-	getWidgetContents(): string | undefined { return this._contentWidget?.getWidgetContents(); }
+	getWidgetInfo(): IHoverElementInfo | undefined { return this._contentWidget?.getWidgetInfo(); }
 
 	private _glyphWidget: MarginHoverWidget | null;
 

src/vs/workbench/contrib/accessibility/browser/accessibility.contribution.ts

@@ -138,12 +138,12 @@ class HoverAccessibileViewContribution extends Disposable {
 				return false;
 			}
 			const controller = ModesHoverController.get(editor);
-			const hoverContent = withNullAsUndefined(controller?.getWidgetContents());
-			if (!controller || !hoverContent) {
+			const hoverInfo = withNullAsUndefined(controller?.getWidgetInfo());
+			if (!controller || !hoverInfo?.content) {
 				return false;
 			}
 			function provideContent(): string {
-				return hoverContent!;
+				return hoverInfo?.content!;
 			}
 			const provider = accessibleViewService.registerProvider({
 				id: 'hover',
@@ -152,7 +152,9 @@ class HoverAccessibileViewContribution extends Disposable {
 					provider.dispose();
 					controller.focus();
 				},
-				options: { ariaLabel: localize('hoverAccessibleView', "Hover Accessible View"), language: 'typescript', type: AccessibleViewType.View }
+				options: {
+					ariaLabel: localize('hoverAccessibleView', "Hover Accessible View"), language: 'typescript', type: AccessibleViewType.View, dimensions: controller.getWidgetInfo()!.dimensions
+				}
 			});
 			accessibleViewService.show('hover');
 			return true;

src/vs/workbench/contrib/accessibility/browser/accessibleView.ts

@@ -54,6 +54,7 @@ export interface IAccessibleViewOptions {
 	readMoreUrl?: string;
 	language?: string;
 	type: AccessibleViewType;
+	dimensions?: { width: number; height: number };
 }
 
 class AccessibleView extends Disposable {
@@ -139,17 +140,17 @@ class AccessibleView extends Disposable {
 				provider.onKeyDown?.(e);
 			}));
 			this._register(this._editorWidget.onDidBlurEditorText(() => this._contextViewService.hideContextView()));
-			this._register(this._editorWidget.onDidContentSizeChange(() => this._layout()));
+			this._register(this._editorWidget.onDidContentSizeChange(() => this._layout(provider)));
 			this._editorWidget.updateOptions({ ariaLabel: provider.options.ariaLabel });
 			this._editorWidget.focus();
 		});
 		return toDisposable(() => provider.onClose());
 	}
 
-	private _layout(): void {
+	private _layout(provider: IAccessibleContentProvider): void {
 		const windowWidth = window.innerWidth;
-		const width = windowWidth * DIMENSION_DEFAULT.WIDTH;
-		this._editorWidget.layout({ width, height: this._editorWidget.getContentHeight() });
+		const width = provider.options.dimensions?.width || windowWidth * DIMENSION_DEFAULT.WIDTH;
+		this._editorWidget.layout({ width, height: provider.options.dimensions?.height || this._editorWidget.getContentHeight() });
 		const left = Math.round((windowWidth - width) / 2);
 		this._editorContainer.style.left = `${left}px`;
 	}