fix microsoft#184620

Author: meganrogge

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

@@ -24,13 +24,18 @@ 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 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); }
+
 	private readonly _computer: ContentHoverComputer;
 	private readonly _hoverOperation: HoverOperation<IHoverPart>;
 

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

@@ -40,6 +40,9 @@ export class ModesHoverController implements IEditorContribution {
 	private readonly _didChangeConfigurationHandler: IDisposable;
 
 	private _contentWidget: ContentHoverController | null;
+
+	getWidgetContents(): string | undefined { return this._contentWidget?.getWidgetContents(); }
+
 	private _glyphWidget: MarginHoverWidget | null;
 
 	private _isMouseDown: boolean;
@@ -48,6 +51,7 @@ export class ModesHoverController implements IEditorContribution {
 	private _isHoverSticky!: boolean;
 	private _hoverActivatedByColorDecoratorClick: boolean = false;
 
+
 	static get(editor: ICodeEditor): ModesHoverController | null {
 		return editor.getContribution<ModesHoverController>(ModesHoverController.ID);
 	}

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

@@ -13,7 +13,7 @@ import { localize } from 'vs/nls';
 import { AccessibilitySupport } from 'vs/platform/accessibility/common/accessibility';
 import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IKeybindingService, IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
-import { AccessibilityHelpAction, registerAccessibilityConfiguration } from 'vs/workbench/contrib/accessibility/browser/accessibilityContribution';
+import { AccessibilityHelpAction, AccessibilityViewAction, registerAccessibilityConfiguration } from 'vs/workbench/contrib/accessibility/browser/accessibilityContribution';
 import { AccessibleViewService, IAccessibleContentProvider, IAccessibleViewOptions, IAccessibleViewService } from 'vs/workbench/contrib/accessibility/browser/accessibleView';
 import * as strings from 'vs/base/common/strings';
 import * as platform from 'vs/base/common/platform';
@@ -26,6 +26,8 @@ import { NEW_UNTITLED_FILE_COMMAND_ID } from 'vs/workbench/contrib/files/browser
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { URI } from 'vs/base/common/uri';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { ModesHoverController } from 'vs/editor/contrib/hover/browser/hover';
+import { withNullAsUndefined } from 'vs/base/common/types';
 
 registerAccessibilityConfiguration();
 registerSingleton(IAccessibleViewService, AccessibleViewService, InstantiationType.Delayed);
@@ -134,3 +136,44 @@ const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(Workbench
 workbenchRegistry.registerWorkbenchContribution(EditorAccessibilityHelpContribution, LifecyclePhase.Eventually);
 
 
+
+class HoverAccessibileViewContribution extends Disposable {
+	static ID: 'hoverAccessibleViewContribution';
+	constructor() {
+		super();
+		this._register(AccessibilityViewAction.addImplementation(105, 'hover', accessor => {
+			const accessibleViewService = accessor.get(IAccessibleViewService);
+			const codeEditorService = accessor.get(ICodeEditorService);
+			const editor = codeEditorService.getActiveCodeEditor() || codeEditorService.getFocusedCodeEditor();
+			if (!editor) {
+				return false;
+			}
+			const controller = ModesHoverController.get(editor);
+			const hoverContent = withNullAsUndefined(controller?.getWidgetContents());
+			if (!controller || !hoverContent) {
+				return false;
+			}
+			function provideContent(): string {
+				return hoverContent!;
+			}
+			const provider = accessibleViewService.registerProvider({
+				id: 'hover',
+				provideContent,
+				onClose() {
+					provider.dispose();
+					controller.focus();
+				},
+				onKeyDown(e: IKeyboardEvent) {
+
+				},
+				options: { ariaLabel: localize('hoverAccessibleView', "Hover Accessible View") }
+			});
+			accessibleViewService.show('hover');
+			return true;
+		}));
+	}
+}
+
+const workbenchContributionsRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
+workbenchContributionsRegistry.registerWorkbenchContribution(HoverAccessibileViewContribution, LifecyclePhase.Eventually);
+

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

@@ -21,6 +21,10 @@ import { SelectionClipboardContributionID } from 'vs/workbench/contrib/codeEdito
 import { getSimpleEditorOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
 import { IDisposable } from 'xterm';
 
+const enum DIMENSION_DEFAULT {
+	WIDTH = .4,
+	HEIGHT = .2
+}
 
 export interface IAccessibleContentProvider {
 	id: string;
@@ -92,7 +96,7 @@ class AccessibleView extends Disposable {
 
 	private _render(provider: IAccessibleContentProvider, container: HTMLElement): IDisposable {
 
-		const fragment = localize('exit-tip', 'Exit this menu via the Escape key.\n') + provider.provideContent();
+		const fragment = provider.provideContent() + localize('exit-tip', 'Exit this menu via the Escape key.\n');
 
 		this._getTextModel(URI.from({ path: `accessible-view-${provider.id}`, scheme: 'accessible-view', fragment })).then((model) => {
 			if (!model) {
@@ -124,8 +128,8 @@ class AccessibleView extends Disposable {
 		const windowWidth = window.innerWidth;
 		const windowHeight = window.innerHeight;
 
-		const width = windowWidth * .4;
-		const height = Math.min(.4 * windowHeight, this._editorWidget.getContentHeight());
+		const width = windowWidth * DIMENSION_DEFAULT.WIDTH;
+		const height = Math.min(windowHeight * DIMENSION_DEFAULT.HEIGHT, this._editorWidget.getContentHeight());
 		this._editorWidget.layout({ width, height });
 		const top = Math.round((windowHeight - height) / 2);
 		this._editorContainer.style.top = `${top}px`;