Merge pull request microsoft#183986 from microsoft/merogge/diffEditor

`diff-editor` -> `diffEditor`

Author: meganrogge

src/vs/editor/browser/widget/diffReview.ts

@@ -183,8 +183,8 @@ export class DiffReview extends Disposable {
 			}
 		}));
 		this._register(this._configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration('accessibility.verbosity.diff-editor')) {
-				this._diffEditor.updateOptions({ accessibilityVerbose: this._configurationService.getValue('accessibility.verbosity.diff-editor') });
+			if (e.affectsConfiguration('accessibility.verbosity.diffEditor')) {
+				this._diffEditor.updateOptions({ accessibilityVerbose: this._configurationService.getValue('accessibility.verbosity.diffEditor') });
 			}
 		}));
 		this._diffs = [];

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

@@ -9,53 +9,47 @@ import { Registry } from 'vs/platform/registry/common/platform';
 
 export const enum AccessibilityVerbositySettingId {
 	Terminal = 'accessibility.verbosity.terminal',
-	DiffEditor = 'accessibility.verbosity.diff-editor',
+	DiffEditor = 'accessibility.verbosity.diffEditor',
 	Chat = 'accessibility.verbosity.chat',
 	InteractiveEditor = 'accessibility.verbosity.interactiveEditor',
 	KeybindingsEditor = 'accessibility.verbosity.keybindingsEditor',
 	Notebook = 'accessibility.verbosity.notebook'
 }
 
+const baseProperty: object = {
+	type: 'boolean',
+	default: true,
+	tags: ['accessibility']
+};
+
 const configuration: IConfigurationNode = {
 	id: 'accessibility',
 	title: localize('accessibilityConfigurationTitle', "Accessibility"),
 	type: 'object',
 	properties: {
 		[AccessibilityVerbositySettingId.Terminal]: {
 			description: localize('verbosity.terminal.description', 'Provide information about how to access the terminal accessibility help menu when the terminal is focused'),
-			type: 'boolean',
-			default: true,
-			tags: ['accessibility']
+			...baseProperty
 		},
 		[AccessibilityVerbositySettingId.DiffEditor]: {
-			description: localize('verbosity.diff-editor.description', 'Provide information about how to navigate changes in the diff editor when it is focused'),
-			type: 'boolean',
-			default: true,
-			tags: ['accessibility']
+			description: localize('verbosity.diffEditor.description', 'Provide information about how to navigate changes in the diff editor when it is focused'),
+			...baseProperty
 		},
 		[AccessibilityVerbositySettingId.Chat]: {
 			description: localize('verbosity.chat.description', 'Provide information about how to access the chat help menu when the chat input is focused'),
-			type: 'boolean',
-			default: true,
-			tags: ['accessibility']
+			...baseProperty
 		},
 		[AccessibilityVerbositySettingId.InteractiveEditor]: {
 			description: localize('verbosity.interactiveEditor.description', 'Provide information about how to access the interactive editor accessibility help menu when the interactive editor input is focused'),
-			type: 'boolean',
-			default: true,
-			tags: ['accessibility']
+			...baseProperty
 		},
 		[AccessibilityVerbositySettingId.KeybindingsEditor]: {
 			description: localize('verbosity.keybindingsEditor.description', 'Provide information about how to change a keybinding in the keybindings editor when a row is focused'),
-			type: 'boolean',
-			default: true,
-			tags: ['accessibility']
+			...baseProperty
 		},
 		[AccessibilityVerbositySettingId.Notebook]: {
 			description: localize('verbosity.notebook', 'Provide information about how to focus the cell container or inner editor when a notebook cell is focused.'),
-			type: 'boolean',
-			default: true,
-			tags: ['accessibility']
+			...baseProperty
 		}
 	}
 };