fix part of microsoft#188822

Author: meganrogge

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

@@ -114,14 +114,16 @@ class HoverAccessibleViewContribution extends Disposable {
 			const codeEditorService = accessor.get(ICodeEditorService);
 			const editor = codeEditorService.getActiveCodeEditor() || codeEditorService.getFocusedCodeEditor();
 			const editorHoverContent = editor ? ModesHoverController.get(editor)?.getWidgetContent() ?? undefined : undefined;
-			if (!editorHoverContent) {
+			if (!editor || !editorHoverContent) {
 				return false;
 			}
 			this._options.language = editor?.getModel()?.getLanguageId() ?? undefined;
 			accessibleViewService.show({
 				verbositySettingKey: AccessibilityVerbositySettingId.Hover,
 				provideContent() { return editorHoverContent; },
-				onClose() { },
+				onClose() {
+					ModesHoverController.get(editor)?.focus();
+				},
 				options: this._options
 			});
 			return true;

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

@@ -211,7 +211,6 @@ class AccessibleView extends Disposable {
 				this._configurationService.updateValue(settingKey, false);
 			}
 			provider.onKeyDown?.(e);
-			// e.stopPropagation();
 		}));
 		disposableStore.add(this._editorWidget.onKeyDown((e) => {
 			if (e.keyCode === KeyCode.Escape) {

src/vs/workbench/services/hover/browser/hoverService.ts

@@ -145,6 +145,8 @@ function getHoverOptionsIdentity(options: IHoverOptions | undefined): IHoverOpti
 
 class HoverContextViewDelegate implements IDelegate {
 
+	container: HTMLElement | undefined;
+
 	get anchorPosition() {
 		return this._hover.anchor;
 	}
@@ -156,6 +158,7 @@ class HoverContextViewDelegate implements IDelegate {
 	}
 
 	render(container: HTMLElement) {
+		this.container = container;
 		this._hover.render(container);
 		if (this._focus) {
 			this._hover.focus();