@codingame/monaco-vscode-accessibility-service-override 9.0.2 → 10.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-accessibility-service-override",
-  "version": "9.0.2",
+  "version": "10.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@9.0.2",
+    "vscode": "npm:@codingame/monaco-vscode-api@10.0.0",
     "marked": "~14.0.0"
   }
 }

package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibility.contribution.js

@@ -1,7 +1,5 @@
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { registerAccessibilityConfiguration, DynamicSpeechAccessibilityConfiguration } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { Extensions, registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
-import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
+import { Extensions, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { UnfocusedViewDimmingContribution } from './unfocusedViewDimmingContribution.js';
 import { AccessibilityStatus } from './accessibilityStatus.js';
@@ -17,13 +15,13 @@ import { ExtensionAccessibilityHelpDialogContribution } from './extensionAccesib
 
 registerAccessibilityConfiguration();
 const workbenchRegistry = ( Registry.as(Extensions.Workbench));
-workbenchRegistry.registerWorkbenchContribution(EditorAccessibilityHelpContribution, LifecyclePhase.Eventually);
-workbenchRegistry.registerWorkbenchContribution(UnfocusedViewDimmingContribution, LifecyclePhase.Restored);
-workbenchRegistry.registerWorkbenchContribution(AccesibleViewHelpContribution, LifecyclePhase.Eventually);
-workbenchRegistry.registerWorkbenchContribution(AccesibleViewContributions, LifecyclePhase.Eventually);
-registerWorkbenchContribution2(AccessibilityStatus.ID, AccessibilityStatus, WorkbenchPhase.BlockRestore);
-registerWorkbenchContribution2(ExtensionAccessibilityHelpDialogContribution.ID, ExtensionAccessibilityHelpDialogContribution, WorkbenchPhase.BlockRestore);
-registerWorkbenchContribution2(SaveAccessibilitySignalContribution.ID, SaveAccessibilitySignalContribution, WorkbenchPhase.AfterRestored);
-registerWorkbenchContribution2(SpeechAccessibilitySignalContribution.ID, SpeechAccessibilitySignalContribution, WorkbenchPhase.AfterRestored);
-registerWorkbenchContribution2(DiffEditorActiveAnnouncementContribution.ID, DiffEditorActiveAnnouncementContribution, WorkbenchPhase.AfterRestored);
-registerWorkbenchContribution2(DynamicSpeechAccessibilityConfiguration.ID, DynamicSpeechAccessibilityConfiguration, WorkbenchPhase.AfterRestored);
+workbenchRegistry.registerWorkbenchContribution(EditorAccessibilityHelpContribution, 4 );
+workbenchRegistry.registerWorkbenchContribution(UnfocusedViewDimmingContribution, 3 );
+workbenchRegistry.registerWorkbenchContribution(AccesibleViewHelpContribution, 4 );
+workbenchRegistry.registerWorkbenchContribution(AccesibleViewContributions, 4 );
+registerWorkbenchContribution2(AccessibilityStatus.ID, AccessibilityStatus, 2 );
+registerWorkbenchContribution2(ExtensionAccessibilityHelpDialogContribution.ID, ExtensionAccessibilityHelpDialogContribution, 2 );
+registerWorkbenchContribution2(SaveAccessibilitySignalContribution.ID, SaveAccessibilitySignalContribution, 3 );
+registerWorkbenchContribution2(SpeechAccessibilitySignalContribution.ID, SpeechAccessibilitySignalContribution, 3 );
+registerWorkbenchContribution2(DiffEditorActiveAnnouncementContribution.ID, DiffEditorActiveAnnouncementContribution, 3 );
+registerWorkbenchContribution2(DynamicSpeechAccessibilityConfiguration.ID, DynamicSpeechAccessibilityConfiguration, 3 );

package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibilityStatus.js

@@ -5,11 +5,9 @@ import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { localize } from 'vscode/vscode/vs/nls';
 import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility.service';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
-import { ConfigurationTarget } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { NotificationPriority } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
-import { StatusbarAlignment } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 
 let AccessibilityStatus = class AccessibilityStatus extends Disposable {
@@ -36,15 +34,15 @@ let AccessibilityStatus = class AccessibilityStatus extends Disposable {
         }));
     }
     showScreenReaderNotification() {
-        this.screenReaderNotification = this.notificationService.prompt(Severity$1.Info, ( localize(5533, "Are you using a screen reader to operate VS Code?")), [{
-                label: ( localize(5534, "Yes")),
+        this.screenReaderNotification = this.notificationService.prompt(Severity$1.Info, ( localize(5580, "Are you using a screen reader to operate VS Code?")), [{
+                label: ( localize(5581, "Yes")),
                 run: () => {
-                    this.configurationService.updateValue('editor.accessibilitySupport', 'on', ConfigurationTarget.USER);
+                    this.configurationService.updateValue('editor.accessibilitySupport', 'on', 2 );
                 }
             }, {
-                label: ( localize(5535, "No")),
+                label: ( localize(5582, "No")),
                 run: () => {
-                    this.configurationService.updateValue('editor.accessibilitySupport', 'off', ConfigurationTarget.USER);
+                    this.configurationService.updateValue('editor.accessibilitySupport', 'off', 2 );
                 }
             }], {
             sticky: true,
@@ -55,15 +53,15 @@ let AccessibilityStatus = class AccessibilityStatus extends Disposable {
     updateScreenReaderModeElement(visible) {
         if (visible) {
             if (!this.screenReaderModeElement.value) {
-                const text = ( localize(5536, "Screen Reader Optimized"));
+                const text = ( localize(5583, "Screen Reader Optimized"));
                 this.screenReaderModeElement.value = this.statusbarService.addEntry({
-                    name: ( localize(5537, "Screen Reader Mode")),
+                    name: ( localize(5584, "Screen Reader Mode")),
                     text,
                     ariaLabel: text,
                     command: 'showEditorScreenReaderNotification',
                     kind: 'prominent',
                     showInAllWindows: true
-                }, 'status.editor.screenReaderMode', StatusbarAlignment.RIGHT, 100.6);
+                }, 'status.editor.screenReaderMode', 1 , 100.6);
             }
         }
         else {

package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleView.js

@@ -1,10 +1,8 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { getActiveWindow, addDisposableListener, EventType, isActiveElement } from 'vscode/vscode/vs/base/browser/dom';
 import { StandardKeyboardEvent } from 'vscode/vscode/vs/base/browser/keyboardEvent';
-import { ActionsOrientation } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { alert } from 'vscode/vscode/vs/base/browser/ui/aria/aria';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
-import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { marked } from 'marked';
 import { isWindows, isMacintosh } from 'vscode/vscode/vs/base/common/platform';
@@ -17,7 +15,7 @@ import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { AccessibilityHelpNLS } from 'vscode/vscode/vs/editor/common/standaloneStrings';
 import { CodeActionController } from 'vscode/vscode/vs/editor/contrib/codeAction/browser/codeActionController';
 import { localize } from 'vscode/vscode/vs/nls';
-import { AccessibleContentProvider, AccessibleViewProviderId, ExtensionContentProvider, AccessibleViewType } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
+import { AccessibleContentProvider, ExtensionContentProvider } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
 import { ACCESSIBLE_VIEW_SHOWN_STORAGE_PREFIX } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
 import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility.service';
 import { createAndFillInActionBarActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
@@ -30,22 +28,15 @@ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/
 import { IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
-import { ResultKind } from 'vscode/vscode/vs/platform/keybinding/common/keybindingResolver';
 import { ILayoutService } from 'vscode/vscode/vs/platform/layout/browser/layoutService.service';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
-import { accessibilityHelpIsShown, accessibleViewIsShown, accessibleViewSupportsNavigation, accessibleViewVerbosityEnabled, accessibleViewGoToSymbolSupported, accessibleViewCurrentProviderId, accessibleViewInCodeBlock, accessibleViewContainsCodeBlocks, accessibleViewOnLastLine, accessibleViewHasUnassignedKeybindings, accessibleViewHasAssignedKeybindings, AccessibilityWorkbenchSettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
+import { accessibilityHelpIsShown, accessibleViewIsShown, accessibleViewSupportsNavigation, accessibleViewVerbosityEnabled, accessibleViewGoToSymbolSupported, accessibleViewCurrentProviderId, accessibleViewInCodeBlock, accessibleViewContainsCodeBlocks, accessibleViewOnLastLine, accessibleViewHasUnassignedKeybindings, accessibleViewHasAssignedKeybindings } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { resolveContentAndKeybindingItems } from './accessibleViewKeybindingResolver.js';
-import { AccessibilityCommandId } from 'vscode/vscode/vs/workbench/contrib/accessibility/common/accessibilityCommands';
 import { IChatCodeBlockContextProviderService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { getSimpleEditorOptions } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
 
-var DIMENSIONS;
-( ((function(DIMENSIONS) {
-    DIMENSIONS[DIMENSIONS["MAX_WIDTH"] = 600] = "MAX_WIDTH";
-})(DIMENSIONS || (DIMENSIONS = {}))));
 let AccessibleView = class AccessibleView extends Disposable {
     get editorWidget() { return this._editorWidget; }
     constructor(_openerService, _instantiationService, _configurationService, _modelService, _contextViewService, _contextKeyService, _accessibilityService, _keybindingService, _layoutService, _menuService, _commandService, _codeBlockContextProviderService, _storageService, _quickInputService) {
@@ -78,7 +69,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         this._hasAssignedKeybindings = accessibleViewHasAssignedKeybindings.bindTo(this._contextKeyService);
         this._container = document.createElement('div');
         this._container.classList.add('accessible-view');
-        if (this._configurationService.getValue(AccessibilityWorkbenchSettingId.HideAccessibleView)) {
+        if (this._configurationService.getValue("accessibility.hideAccessibleView" )) {
             this._container.classList.add('hide');
         }
         const codeEditorWidgetOptions = {
@@ -93,7 +84,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         actionBar.classList.add('accessible-view-action-bar');
         titleBar.appendChild(actionBar);
         this._container.appendChild(titleBar);
-        this._toolbar = this._register(_instantiationService.createInstance(WorkbenchToolBar, actionBar, { orientation: ActionsOrientation.HORIZONTAL }));
+        this._toolbar = this._register(_instantiationService.createInstance(WorkbenchToolBar, actionBar, { orientation: 0  }));
         this._toolbar.context = { viewId: 'accessibleView' };
         const toolbarElt = this._toolbar.getElement();
         toolbarElt.tabIndex = 0;
@@ -126,8 +117,8 @@ let AccessibleView = class AccessibleView extends Disposable {
                 this._accessibleViewVerbosityEnabled.set(this._configurationService.getValue(this._currentProvider.verbositySettingKey));
                 this._updateToolbar(this._currentProvider.actions, this._currentProvider.options.type);
             }
-            if (e.affectsConfiguration(AccessibilityWorkbenchSettingId.HideAccessibleView)) {
-                this._container.classList.toggle('hide', this._configurationService.getValue(AccessibilityWorkbenchSettingId.HideAccessibleView));
+            if (e.affectsConfiguration("accessibility.hideAccessibleView" )) {
+                this._container.classList.toggle('hide', this._configurationService.getValue("accessibility.hideAccessibleView" ));
             }
         }));
         this._register(this._editorWidget.onDidDispose(() => this._resetContextKeys()));
@@ -213,7 +204,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         }
         provider.onOpen?.();
         const delegate = {
-            getAnchor: () => { return { x: (getActiveWindow().innerWidth / 2) - ((Math.min(this._layoutService.activeContainerDimension.width * 0.62 , DIMENSIONS.MAX_WIDTH)) / 2), y: this._layoutService.activeContainerOffset.quickPickTop }; },
+            getAnchor: () => { return { x: (getActiveWindow().innerWidth / 2) - ((Math.min(this._layoutService.activeContainerDimension.width * 0.62 , 600 )) / 2), y: this._layoutService.activeContainerOffset.quickPickTop }; },
             render: (container) => {
                 this._viewContainer = container;
                 this._viewContainer.classList.add('accessible-view-container');
@@ -248,11 +239,11 @@ let AccessibleView = class AccessibleView extends Disposable {
         if (provider.options.id) {
             this._lastProvider = provider;
         }
-        if (provider.id === AccessibleViewProviderId.Chat) {
+        if (provider.id === "panelChat" ) {
             this._register(this._codeBlockContextProviderService.registerProvider({ getCodeBlockContext: () => this.getCodeBlockContext() }, 'accessibleView'));
         }
         if (provider instanceof ExtensionContentProvider) {
-            this._storageService.store(`${ACCESSIBLE_VIEW_SHOWN_STORAGE_PREFIX}${provider.id}`, true, StorageScope.APPLICATION, StorageTarget.USER);
+            this._storageService.store(`${ACCESSIBLE_VIEW_SHOWN_STORAGE_PREFIX}${provider.id}`, true, -1 , 0 );
         }
         if (provider.onDidChangeContent) {
             this._register(provider.onDidChangeContent(() => {
@@ -280,7 +271,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         if (!this._currentProvider) {
             return false;
         }
-        return this._currentProvider instanceof AccessibleContentProvider ? this._configurationService.getValue(this._currentProvider.verbositySettingKey) === true : this._storageService.getBoolean(`${ACCESSIBLE_VIEW_SHOWN_STORAGE_PREFIX}${this._currentProvider.id}`, StorageScope.APPLICATION, false);
+        return this._currentProvider instanceof AccessibleContentProvider ? this._configurationService.getValue(this._currentProvider.verbositySettingKey) === true : this._storageService.getBoolean(`${ACCESSIBLE_VIEW_SHOWN_STORAGE_PREFIX}${this._currentProvider.id}`, -1 , false);
     }
     goToSymbol() {
         if (!this._currentProvider) {
@@ -292,7 +283,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         if (!markdown) {
             return;
         }
-        if (this._currentProvider?.id !== AccessibleViewProviderId.Chat) {
+        if (this._currentProvider?.id !== "panelChat" ) {
             return;
         }
         if (this._currentProvider.options.language && this._currentProvider.options.language !== 'markdown') {
@@ -353,8 +344,8 @@ let AccessibleView = class AccessibleView extends Disposable {
         const disposables = this._register(( (new DisposableStore())));
         const quickPick = disposables.add(this._quickInputService.createQuickPick());
         quickPick.items = items;
-        quickPick.title = ( localize(2256, 'Configure keybindings'));
-        quickPick.placeholder = ( localize(2257, 'Select a command ID to configure a keybinding for it'));
+        quickPick.title = ( localize(2262, 'Configure keybindings'));
+        quickPick.placeholder = ( localize(2263, 'Select a command ID to configure a keybinding for it'));
         quickPick.show();
         disposables.add(quickPick.onDidAccept(async () => {
             const item = quickPick.selectedItems[0];
@@ -394,7 +385,7 @@ let AccessibleView = class AccessibleView extends Disposable {
                 }
             }
             if (label) {
-                symbols.push({ markdownToParse: label, label: ( localize(2258, "({0}) {1}", token.type, label)), ariaLabel: ( localize(2259, "({0}) {1}", token.type, label)), firstListItem });
+                symbols.push({ markdownToParse: label, label: ( localize(2264, "({0}) {1}", token.type, label)), ariaLabel: ( localize(2265, "({0}) {1}", token.type, label)), firstListItem });
                 firstListItem = undefined;
             }
         }
@@ -426,13 +417,13 @@ let AccessibleView = class AccessibleView extends Disposable {
         }
         this._configurationService.updateValue(this._currentProvider?.verbositySettingKey, false);
         alert(( localize(
-            2260,
+            2266,
             '{0} accessibility verbosity is now disabled',
             this._currentProvider.verbositySettingKey
         )));
     }
     _updateContextKeys(provider, shown) {
-        if (provider.options.type === AccessibleViewType.Help) {
+        if (provider.options.type === "help" ) {
             this._accessiblityHelpIsShown.set(shown);
             this._accessibleViewIsShown.reset();
         }
@@ -446,7 +437,7 @@ let AccessibleView = class AccessibleView extends Disposable {
     }
     _updateContent(provider, updatedContent) {
         let content = updatedContent ?? provider.provideContent();
-        if (provider.options.type === AccessibleViewType.View) {
+        if (provider.options.type === "view" ) {
             this._currentContent = content;
             this._hasUnassignedKeybindings.reset();
             this._hasAssignedKeybindings.reset();
@@ -505,17 +496,17 @@ let AccessibleView = class AccessibleView extends Disposable {
             const hasActions = this._accessibleViewSupportsNavigation.get() || this._accessibleViewVerbosityEnabled.get() || this._accessibleViewGoToSymbolSupported.get() || provider.actions?.length;
             if (verbose && !showAccessibleViewHelp && hasActions) {
                 actionsHint = provider.options.position ? ( localize(
-                    2261,
+                    2267,
                     'Explore actions such as disabling this hint (Shift+Tab), use Escape to exit this dialog.'
-                )) : ( localize(2262, 'Explore actions such as disabling this hint (Shift+Tab).'));
+                )) : ( localize(2268, 'Explore actions such as disabling this hint (Shift+Tab).'));
             }
-            let ariaLabel = provider.options.type === AccessibleViewType.Help ? ( localize(2263, "Accessibility Help")) : ( localize(2264, "Accessible View"));
+            let ariaLabel = provider.options.type === "help"  ? ( localize(2269, "Accessibility Help")) : ( localize(2270, "Accessible View"));
             this._title.textContent = ariaLabel;
-            if (actionsHint && provider.options.type === AccessibleViewType.View) {
-                ariaLabel = ( localize(2265, "Accessible View, {0}", actionsHint));
+            if (actionsHint && provider.options.type === "view" ) {
+                ariaLabel = ( localize(2271, "Accessible View, {0}", actionsHint));
             }
             else if (actionsHint) {
-                ariaLabel = ( localize(2266, "Accessibility Help, {0}", actionsHint));
+                ariaLabel = ( localize(2272, "Accessibility Help, {0}", actionsHint));
             }
             if (isWindows && widgetIsFocused) {
                 ariaLabel = '';
@@ -550,13 +541,13 @@ let AccessibleView = class AccessibleView extends Disposable {
         };
         const disposableStore = ( (new DisposableStore()));
         disposableStore.add(this._editorWidget.onKeyDown((e) => {
-            if (e.keyCode === KeyCode.Enter) {
+            if (e.keyCode === 3 ) {
                 this._commandService.executeCommand('editor.action.openLink');
             }
-            else if (e.keyCode === KeyCode.Escape || shouldHide(e.browserEvent, this._keybindingService, this._configurationService)) {
+            else if (e.keyCode === 9  || shouldHide(e.browserEvent, this._keybindingService, this._configurationService)) {
                 hide(e);
             }
-            else if (e.keyCode === KeyCode.KeyH && provider.options.readMoreUrl) {
+            else if (e.keyCode === 38  && provider.options.readMoreUrl) {
                 const url = provider.options.readMoreUrl;
                 alert(AccessibilityHelpNLS.openingDocs);
                 this._openerService.open(( (URI.parse(url))));
@@ -569,7 +560,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         }));
         disposableStore.add(addDisposableListener(this._toolbar.getElement(), EventType.KEY_DOWN, (e) => {
             const keyboardEvent = ( (new StandardKeyboardEvent(e)));
-            if (keyboardEvent.equals(KeyCode.Escape)) {
+            if (keyboardEvent.equals(9 )) {
                 hide(e);
             }
         }));
@@ -583,7 +574,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         return disposableStore;
     }
     _updateToolbar(providedActions, type) {
-        this._toolbar.setAriaLabel(type === AccessibleViewType.Help ? ( localize(2267, 'Accessibility Help')) : ( localize(2268, "Accessible View")));
+        this._toolbar.setAriaLabel(type === "help"  ? ( localize(2273, 'Accessibility Help')) : ( localize(2274, "Accessible View")));
         const menuActions = [];
         const toolbarMenu = this._register(this._menuService.createMenu(MenuId.AccessibleView, this._contextKeyService));
         createAndFillInActionBarActions(toolbarMenu, {}, menuActions);
@@ -602,7 +593,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         const dimension = this._layoutService.activeContainerDimension;
         const maxHeight = dimension.height && dimension.height * .4;
         const height = Math.min(maxHeight, this._editorWidget.getContentHeight());
-        const width = Math.min(dimension.width * 0.62 , DIMENSIONS.MAX_WIDTH);
+        const width = Math.min(dimension.width * 0.62 , 600 );
         this._editorWidget.layout({ width, height });
     }
     async _getTextModel(resource) {
@@ -616,7 +607,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         if (!this._currentProvider) {
             return false;
         }
-        return this._currentProvider.options.type === AccessibleViewType.Help || this._currentProvider.options.language === 'markdown' || this._currentProvider.options.language === undefined || (this._currentProvider instanceof AccessibleContentProvider && !!this._currentProvider.getSymbols?.());
+        return this._currentProvider.options.type === "help"  || this._currentProvider.options.language === 'markdown' || this._currentProvider.options.language === undefined || (this._currentProvider instanceof AccessibleContentProvider && !!this._currentProvider.getSymbols?.());
     }
     _updateLastProvider() {
         const provider = this._currentProvider;
@@ -658,7 +649,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         if (lastProvider instanceof AccessibleContentProvider) {
             accessibleViewHelpProvider = ( (new AccessibleContentProvider(
                 lastProvider.id,
-                { type: AccessibleViewType.Help },
+                { type: "help"  },
                 () => lastProvider.options.customHelp ? lastProvider?.options.customHelp() : this._accessibleViewHelpDialogContent(this._goToSymbolsSupported()),
                 () => {
                     this._contextViewService.hideContextView();
@@ -670,7 +661,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         else {
             accessibleViewHelpProvider = ( (new ExtensionContentProvider(
                 lastProvider.id,
-                { type: AccessibleViewType.Help },
+                { type: "help"  },
                 () => lastProvider.options.customHelp ? lastProvider?.options.customHelp() : this._accessibleViewHelpDialogContent(this._goToSymbolsSupported()),
                 () => {
                     this._contextViewService.hideContextView();
@@ -686,9 +677,9 @@ let AccessibleView = class AccessibleView extends Disposable {
     _accessibleViewHelpDialogContent(providerHasSymbols) {
         const navigationHint = this._navigationHint();
         const goToSymbolHint = this._goToSymbolHint(providerHasSymbols);
-        const toolbarHint = ( localize(2269, "Navigate to the toolbar (Shift+Tab)."));
+        const toolbarHint = ( localize(2275, "Navigate to the toolbar (Shift+Tab)."));
         const chatHints = this._getChatHints();
-        let hint = ( localize(2270, "In the accessible view, you can:\n"));
+        let hint = ( localize(2276, "In the accessible view, you can:\n"));
         if (navigationHint) {
             hint += ' - ' + navigationHint + '\n';
         }
@@ -704,39 +695,39 @@ let AccessibleView = class AccessibleView extends Disposable {
         return hint;
     }
     _getChatHints() {
-        if (this._currentProvider?.id !== AccessibleViewProviderId.Chat) {
+        if (this._currentProvider?.id !== "panelChat" ) {
             return;
         }
         return [( localize(
-            2271,
+            2277,
             " - Insert the code block at the cursor{0}.",
             '<keybinding:workbench.action.chat.insertCodeBlock>'
         )),
             ( localize(
-                2272,
+                2278,
                 " - Insert the code block into a new file{0}.",
                 '<keybinding:workbench.action.chat.insertIntoNewFile>'
             )),
             ( localize(
-                2273,
+                2279,
                 " - Run the code block in the terminal{0}.\n",
                 '<keybinding:workbench.action.chat.runInTerminal>'
             ))].join('\n');
     }
     _navigationHint() {
         return ( localize(
-            2274,
+            2280,
             "Show the next item{0} or previous item{1}.",
-            `<keybinding:${AccessibilityCommandId.ShowNext}`,
-            `<keybinding:${AccessibilityCommandId.ShowPrevious}>`
+            `<keybinding:${"editor.action.accessibleViewNext" }`,
+            `<keybinding:${"editor.action.accessibleViewPrevious" }>`
         ));
     }
     _disableVerbosityHint(provider) {
-        if (provider.options.type === AccessibleViewType.Help && this._verbosityEnabled()) {
+        if (provider.options.type === "help"  && this._verbosityEnabled()) {
             return ( localize(
-                2275,
+                2281,
                 "\nDisable accessibility verbosity for this feature{0}.",
-                `<keybinding:${AccessibilityCommandId.DisableVerbosityHint}>`
+                `<keybinding:${"editor.action.accessibleViewDisableHint" }>`
             ));
         }
         return '';
@@ -746,25 +737,25 @@ let AccessibleView = class AccessibleView extends Disposable {
             return;
         }
         return ( localize(
-            2276,
+            2282,
             'Go to a symbol{0}.',
-            `<keybinding:${AccessibilityCommandId.GoToSymbol}>`
+            `<keybinding:${"editor.action.accessibleViewGoToSymbol" }>`
         ));
     }
     _configureUnassignedKbHint() {
-        const configureKb = this._keybindingService.lookupKeybinding(AccessibilityCommandId.AccessibilityHelpConfigureKeybindings)?.getAriaLabel();
+        const configureKb = this._keybindingService.lookupKeybinding("editor.action.accessibilityHelpConfigureKeybindings" )?.getAriaLabel();
         const keybindingToConfigureQuickPick = configureKb ? '(' + configureKb + ')' : 'by assigning a keybinding to the command Accessibility Help Configure Unassigned Keybindings.';
         return ( localize(
-            2277,
+            2283,
             '\nConfigure keybindings for commands that lack them {0}.',
             keybindingToConfigureQuickPick
         ));
     }
     _configureAssignedKbHint() {
-        const configureKb = this._keybindingService.lookupKeybinding(AccessibilityCommandId.AccessibilityHelpConfigureAssignedKeybindings)?.getAriaLabel();
+        const configureKb = this._keybindingService.lookupKeybinding("editor.action.accessibilityHelpConfigureAssignedKeybindings" )?.getAriaLabel();
         const keybindingToConfigureQuickPick = configureKb ? '(' + configureKb + ')' : 'by assigning a keybinding to the command Accessibility Help Configure Assigned Keybindings.';
         return ( localize(
-            2278,
+            2284,
             '\nConfigure keybindings for commands that already have assignments {0}.',
             keybindingToConfigureQuickPick
         ));
@@ -775,7 +766,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         const turnOnMessage = (isMacintosh
             ? AccessibilityHelpNLS.changeConfigToOnMac
             : AccessibilityHelpNLS.changeConfigToOnWinLinux);
-        if (accessibilitySupport && provider.id === AccessibleViewProviderId.Editor) {
+        if (accessibilitySupport && provider.id === "editor" ) {
             screenReaderModeHint = AccessibilityHelpNLS.auto_on;
             screenReaderModeHint += '\n';
         }
@@ -786,13 +777,13 @@ let AccessibleView = class AccessibleView extends Disposable {
         return screenReaderModeHint;
     }
     _exitDialogHint(provider) {
-        return this._verbosityEnabled() && !provider.options.position ? ( localize(2279, '\nExit this dialog (Escape).')) : '';
+        return this._verbosityEnabled() && !provider.options.position ? ( localize(2285, '\nExit this dialog (Escape).')) : '';
     }
     _readMoreHint(provider) {
         return provider.options.readMoreUrl ? ( localize(
-            2280,
+            2286,
             "\nOpen a browser window with more information related to accessibility{0}.",
-            `<keybinding:${AccessibilityCommandId.AccessibilityHelpOpenHelpLink}>`
+            `<keybinding:${"editor.action.accessibilityHelpOpenHelpLink" }>`
         )) : '';
     }
 };
@@ -847,14 +838,14 @@ let AccessibleViewService = class AccessibleViewService extends Disposable {
         if (!this._configurationService.getValue(verbositySettingKey)) {
             return null;
         }
-        const keybinding = this._keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibleView)?.getAriaLabel();
+        const keybinding = this._keybindingService.lookupKeybinding("editor.action.accessibleView" )?.getAriaLabel();
         let hint = null;
         if (keybinding) {
-            hint = ( localize(2281, "Inspect this in the accessible view with {0}", keybinding));
+            hint = ( localize(2287, "Inspect this in the accessible view with {0}", keybinding));
         }
         else {
             hint = ( localize(
-                2282,
+                2288,
                 "Inspect this in the accessible view via the command Open Accessible View which is currently not triggerable via keybinding."
             ));
         }
@@ -896,8 +887,8 @@ let AccessibleViewSymbolQuickPick = class AccessibleViewSymbolQuickPick {
     show(provider) {
         const disposables = ( (new DisposableStore()));
         const quickPick = disposables.add(this._quickInputService.createQuickPick());
-        quickPick.placeholder = ( localize(2283, "Type to search symbols"));
-        quickPick.title = ( localize(2284, "Go to Symbol Accessible View"));
+        quickPick.placeholder = ( localize(2289, "Type to search symbols"));
+        quickPick.title = ( localize(2290, "Go to Symbol Accessible View"));
         const symbols = this._accessibleView.getSymbols();
         if (!symbols) {
             return;
@@ -923,12 +914,12 @@ AccessibleViewSymbolQuickPick = ( (__decorate([
     ( (__param(1, IQuickInputService)))
 ], AccessibleViewSymbolQuickPick)));
 function shouldHide(event, keybindingService, configurationService) {
-    if (!configurationService.getValue(AccessibilityWorkbenchSettingId.AccessibleViewCloseOnKeyPress)) {
+    if (!configurationService.getValue("accessibility.accessibleView.closeOnKeyPress" )) {
         return false;
     }
     const standardKeyboardEvent = ( (new StandardKeyboardEvent(event)));
     const resolveResult = keybindingService.softDispatch(standardKeyboardEvent, standardKeyboardEvent.target);
-    const isValidChord = resolveResult.kind === ResultKind.MoreChordsNeeded;
+    const isValidChord = resolveResult.kind === 1 ;
     if (keybindingService.inChordMode || isValidChord) {
         return false;
     }

package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleViewContributions.js

@@ -1,7 +1,6 @@
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { accessibleViewIsShown } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { AccessibilityHelpAction, AccessibleViewAction } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibleViewActions';
-import { AccessibleViewType } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
 import { IAccessibleViewService } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView.service';
 import { AccessibleViewRegistry } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
 
@@ -32,7 +31,7 @@ class AccesibleViewContributions extends Disposable {
                     return false;
                 }
             };
-            if (impl.type === AccessibleViewType.View) {
+            if (impl.type === "view" ) {
                 this._register(AccessibleViewAction.addImplementation(impl.priority, impl.name, implementation, impl.when));
             }
             else {

package/vscode/src/vs/workbench/contrib/accessibility/browser/extensionAccesibilityHelp.contribution.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable, DisposableMap, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
-import { AccessibleViewType, ExtensionContentProvider } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
+import { ExtensionContentProvider } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
 import { AccessibleViewRegistry } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
@@ -43,13 +43,13 @@ function registerAccessibilityHelpAction(keybindingService, viewDescriptor) {
     disposableStore.add(AccessibleViewRegistry.register({
         priority: 95,
         name: viewDescriptor.id,
-        type: AccessibleViewType.Help,
+        type: "help" ,
         when: ( FocusedViewContext.isEqualTo(viewDescriptor.id)),
         getProvider: (accessor) => {
             const viewsService = accessor.get(IViewsService);
             return ( new ExtensionContentProvider(
                 viewDescriptor.id,
-                { type: AccessibleViewType.Help },
+                { type: "help"  },
                 () => content,
                 () => viewsService.openView(viewDescriptor.id, true)
             ));

package/vscode/src/vs/workbench/contrib/accessibility/browser/unfocusedViewDimmingContribution.js

@@ -4,7 +4,6 @@ import { Event } from 'vscode/vscode/vs/base/common/event';
 import { Disposable, toDisposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { clamp } from 'vscode/vscode/vs/base/common/numbers';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
-import { AccessibilityWorkbenchSettingId, ViewDimUnfocusedOpacityProperties } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 
 let UnfocusedViewDimmingContribution = class UnfocusedViewDimmingContribution extends Disposable {
     constructor(configurationService) {
@@ -12,13 +11,13 @@ let UnfocusedViewDimmingContribution = class UnfocusedViewDimmingContribution ex
         this._styleElementDisposables = undefined;
         this._register(toDisposable(() => this._removeStyleElement()));
         this._register(Event.runAndSubscribe(configurationService.onDidChangeConfiguration, e => {
-            if (e && !e.affectsConfiguration(AccessibilityWorkbenchSettingId.DimUnfocusedEnabled) && !e.affectsConfiguration(AccessibilityWorkbenchSettingId.DimUnfocusedOpacity)) {
+            if (e && !e.affectsConfiguration("accessibility.dimUnfocused.enabled" ) && !e.affectsConfiguration("accessibility.dimUnfocused.opacity" )) {
                 return;
             }
             let cssTextContent = '';
-            const enabled = ensureBoolean(configurationService.getValue(AccessibilityWorkbenchSettingId.DimUnfocusedEnabled), false);
+            const enabled = ensureBoolean(configurationService.getValue("accessibility.dimUnfocused.enabled" ), false);
             if (enabled) {
-                const opacity = clamp(ensureNumber(configurationService.getValue(AccessibilityWorkbenchSettingId.DimUnfocusedOpacity), ViewDimUnfocusedOpacityProperties.Default), ViewDimUnfocusedOpacityProperties.Minimum, ViewDimUnfocusedOpacityProperties.Maximum);
+                const opacity = clamp(ensureNumber(configurationService.getValue("accessibility.dimUnfocused.opacity" ), 0.75 ), 0.2 , 1 );
                 if (opacity !== 1) {
                     const rules = ( new Set());
                     const filterRule = `filter: opacity(${opacity});`;

package/vscode/src/vs/workbench/contrib/accessibilitySignals/browser/accessibilitySignal.contribution.js

@@ -1,14 +1,13 @@
 import 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
-import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { AccessibilitySignalLineDebuggerContribution } from './accessibilitySignalDebuggerContribution.js';
 import { ShowSignalSoundHelp, ShowAccessibilityAnnouncementHelp } from './commands.js';
 import { EditorTextPropertySignalsContribution } from './editorTextPropertySignalsContribution.js';
 import { wrapInReloadableClass0 } from 'vscode/vscode/vs/platform/observable/common/wrapInReloadableClass';
 
-registerWorkbenchContribution2('EditorTextPropertySignalsContribution', wrapInReloadableClass0(() => EditorTextPropertySignalsContribution), WorkbenchPhase.AfterRestored);
-registerWorkbenchContribution2('AccessibilitySignalLineDebuggerContribution', AccessibilitySignalLineDebuggerContribution, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2('EditorTextPropertySignalsContribution', wrapInReloadableClass0(() => EditorTextPropertySignalsContribution), 3 );
+registerWorkbenchContribution2('AccessibilitySignalLineDebuggerContribution', AccessibilitySignalLineDebuggerContribution, 3 );
 registerAction2(ShowSignalSoundHelp);
 registerAction2(ShowAccessibilityAnnouncementHelp);

package/vscode/src/vs/workbench/contrib/accessibilitySignals/browser/accessibilitySignalDebuggerContribution.js

@@ -1,10 +1,11 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import 'vscode/vscode/vs/base/common/arrays';
-import 'vscode/vscode/vs/base/common/observableInternal/derived';
+import 'vscode/vscode/vs/base/common/event';
 import { autorunWithStore } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
-import { observableFromEvent } from 'vscode/vscode/vs/base/common/observableInternal/utils';
+import 'vscode/vscode/vs/base/common/observableInternal/derived';
 import 'vscode/vscode/vs/base/common/cancellation';
+import { observableFromEvent } from 'vscode/vscode/vs/base/common/observableInternal/utils';
 import { AccessibilitySignal } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 import { IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';

package/vscode/src/vs/workbench/contrib/accessibilitySignals/browser/commands.js

@@ -15,11 +15,11 @@ class ShowSignalSoundHelp extends Action2 {
     constructor() {
         super({
             id: ShowSignalSoundHelp.ID,
-            title: ( localize2(5539, "Help: List Signal Sounds")),
+            title: ( localize2(5586, "Help: List Signal Sounds")),
             f1: true,
             metadata: {
                 description: ( localize(
-                    5540,
+                    5587,
                     "List all accessibility sounds, noises, or audio cues and configure their settings"
                 ))
             }
@@ -37,7 +37,7 @@ class ShowSignalSoundHelp extends Action2 {
             signal,
             buttons: userGestureSignals.includes(signal) ? [{
                     iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-                    tooltip: ( localize(5541, 'Configure Sound')),
+                    tooltip: ( localize(5588, 'Configure Sound')),
                     alwaysVisible: true
                 }] : []
         })))).sort((a, b) => a.label.localeCompare(b.label));
@@ -73,7 +73,7 @@ class ShowSignalSoundHelp extends Action2 {
             accessibilitySignalService.playSound(qp.activeItems[0].signal.sound.getSound(true), true, AcknowledgeDocCommentsToken);
         }));
         disposables.add(qp.onDidHide(() => disposables.dispose()));
-        qp.placeholder = ( localize(5542, 'Select a sound to play and configure'));
+        qp.placeholder = ( localize(5589, 'Select a sound to play and configure'));
         qp.canSelectMany = true;
         await qp.show();
     }
@@ -86,11 +86,11 @@ class ShowAccessibilityAnnouncementHelp extends Action2 {
     constructor() {
         super({
             id: ShowAccessibilityAnnouncementHelp.ID,
-            title: ( localize2(5543, "Help: List Signal Announcements")),
+            title: ( localize2(5590, "Help: List Signal Announcements")),
             f1: true,
             metadata: {
                 description: ( localize(
-                    5544,
+                    5591,
                     "List all accessibility announcements, alerts, braille messages, and configure their settings"
                 ))
             }
@@ -108,7 +108,7 @@ class ShowAccessibilityAnnouncementHelp extends Action2 {
             signal,
             buttons: userGestureSignals.includes(signal) ? [{
                     iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-                    tooltip: ( localize(5545, 'Configure Announcement')),
+                    tooltip: ( localize(5592, 'Configure Announcement')),
                     alwaysVisible: true,
                 }] : []
         })))).sort((a, b) => a.label.localeCompare(b.label));
@@ -141,8 +141,8 @@ class ShowAccessibilityAnnouncementHelp extends Action2 {
             preferencesService.openUserSettings({ jsonEditor: true, revealSetting: { key: e.item.signal.settingsKey, edit: true } });
         }));
         disposables.add(qp.onDidHide(() => disposables.dispose()));
-        qp.placeholder = screenReaderOptimized ? ( localize(5546, 'Select an announcement to configure')) : ( localize(
-            5547,
+        qp.placeholder = screenReaderOptimized ? ( localize(5593, 'Select an announcement to configure')) : ( localize(
+            5594,
             'Screen reader is not active, announcements are disabled by default.'
         ));
         qp.canSelectMany = true;

package/vscode/src/vs/workbench/contrib/accessibilitySignals/browser/editorTextPropertySignalsContribution.js

@@ -2,21 +2,21 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { disposableTimeout } from 'vscode/vscode/vs/base/common/async';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import 'vscode/vscode/vs/base/common/arrays';
-import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
+import 'vscode/vscode/vs/base/common/event';
 import { autorunWithStore, autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
-import { observableFromValueWithChangeEvent, observableFromEvent, wasEventTriggeredRecently, observableSignalFromEvent, observableFromPromise } from 'vscode/vscode/vs/base/common/observableInternal/utils';
+import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
 import 'vscode/vscode/vs/base/common/cancellation';
+import { observableFromValueWithChangeEvent, observableFromEvent, wasEventTriggeredRecently, observableSignalFromEvent, observableFromPromise } from 'vscode/vscode/vs/base/common/observableInternal/utils';
 import { isDefined } from 'vscode/vscode/vs/base/common/types';
 import { isDiffEditor, isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
-import { CursorChangeReason } from 'vscode/vscode/vs/editor/common/cursorEvents';
 import { FoldingController } from 'vscode/vscode/vs/editor/contrib/folding/browser/folding';
 import { AccessibilitySignal } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 import { IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { MarkerSeverity } from 'vscode/vscode/vs/platform/markers/common/markers';
 import { IMarkerService } from 'vscode/vscode/vs/platform/markers/common/markers.service';
-import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 
 let EditorTextPropertySignalsContribution = class EditorTextPropertySignalsContribution extends Disposable {
     constructor(_editorService, _instantiationService, _accessibilitySignalService) {
@@ -64,8 +64,8 @@ let EditorTextPropertySignalsContribution = class EditorTextPropertySignalsContr
         store.add(editor.onDidChangeCursorPosition(args => {
             timeouts.clear();
             if (args &&
-                args.reason !== CursorChangeReason.Explicit &&
-                args.reason !== CursorChangeReason.NotSet) {
+                args.reason !== 3  &&
+                args.reason !== 0 ) {
                 ignoredLineSignalsForCurrentLine.clear();
                 return;
             }

package/vscode/src/vs/workbench/contrib/accessibilitySignals/browser/openDiffEditorAnnouncement.js

@@ -6,7 +6,6 @@ import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/c
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { Event } from 'vscode/vscode/vs/base/common/event';
-import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 
 let DiffEditorActiveAnnouncementContribution = class DiffEditorActiveAnnouncementContribution extends Disposable {
     static { this.ID = 'workbench.contrib.diffEditorActiveAnnouncement'; }
@@ -17,13 +16,13 @@ let DiffEditorActiveAnnouncementContribution = class DiffEditorActiveAnnouncemen
         this._configurationService = _configurationService;
         this._register(Event.runAndSubscribe(_accessibilityService.onDidChangeScreenReaderOptimized, () => this._updateListener()));
         this._register(_configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration(AccessibilityVerbositySettingId.DiffEditorActive)) {
+            if (e.affectsConfiguration("accessibility.verbosity.diffEditorActive" )) {
                 this._updateListener();
             }
         }));
     }
     _updateListener() {
-        const announcementEnabled = this._configurationService.getValue(AccessibilityVerbositySettingId.DiffEditorActive);
+        const announcementEnabled = this._configurationService.getValue("accessibility.verbosity.diffEditorActive" );
         const screenReaderOptimized = this._accessibilityService.isScreenReaderOptimized();
         if (!announcementEnabled || !screenReaderOptimized) {
             this._onDidActiveEditorChangeListener?.dispose();
@@ -35,7 +34,7 @@ let DiffEditorActiveAnnouncementContribution = class DiffEditorActiveAnnouncemen
         }
         this._onDidActiveEditorChangeListener = this._register(this._editorService.onDidActiveEditorChange(() => {
             if (isDiffEditor(this._editorService.activeTextEditorControl)) {
-                this._accessibilityService.alert(( localize(5538, "Diff editor")));
+                this._accessibilityService.alert(( localize(5585, "Diff editor")));
             }
         }));
     }

package/vscode/src/vs/workbench/contrib/accessibilitySignals/browser/saveAccessibilitySignal.js

@@ -2,7 +2,6 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { AccessibilitySignal } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 import { IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
-import { SaveReason } from 'vscode/vscode/vs/workbench/common/editor';
 import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
 
 let SaveAccessibilitySignalContribution = class SaveAccessibilitySignalContribution extends Disposable {
@@ -11,7 +10,7 @@ let SaveAccessibilitySignalContribution = class SaveAccessibilitySignalContribut
         super();
         this._accessibilitySignalService = _accessibilitySignalService;
         this._workingCopyService = _workingCopyService;
-        this._register(this._workingCopyService.onDidSave(e => this._accessibilitySignalService.playSignal(AccessibilitySignal.save, { userGesture: e.reason === SaveReason.EXPLICIT })));
+        this._register(this._workingCopyService.onDidSave(e => this._accessibilitySignalService.playSignal(AccessibilitySignal.save, { userGesture: e.reason === 1  })));
     }
 };
 SaveAccessibilitySignalContribution = ( __decorate([

package/vscode/src/vs/workbench/contrib/codeEditor/browser/accessibility/accessibility.js

@@ -1,12 +1,9 @@
 import './accessibility.css.js';
 import { localize2 } from 'vscode/vscode/vs/nls';
-import { ConfigurationTarget } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility.service';
 import { Action2, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { accessibilityHelpIsShown } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { alert } from 'vscode/vscode/vs/base/browser/ui/aria/aria';
 import { AccessibilityHelpNLS } from 'vscode/vscode/vs/editor/common/standaloneStrings';
 
@@ -14,23 +11,23 @@ class ToggleScreenReaderMode extends Action2 {
     constructor() {
         super({
             id: 'editor.action.toggleScreenReaderAccessibilityMode',
-            title: ( localize2(2334, "Toggle Screen Reader Accessibility Mode")),
+            title: ( localize2(2340, "Toggle Screen Reader Accessibility Mode")),
             metadata: {
                 description: ( localize2(
-                    2335,
+                    2341,
                     "Toggles an optimized mode for usage with screen readers, braille devices, and other assistive technologies."
                 )),
             },
             f1: true,
             keybinding: [{
-                    primary: KeyMod.CtrlCmd | KeyCode.KeyE,
-                    weight: KeybindingWeight.WorkbenchContrib + 10,
+                    primary: 2048  | 35 ,
+                    weight: 200  + 10,
                     when: accessibilityHelpIsShown
                 },
                 {
-                    primary: KeyMod.Alt | KeyCode.F1 | KeyMod.Shift,
-                    linux: { primary: KeyMod.Alt | KeyCode.F4 | KeyMod.Shift },
-                    weight: KeybindingWeight.WorkbenchContrib + 10,
+                    primary: 512  | 59  | 1024 ,
+                    linux: { primary: 512  | 62  | 1024  },
+                    weight: 200  + 10,
                 }]
         });
     }
@@ -38,7 +35,7 @@ class ToggleScreenReaderMode extends Action2 {
         const accessibiiltyService = accessor.get(IAccessibilityService);
         const configurationService = accessor.get(IConfigurationService);
         const isScreenReaderOptimized = accessibiiltyService.isScreenReaderOptimized();
-        configurationService.updateValue('editor.accessibilitySupport', isScreenReaderOptimized ? 'off' : 'on', ConfigurationTarget.USER);
+        configurationService.updateValue('editor.accessibilitySupport', isScreenReaderOptimized ? 'off' : 'on', 2 );
         alert(isScreenReaderOptimized ? AccessibilityHelpNLS.screenReaderModeDisabled : AccessibilityHelpNLS.screenReaderModeEnabled);
     }
 }

package/vscode/src/vs/workbench/services/accessibility/common/accessibleViewInformationService.js

@@ -1,7 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ACCESSIBLE_VIEW_SHOWN_STORAGE_PREFIX } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
-import { StorageScope } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 
 let AccessibleViewInformationService = class AccessibleViewInformationService extends Disposable {
@@ -10,7 +9,7 @@ let AccessibleViewInformationService = class AccessibleViewInformationService ex
         this._storageService = _storageService;
     }
     hasShownAccessibleView(viewId) {
-        return this._storageService.getBoolean(`${ACCESSIBLE_VIEW_SHOWN_STORAGE_PREFIX}${viewId}`, StorageScope.APPLICATION, false) === true;
+        return this._storageService.getBoolean(`${ACCESSIBLE_VIEW_SHOWN_STORAGE_PREFIX}${viewId}`, -1 , false) === true;
     }
 };
 AccessibleViewInformationService = ( __decorate([