fix some issues

Author: meganrogge

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

@@ -27,22 +27,18 @@ import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 
 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));
 
-	getWidgetInfo(): IHoverElementInfo | undefined {
+	getWidgetContent(): string | undefined {
 		const node = this._widget.getDomNode();
 		if (!node.textContent) {
 			return undefined;
 		}
-		return { content: node.textContent, dimensions: { width: node.clientWidth, height: node.clientHeight } };
+		return node.textContent;
 	}
 
 	private readonly _computer: ContentHoverComputer;

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, IHoverElementInfo } from 'vs/editor/contrib/hover/browser/contentHover';
+import { ContentHoverWidget, ContentHoverController } 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;
 
-	getWidgetInfo(): IHoverElementInfo | undefined { return this._contentWidget?.getWidgetInfo(); }
+	getWidgetContent(): string | undefined { return this._contentWidget?.getWidgetContent(); }
 
 	private _glyphWidget: MarginHoverWidget | null;
 

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

@@ -137,22 +137,19 @@ class HoverAccessibleViewContribution extends Disposable {
 				return false;
 			}
 			const controller = ModesHoverController.get(editor);
-			const hoverInfo = withNullAsUndefined(controller?.getWidgetInfo());
-			if (!controller || !hoverInfo?.content) {
+			const content = withNullAsUndefined(controller?.getWidgetContent());
+			if (!controller || !content) {
 				return false;
 			}
-			function provideContent(): string {
-				return hoverInfo?.content!;
-			}
 			const provider = accessibleViewService.registerProvider({
 				id: 'hover',
-				provideContent,
+				provideContent() { return content; },
 				onClose() {
 					provider.dispose();
 					controller.focus();
 				},
 				options: {
-					ariaLabel: localize('hoverAccessibleView', "Hover Accessible View"), language: 'typescript', type: AccessibleViewType.View, dimensions: controller.getWidgetInfo()!.dimensions
+					ariaLabel: localize('hoverAccessibleView', "Hover Accessible View"), language: 'typescript', type: AccessibleViewType.View
 				}
 			});
 			accessibleViewService.show('hover');

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

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

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

@@ -41,6 +41,7 @@ import { AccessibilityViewAction } from 'vs/workbench/contrib/accessibility/brow
 import { AccessibleViewType, IAccessibleViewService } from 'vs/workbench/contrib/accessibility/browser/accessibleView';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { IChatResponseViewModel, isResponseVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
+import { CONTEXT_IN_CHAT_SESSION } from 'vs/workbench/contrib/chat/common/chatContextKeys';
 
 // Register configuration
 const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
@@ -157,7 +158,7 @@ class ChatAccessibleViewContribution extends Disposable {
 			});
 			accessibleViewService.show('panelChat');
 			return true;
-		}));
+		}, CONTEXT_IN_CHAT_SESSION));
 	}
 }