Fixes microsoft#185028 (microsoft#187608)

* Fixes microsoft#185028

* Consider accessibility.verbosity.diffEditor

* Mentions audio cues in diff editor help.

* Fixes API change.

Author: hediet

src/vs/editor/browser/widget/diffEditor.contribution.ts

@@ -11,10 +11,12 @@ import { localize } from 'vs/nls';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 
-class DiffReviewNext extends EditorAction {
+export class DiffReviewNext extends EditorAction {
+	public static id = 'editor.action.diffReview.next';
+
 	constructor() {
 		super({
-			id: 'editor.action.diffReview.next',
+			id: DiffReviewNext.id,
 			label: localize('editor.action.diffReview.next', "Go to Next Difference"),
 			alias: 'Go to Next Difference',
 			precondition: ContextKeyExpr.has('isInDiffEditor'),
@@ -32,10 +34,12 @@ class DiffReviewNext extends EditorAction {
 	}
 }
 
-class DiffReviewPrev extends EditorAction {
+export class DiffReviewPrev extends EditorAction {
+	public static id = 'editor.action.diffReview.prev';
+
 	constructor() {
 		super({
-			id: 'editor.action.diffReview.prev',
+			id: DiffReviewPrev.id,
 			label: localize('editor.action.diffReview.prev', "Go to Previous Difference"),
 			alias: 'Go to Previous Difference',
 			precondition: ContextKeyExpr.has('isInDiffEditor'),

src/vs/editor/browser/widget/diffEditorWidget2/diffEditorEditors.ts

@@ -16,6 +16,7 @@ import { localize } from 'vs/nls';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { DiffEditorOptions } from './diffEditorOptions';
 import { IObservable, IReader } from 'vs/base/common/observable';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 
 export class DiffEditorEditors extends Disposable {
 	public readonly modified: CodeEditorWidget;
@@ -31,7 +32,8 @@ export class DiffEditorEditors extends Disposable {
 		codeEditorWidgetOptions: IDiffCodeEditorWidgetOptions,
 		private readonly _createInnerEditor: (instantiationService: IInstantiationService, container: HTMLElement, options: Readonly<IEditorOptions>, editorWidgetOptions: ICodeEditorWidgetOptions) => CodeEditorWidget,
 		private readonly _modifiedReadOnlyOverride: IObservable<boolean>,
-		@IInstantiationService private readonly _instantiationService: IInstantiationService
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 	) {
 		super();
 
@@ -150,7 +152,10 @@ export class DiffEditorEditors extends Disposable {
 	}
 
 	private _updateAriaLabel(ariaLabel: string | undefined): string | undefined {
-		const ariaNavigationTip = localize('diff-aria-navigation-tip', ' use Shift + F7 to navigate changes');
+		if (!ariaLabel) {
+			ariaLabel = '';
+		}
+		const ariaNavigationTip = localize('diff-aria-navigation-tip', ' use {0} to open the accessibility help.', this._keybindingService.lookupKeybinding('editor.action.accessibilityHelp')?.getAriaLabel());
 		if (this._options.accessibilityVerbose.get()) {
 			return ariaLabel + ariaNavigationTip;
 		} else if (ariaLabel) {

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

@@ -3,17 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
 import { IDiffEditor } from 'vs/editor/browser/editorBrowser';
 import { registerDiffEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { IDiffEditorContribution } from 'vs/editor/common/editorCommon';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { FloatingClickWidget } from 'vs/workbench/browser/codeeditor';
+import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
+import { DiffReviewNext, DiffReviewPrev } from 'vs/editor/browser/widget/diffEditor.contribution';
+import { DiffEditorWidget2 } from 'vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2';
+import { EmbeddedDiffEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget';
 import { IDiffComputationResult } from 'vs/editor/common/diff/smartLinesDiffComputer';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IDiffEditorContribution } from 'vs/editor/common/editorCommon';
+import * as nls from 'vs/nls';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ContextKeyEqualsExpr, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { EmbeddedDiffEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget';
+import { FloatingClickWidget } from 'vs/workbench/browser/codeeditor';
+import { AccessibilityHelpAction } from 'vs/workbench/contrib/accessibility/browser/accessibilityContribution';
+import { AccessibleViewType, IAccessibleViewService } from 'vs/workbench/contrib/accessibility/browser/accessibleView';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 
 const enum WidgetState {
 	Hidden,
@@ -35,6 +43,44 @@ class DiffEditorHelperContribution extends Disposable implements IDiffEditorCont
 		@INotificationService private readonly _notificationService: INotificationService,
 	) {
 		super();
+
+		this._register(AccessibilityHelpAction.addImplementation(105, 'diff-editor', async accessor => {
+			const accessibleViewService = accessor.get(IAccessibleViewService);
+			const editorService = accessor.get(IEditorService);
+			const codeEditorService = accessor.get(ICodeEditorService);
+			const keybindingService = accessor.get(IKeybindingService);
+
+			const next = keybindingService.lookupKeybinding(DiffReviewNext.id)?.getAriaLabel();
+			const previous = keybindingService.lookupKeybinding(DiffReviewPrev.id)?.getAriaLabel();
+
+			if (!(editorService.activeTextEditorControl instanceof DiffEditorWidget2)) {
+				return;
+			}
+
+			const codeEditor = codeEditorService.getActiveCodeEditor() || codeEditorService.getFocusedCodeEditor();
+			if (!codeEditor) {
+				return;
+			}
+
+			const keys = ['audioCues.diffLineDeleted', 'audioCues.diffLineInserted', 'audioCues.diffLineModified'];
+
+			accessibleViewService.show({
+				id: 'diffEditor',
+				provideContent: () => [
+					nls.localize('msg1', "You are in a diff editor."),
+					nls.localize('msg2', "Press {0} or {1} to view the next or previous diff in the diff review mode that is optimized for screen readers.", next, previous),
+					nls.localize('msg3', "To control which audio cues should be played, the following settings can be configured: {0}.", keys.join(', ')),
+				].join('\n'),
+				onClose: () => {
+					codeEditor.focus();
+				},
+				options: { type: AccessibleViewType.HelpMenu, ariaLabel: nls.localize('chat-help-label', "Diff editor accessibility help") }
+			});
+		}, ContextKeyExpr.and(
+			ContextKeyEqualsExpr.create('diffEditorVersion', 2),
+			ContextKeyEqualsExpr.create('isInDiffEditor', true),
+		)));
+
 		this._helperWidget = null;
 		this._helperWidgetListener = null;
 		this._state = WidgetState.Hidden;