@@ -11,7 +11,7 @@ import { AccessibilityHelpNLS } from 'vs/editor/common/standaloneStrings';
1111import { ToggleTabFocusModeAction } from 'vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode' ;
1212import { localize } from 'vs/nls' ;
1313import { InstantiationType , registerSingleton } from 'vs/platform/instantiation/common/extensions' ;
14- import { IKeybindingService , IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding' ;
14+ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding' ;
1515import { AccessibilityHelpAction , AccessibleViewAction , registerAccessibilityConfiguration } from 'vs/workbench/contrib/accessibility/browser/accessibilityContribution' ;
1616import * as strings from 'vs/base/common/strings' ;
1717import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation' ;
@@ -26,7 +26,6 @@ import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
2626import { getNotificationFromContext } from 'vs/workbench/browser/parts/notifications/notificationsCommands' ;
2727import { IListService , WorkbenchList } from 'vs/platform/list/browser/listService' ;
2828import { NotificationFocusedContext } from 'vs/workbench/common/contextkeys' ;
29- import { KeyCode } from 'vs/base/common/keyCodes' ;
3029import { IAccessibleViewService , AccessibleViewService , IAccessibleContentProvider , IAccessibleViewOptions , AccessibleViewType } from 'vs/workbench/contrib/accessibility/browser/accessibleView' ;
3130
3231registerAccessibilityConfiguration ( ) ;
@@ -157,6 +156,7 @@ class NotificationAccessibleViewContribution extends Disposable {
157156 this . _register ( AccessibleViewAction . addImplementation ( 90 , 'notifications' , accessor => {
158157 const accessibleViewService = accessor . get ( IAccessibleViewService ) ;
159158 const listService = accessor . get ( IListService ) ;
159+ const commandService = accessor . get ( ICommandService ) ;
160160
161161 function show ( ) : boolean {
162162 const notification = getNotificationFromContext ( listService ) ;
@@ -172,22 +172,17 @@ class NotificationAccessibleViewContribution extends Disposable {
172172 return false ;
173173 }
174174 accessibleViewService . show ( {
175- provideContent : ( ) => { return notification . message . original . toString ( ) || '' ; } ,
175+ provideContent : ( ) => {
176+ return localize ( 'notification.accessibleView' , '{0} Source: {1}' , notification . message . original . toString ( ) || '' , notification . source ) ;
177+ } ,
176178 onClose ( ) : void {
179+ // The notification list might have hidden depending on the elapsed time, so show it.
180+ commandService . executeCommand ( 'notifications.showList' ) ;
177181 if ( list && notificationIndex !== undefined ) {
178182 list . domFocus ( ) ;
179183 list . setFocus ( [ notificationIndex ] ) ;
180184 }
181185 } ,
182- onKeyDown ( e : IKeyboardEvent ) : void {
183- if ( e . keyCode === KeyCode . DownArrow && e . altKey && e . ctrlKey ) {
184- list ?. focusNext ( ) ;
185- show ( ) ;
186- } else if ( e . keyCode === KeyCode . UpArrow && e . altKey && e . ctrlKey ) {
187- list ?. focusPrevious ( ) ;
188- show ( ) ;
189- }
190- } ,
191186 verbositySettingKey : 'notifications' ,
192187 options : {
193188 ariaLabel : localize ( 'notification' , "Notification Accessible View" ) ,
0 commit comments