Skip to content

Commit 31fa87c

Browse files
authored
Merge pull request microsoft#209052 from microsoft/merogge/accview
show acc view on escape of accessible view accessibility help
2 parents 92bf068 + 304835f commit 31fa87c

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -320,10 +320,10 @@ export class AccessibleView extends Disposable {
320320

321321
if (position) {
322322
// Context view takes time to show up, so we need to wait for it to show up before we can set the position
323-
setTimeout(() => {
323+
queueMicrotask(() => {
324324
this._editorWidget.revealLine(position.lineNumber);
325325
this._editorWidget.setSelection({ startLineNumber: position.lineNumber, startColumn: position.column, endLineNumber: position.lineNumber, endColumn: position.column });
326-
}, 10);
326+
});
327327
}
328328

329329
if (symbol && this._currentProvider) {
@@ -672,13 +672,17 @@ export class AccessibleView extends Disposable {
672672
const accessibleViewHelpProvider: IAccessibleContentProvider = {
673673
id: lastProvider.id,
674674
provideContent: () => lastProvider.options.customHelp ? lastProvider?.options.customHelp() : this._getAccessibleViewHelpDialogContent(this._goToSymbolsSupported()),
675-
onClose: () => this.show(lastProvider),
675+
onClose: () => {
676+
this._contextViewService.hideContextView();
677+
// HACK: Delay to allow the context view to hide #207638
678+
queueMicrotask(() => this.show(lastProvider));
679+
},
676680
options: { type: AccessibleViewType.Help },
677681
verbositySettingKey: lastProvider.verbositySettingKey
678682
};
679683
this._contextViewService.hideContextView();
680684
// HACK: Delay to allow the context view to hide #186514
681-
setTimeout(() => this.show(accessibleViewHelpProvider, undefined, true), 100);
685+
queueMicrotask(() => this.show(accessibleViewHelpProvider, undefined, true));
682686
}
683687

684688
private _getAccessibleViewHelpDialogContent(providerHasSymbols?: boolean): string {

0 commit comments

Comments
 (0)