add navigate code block actions in accessible view (microsoft#210480)

Author: meganrogge

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

@@ -83,6 +83,7 @@ export interface IAccessibleViewService {
 	showAccessibleViewHelp(): void;
 	next(): void;
 	previous(): void;
+	navigateToCodeBlock(type: 'next' | 'previous'): void;
 	goToSymbol(): void;
 	disableHint(): void;
 	getPosition(id: AccessibleViewProviderId): Position | undefined;
@@ -290,6 +291,19 @@ export class AccessibleView extends Disposable {
 		return { code: codeBlock.code, languageId: codeBlock.languageId, codeBlockIndex, element: undefined };
 	}
 
+	navigateToCodeBlock(type: 'next' | 'previous'): void {
+		const position = this._editorWidget.getPosition();
+		if (!this._codeBlocks?.length || !position) {
+			return;
+		}
+		const codeBlockIndex = this._codeBlocks.findIndex(c => type === 'previous' ? c.endLine >= position.lineNumber : c.startLine > position.lineNumber);
+		if (codeBlockIndex === -1) {
+			return;
+		}
+		const codeBlock = this._codeBlocks[codeBlockIndex];
+		this.setPosition(new Position(codeBlock.startLine, 1), true);
+	}
+
 	showLastProvider(id: AccessibleViewProviderId): void {
 		if (!this._lastProvider || this._lastProvider.options.id !== id) {
 			return;
@@ -840,6 +854,9 @@ export class AccessibleViewService extends Disposable implements IAccessibleView
 	getCodeBlockContext(): ICodeBlockActionContext | undefined {
 		return this._accessibleView?.getCodeBlockContext();
 	}
+	navigateToCodeBlock(type: 'next' | 'previous'): void {
+		this._accessibleView?.navigateToCodeBlock(type);
+	}
 }
 
 class AccessibleViewSymbolQuickPick {

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

@@ -11,7 +11,7 @@ import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/act
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { AccessibilityCommandId } from 'vs/workbench/contrib/accessibility/common/accessibilityCommands';
-import { AccessibleViewProviderId, accessibilityHelpIsShown, accessibleViewCurrentProviderId, accessibleViewGoToSymbolSupported, accessibleViewIsShown, accessibleViewSupportsNavigation, accessibleViewVerbosityEnabled } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
+import { AccessibleViewProviderId, accessibilityHelpIsShown, accessibleViewContainsCodeBlocks, accessibleViewCurrentProviderId, accessibleViewGoToSymbolSupported, accessibleViewIsShown, accessibleViewSupportsNavigation, accessibleViewVerbosityEnabled } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { IAccessibleViewService } from 'vs/workbench/contrib/accessibility/browser/accessibleView';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
@@ -52,6 +52,56 @@ class AccessibleViewNextAction extends Action2 {
 registerAction2(AccessibleViewNextAction);
 
 
+class AccessibleViewNextCodeBlockAction extends Action2 {
+	constructor() {
+		super({
+			id: AccessibilityCommandId.NextCodeBlock,
+			precondition: ContextKeyExpr.and(accessibleViewContainsCodeBlocks, ContextKeyExpr.equals(accessibleViewCurrentProviderId.key, AccessibleViewProviderId.Chat)),
+			keybinding: {
+				primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown,
+				mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown, },
+				weight: KeybindingWeight.WorkbenchContrib,
+			},
+			icon: Codicon.arrowRight,
+			menu:
+			{
+				...accessibleViewMenu,
+				when: ContextKeyExpr.and(accessibleViewIsShown, accessibleViewSupportsNavigation),
+			},
+			title: localize('editor.action.accessibleViewNextCodeBlock', "Accessible View: Next Code Block")
+		});
+	}
+	run(accessor: ServicesAccessor): void {
+		accessor.get(IAccessibleViewService).navigateToCodeBlock('next');
+	}
+}
+registerAction2(AccessibleViewNextCodeBlockAction);
+
+
+class AccessibleViewPreviousCodeBlockAction extends Action2 {
+	constructor() {
+		super({
+			id: AccessibilityCommandId.PreviousCodeBlock,
+			precondition: ContextKeyExpr.and(accessibleViewContainsCodeBlocks, ContextKeyExpr.equals(accessibleViewCurrentProviderId.key, AccessibleViewProviderId.Chat)),
+			keybinding: {
+				primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp,
+				mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp, },
+				weight: KeybindingWeight.WorkbenchContrib,
+			},
+			icon: Codicon.arrowLeft,
+			menu: {
+				...accessibleViewMenu,
+				when: ContextKeyExpr.and(accessibleViewIsShown, accessibleViewSupportsNavigation),
+			},
+			title: localize('editor.action.accessibleViewPreviousCodeBlock', "Accessible View: Previous Code Block")
+		});
+	}
+	run(accessor: ServicesAccessor): void {
+		accessor.get(IAccessibleViewService).navigateToCodeBlock('previous');
+	}
+}
+registerAction2(AccessibleViewPreviousCodeBlockAction);
+
 class AccessibleViewPreviousAction extends Action2 {
 	constructor() {
 		super({

src/vs/workbench/contrib/accessibility/common/accessibilityCommands.ts

@@ -10,5 +10,7 @@ export const enum AccessibilityCommandId {
 	GoToSymbol = 'editor.action.accessibleViewGoToSymbol',
 	ShowNext = 'editor.action.accessibleViewNext',
 	ShowPrevious = 'editor.action.accessibleViewPrevious',
-	AccessibleViewAcceptInlineCompletion = 'editor.action.accessibleViewAcceptInlineCompletion'
+	AccessibleViewAcceptInlineCompletion = 'editor.action.accessibleViewAcceptInlineCompletion',
+	NextCodeBlock = 'editor.action.accessibleViewNextCodeBlock',
+	PreviousCodeBlock = 'editor.action.accessibleViewPreviousCodeBlock'
 }