Merge branch 'release/1.81' into merogge/cherry-hover

Author: meganrogge

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

@@ -26,7 +26,7 @@ import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { getNotificationFromContext } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
 import { IListService, WorkbenchList } from 'vs/platform/list/browser/listService';
 import { NotificationFocusedContext } from 'vs/workbench/common/contextkeys';
-import { IAccessibleViewService, AccessibleViewService, IAccessibleContentProvider, IAccessibleViewOptions, AccessibleViewType, accessibleViewIsShown } from 'vs/workbench/contrib/accessibility/browser/accessibleView';
+import { IAccessibleViewService, AccessibleViewService, IAccessibleContentProvider, IAccessibleViewOptions, AccessibleViewType } from 'vs/workbench/contrib/accessibility/browser/accessibleView';
 import { IHoverService } from 'vs/workbench/services/hover/browser/hover';
 import { alert } from 'vs/base/browser/ui/aria/aria';
 
@@ -245,12 +245,12 @@ class AccessibleViewNavigatorContribution extends Disposable {
 			const accessibleViewService = accessor.get(IAccessibleViewService);
 			accessibleViewService.next();
 			return true;
-		}, accessibleViewIsShown));
+		}));
 		this._register(AccessibleViewPreviousAction.addImplementation(95, 'previous', accessor => {
 			const accessibleViewService = accessor.get(IAccessibleViewService);
 			accessibleViewService.previous();
 			return true;
-		}, accessibleViewIsShown));
+		}));
 	}
 }
 

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

@@ -10,6 +10,10 @@ import { Command, MultiCommand } from 'vs/editor/browser/editorExtensions';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { MenuId } from 'vs/platform/actions/common/actions';
+import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+
+export const accessibilityHelpIsShown = new RawContextKey<boolean>('accessibilityHelpIsShown', false, true);
+export const accessibleViewIsShown = new RawContextKey<boolean>('accessibleViewIsShown', false, true);
 
 export const enum AccessibilityVerbositySettingId {
 	Terminal = 'accessibility.verbosity.terminal',
@@ -121,7 +125,7 @@ export const AccessibleViewAction = registerCommand(new MultiCommand({
 
 export const AccessibleViewNextAction = registerCommand(new MultiCommand({
 	id: 'editor.action.accessibleViewNext',
-	precondition: undefined,
+	precondition: accessibleViewIsShown,
 	kbOpts: {
 		primary: KeyMod.Alt | KeyCode.BracketRight,
 		weight: KeybindingWeight.WorkbenchContrib
@@ -136,7 +140,7 @@ export const AccessibleViewNextAction = registerCommand(new MultiCommand({
 
 export const AccessibleViewPreviousAction = registerCommand(new MultiCommand({
 	id: 'editor.action.accessibleViewPrevious',
-	precondition: undefined,
+	precondition: accessibleViewIsShown,
 	kbOpts: {
 		primary: KeyMod.Alt | KeyCode.BracketLeft,
 		weight: KeybindingWeight.WorkbenchContrib

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

@@ -17,15 +17,15 @@ import { AccessibilityHelpNLS } from 'vs/editor/common/standaloneStrings';
 import { localize } from 'vs/nls';
 import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IContextViewDelegate, IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { alert } from 'vs/base/browser/ui/aria/aria';
 import { getSimpleEditorOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
 import { CodeActionController } from 'vs/editor/contrib/codeAction/browser/codeActionController';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { AccessibilityVerbositySettingId, AccessibleViewAction, AccessibleViewNextAction, AccessibleViewPreviousAction } from 'vs/workbench/contrib/accessibility/browser/accessibilityContribution';
+import { AccessibilityVerbositySettingId, AccessibleViewAction, AccessibleViewNextAction, AccessibleViewPreviousAction, accessibilityHelpIsShown, accessibleViewIsShown } from 'vs/workbench/contrib/accessibility/browser/accessibilityContribution';
 
 const enum DEFAULT {
 	WIDTH = 800,
@@ -71,8 +71,6 @@ export interface IAccessibleViewOptions {
 	type: AccessibleViewType;
 }
 
-export const accessibilityHelpIsShown = new RawContextKey<boolean>('accessibilityHelpIsShown', false, true);
-export const accessibleViewIsShown = new RawContextKey<boolean>('accessibleViewIsShown', false, true);
 class AccessibleView extends Disposable {
 	private _editorWidget: CodeEditorWidget;
 	private _accessiblityHelpIsShown: IContextKey<boolean>;

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

@@ -9,7 +9,7 @@ import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configur
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
 import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { accessibilityHelpIsShown } from 'vs/workbench/contrib/accessibility/browser/accessibleView';
+import { accessibilityHelpIsShown } from 'vs/workbench/contrib/accessibility/browser/accessibilityContribution';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { alert } from 'vs/base/browser/ui/aria/aria';