fix #210655

microsoft · Apr 26, 2024 · 45aaef9 · 45aaef9
1 parent 5f3f4e9
commit 45aaef9
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 17 deletions.
diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts b/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts
@@ -187,18 +187,27 @@ const configuration: IConfigurationNode = {
 			type: 'boolean',
 			default: true
 		},
-		'accessibility.signals.sounds.volume': {
-			'description': localize('accessibility.signals.sounds.volume', "The volume of the sounds in percent (0-100)."),
-			'type': 'number',
-			'minimum': 0,
-			'maximum': 100,
-			'default': 70,
-			tags: ['accessibility']
-		},
-		'accessibility.signals.debouncePositionChanges': {
-			'description': localize('accessibility.signals.debouncePositionChanges', "Whether or not position changes should be debounced"),
-			'type': 'boolean',
-			'default': false,
+		'accessibility.signalOptions': {
+			type: 'object',
+			additionalProperties: false,
+			properties: {
+				'volume': {
+					'description': localize('accessibility.signals.sounds.volume', "The volume of the sounds in percent (0-100)."),
+					'type': 'number',
+					'minimum': 0,
+					'maximum': 100,
+					'default': 70,
+				},
+				'debouncePositionChanges': {
+					'description': localize('accessibility.signals.debouncePositionChanges', "Whether or not position changes should be debounced"),
+					'type': 'boolean',
+					'default': false,
+				},
+			},
+			default: {
+				'volume': 70,
+				'debouncePositionChanges': false
+			},
 			tags: ['accessibility']
 		},
 		'accessibility.signals.lineHasBreakpoint': {
@@ -702,9 +711,10 @@ export class DynamicSpeechAccessibilityConfiguration extends Disposable implemen
 Registry.as<IConfigurationMigrationRegistry>(WorkbenchExtensions.ConfigurationMigration)
 	.registerConfigurationMigrations([{
 		key: 'audioCues.volume',
-		migrateFn: (value, accessor) => {
+		migrateFn: (volume, accessor) => {
+			const debouncePositionChanges = accessor('accessibility.signalOptions')?.debouncePositionChanges || accessor('audioCues.debouncePositionChanges') || accessor('accessibility.signals.debouncePositionChanges');
 			return [
-				['accessibility.signals.sounds.volume', { value }],
+				['accessibility.signalOptions', { value: debouncePositionChanges !== undefined ? { volume, debouncePositionChanges } : { volume } }],
 				['audioCues.volume', { value: undefined }]
 			];
 		}
@@ -713,14 +723,39 @@ Registry.as<IConfigurationMigrationRegistry>(WorkbenchExtensions.ConfigurationMi
 Registry.as<IConfigurationMigrationRegistry>(WorkbenchExtensions.ConfigurationMigration)
 	.registerConfigurationMigrations([{
 		key: 'audioCues.debouncePositionChanges',
-		migrateFn: (value, accessor) => {
+		migrateFn: (debouncePositionChanges, accessor) => {
+			const volume = accessor('accessibility.signalOptions')?.volume || accessor('accessibility.signals.sounds.volume') || accessor('audioCues.volume');
 			return [
-				['accessibility.signals.debouncePositionChanges', { value }],
+				['accessibility.signalOptions', { value: volume !== undefined ? { volume, debouncePositionChanges } : { debouncePositionChanges } }],
 				['audioCues.debouncePositionChanges', { value: undefined }]
 			];
 		}
 	}]);
 
+Registry.as<IConfigurationMigrationRegistry>(WorkbenchExtensions.ConfigurationMigration)
+	.registerConfigurationMigrations([{
+		key: 'accessibility.signals.sounds.volume',
+		migrateFn: (volume, accessor) => {
+			const debouncePositionChanges = accessor('accessibility.signalOptions')?.debouncePositionChanges || accessor('audioCues.debouncePositionChanges') || accessor('accessibility.signals.debouncePositionChanges');
+			return [
+				['accessibility.signalOptions', { value: debouncePositionChanges !== undefined ? { volume, debouncePositionChanges } : { volume } }],
+				['accessibility.signals.sounds.volume', { value: undefined }]
+			];
+		}
+	}]);
+
+Registry.as<IConfigurationMigrationRegistry>(WorkbenchExtensions.ConfigurationMigration)
+	.registerConfigurationMigrations([{
+		key: 'accessibility.signals.debouncePositionChanges',
+		migrateFn: (debouncePositionChanges, accessor) => {
+			const volume = accessor('accessibility.signalOptions')?.volume || accessor('accessibility.signals.sounds.volume') || accessor('audioCues.volume');
+			return [
+				['accessibility.signalOptions', { value: volume !== undefined ? { volume, debouncePositionChanges } : { debouncePositionChanges } }],
+				['accessibility.signals.debouncePositionChanges', { value: undefined }]
+			];
+		}
+	}]);
+
 
 Registry.as<IConfigurationMigrationRegistry>(WorkbenchExtensions.ConfigurationMigration)
 	.registerConfigurationMigrations([{

diff --git a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
@@ -149,7 +149,7 @@ export const tocData: ITOCEntry<string> = {
 				{
 					id: 'features/accessibilitySignals',
 					label: localize('accessibility.signals', 'Accessibility Signals'),
-					settings: ['accessibility.signals.*', 'audioCues.*']
+					settings: ['accessibility.signals.*', 'accessibility.signalOptions.*']
 				},
 				{
 					id: 'features/accessibility',