@@ -14,11 +14,20 @@ import { localize } from 'vs/nls';
14
14
import { ICommandService } from 'vs/platform/commands/common/commands' ;
15
15
import { IViewsService } from 'vs/workbench/services/views/common/viewsService' ;
16
16
import { AccessibilityHelpNLS } from 'vs/editor/common/standaloneStrings' ;
17
+ import { FocusedViewContext , SidebarFocusContext } from 'vs/workbench/common/contextkeys' ;
18
+ import { BREAKPOINTS_VIEW_ID , CALLSTACK_VIEW_ID , LOADED_SCRIPTS_VIEW_ID , VARIABLES_VIEW_ID , WATCH_VIEW_ID } from 'vs/workbench/contrib/debug/common/debug' ;
17
19
18
20
export class RunAndDebugAccessibilityHelp implements IAccessibleViewImplentation {
19
21
priority = 120 ;
20
22
name = 'runAndDebugHelp' ;
21
- when = ContextKeyExpr . equals ( 'activeViewlet' , 'workbench.view.debug' ) ;
23
+ when = ContextKeyExpr . or (
24
+ ContextKeyExpr . and ( ContextKeyExpr . equals ( 'activeViewlet' , 'workbench.view.debug' ) , SidebarFocusContext ) ,
25
+ ContextKeyExpr . equals ( FocusedViewContext . key , VARIABLES_VIEW_ID ) ,
26
+ ContextKeyExpr . equals ( FocusedViewContext . key , WATCH_VIEW_ID ) ,
27
+ ContextKeyExpr . equals ( FocusedViewContext . key , CALLSTACK_VIEW_ID ) ,
28
+ ContextKeyExpr . equals ( FocusedViewContext . key , LOADED_SCRIPTS_VIEW_ID ) ,
29
+ ContextKeyExpr . equals ( FocusedViewContext . key , BREAKPOINTS_VIEW_ID )
30
+ ) ;
22
31
type : AccessibleViewType = AccessibleViewType . Help ;
23
32
getProvider ( accessor : ServicesAccessor ) {
24
33
return new RunAndDebugAccessibilityHelpProvider ( accessor . get ( ICommandService ) , accessor . get ( IViewsService ) ) ;
0 commit comments