@codingame/monaco-vscode-accessibility-service-override 7.1.0 → 8.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-accessibility-service-override",
-  "version": "7.1.0",
+  "version": "8.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@7.1.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@8.0.0"
   }
 }

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

@@ -2,7 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+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';
@@ -12,7 +12,6 @@ import { INotificationService } from 'vscode/vscode/vs/platform/notification/com
 import { StatusbarAlignment } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 
-const _moduleId = "vs/workbench/contrib/accessibility/browser/accessibilityStatus";
 let AccessibilityStatus = class AccessibilityStatus extends Disposable {
     static { this.ID = 'workbench.contrib.accessibilityStatus'; }
     constructor(configurationService, notificationService, accessibilityService, statusbarService) {
@@ -37,13 +36,13 @@ let AccessibilityStatus = class AccessibilityStatus extends Disposable {
         }));
     }
     showScreenReaderNotification() {
-        this.screenReaderNotification = this.notificationService.prompt(Severity$1.Info, ( localizeWithPath(_moduleId, 0, "Are you using a screen reader to operate VS Code?")), [{
-                label: ( localizeWithPath(_moduleId, 1, "Yes")),
+        this.screenReaderNotification = this.notificationService.prompt(Severity$1.Info, ( localize(5573, "Are you using a screen reader to operate VS Code?")), [{
+                label: ( localize(5574, "Yes")),
                 run: () => {
                     this.configurationService.updateValue('editor.accessibilitySupport', 'on', ConfigurationTarget.USER);
                 }
             }, {
-                label: ( localizeWithPath(_moduleId, 2, "No")),
+                label: ( localize(5575, "No")),
                 run: () => {
                     this.configurationService.updateValue('editor.accessibilitySupport', 'off', ConfigurationTarget.USER);
                 }
@@ -56,9 +55,9 @@ let AccessibilityStatus = class AccessibilityStatus extends Disposable {
     updateScreenReaderModeElement(visible) {
         if (visible) {
             if (!this.screenReaderModeElement.value) {
-                const text = ( localizeWithPath(_moduleId, 3, "Screen Reader Optimized"));
+                const text = ( localize(5576, "Screen Reader Optimized"));
                 this.screenReaderModeElement.value = this.statusbarService.addEntry({
-                    name: ( localizeWithPath(_moduleId, 4, "Screen Reader Mode")),
+                    name: ( localize(5577, "Screen Reader Mode")),
                     text,
                     ariaLabel: text,
                     command: 'showEditorScreenReaderNotification',

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

@@ -7,7 +7,7 @@ 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_1 from 'vscode/external/vscode-marked/lib/marked.esm.js';
-import { isMacintosh, isWindows } from 'vscode/vscode/vs/base/common/platform';
+import { isWindows, isMacintosh } from 'vscode/vscode/vs/base/common/platform';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { EditorExtensionsRegistry } from 'vscode/vscode/vs/editor/browser/editorExtensions';
@@ -16,8 +16,8 @@ import { Position } from 'vscode/vscode/vs/editor/common/core/position';
 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 { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { AdvancedContentProvider, AccessibleViewProviderId, ExtensionContentProvider, AccessibleViewType } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
+import { localize } from 'vscode/vscode/vs/nls';
+import { AccessibleContentProvider, AccessibleViewProviderId, ExtensionContentProvider, AccessibleViewType } 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';
@@ -36,13 +36,12 @@ import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.s
 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, AccessibilityWorkbenchSettingId, AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
+import { accessibilityHelpIsShown, accessibleViewIsShown, accessibleViewSupportsNavigation, accessibleViewVerbosityEnabled, accessibleViewGoToSymbolSupported, accessibleViewCurrentProviderId, accessibleViewInCodeBlock, accessibleViewContainsCodeBlocks, accessibleViewOnLastLine, accessibleViewHasUnassignedKeybindings, accessibleViewHasAssignedKeybindings, AccessibilityWorkbenchSettingId } 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';
 
-const _moduleId = "vs/workbench/contrib/accessibility/browser/accessibleView";
 var DIMENSIONS;
 ( ((function(DIMENSIONS) {
     DIMENSIONS[DIMENSIONS["MAX_WIDTH"] = 600] = "MAX_WIDTH";
@@ -75,6 +74,8 @@ let AccessibleView = class AccessibleView extends Disposable {
         this._accessibleViewInCodeBlock = accessibleViewInCodeBlock.bindTo(this._contextKeyService);
         this._accessibleViewContainsCodeBlocks = accessibleViewContainsCodeBlocks.bindTo(this._contextKeyService);
         this._onLastLine = accessibleViewOnLastLine.bindTo(this._contextKeyService);
+        this._hasUnassignedKeybindings = accessibleViewHasUnassignedKeybindings.bindTo(this._contextKeyService);
+        this._hasAssignedKeybindings = accessibleViewHasAssignedKeybindings.bindTo(this._contextKeyService);
         this._container = document.createElement('div');
         this._container.classList.add('accessible-view');
         if (this._configurationService.getValue(AccessibilityWorkbenchSettingId.HideAccessibleView)) {
@@ -101,6 +102,7 @@ let AccessibleView = class AccessibleView extends Disposable {
             lineDecorationsWidth: 6,
             dragAndDrop: false,
             cursorWidth: 1,
+            wordWrap: 'off',
             wrappingStrategy: 'advanced',
             wrappingIndent: 'none',
             padding: { top: 2, bottom: 2 },
@@ -117,7 +119,7 @@ let AccessibleView = class AccessibleView extends Disposable {
             }
         }));
         this._register(this._configurationService.onDidChangeConfiguration(e => {
-            if (this._currentProvider instanceof AdvancedContentProvider && e.affectsConfiguration(this._currentProvider.verbositySettingKey)) {
+            if (this._currentProvider instanceof AccessibleContentProvider && e.affectsConfiguration(this._currentProvider.verbositySettingKey)) {
                 if (this._accessiblityHelpIsShown.get()) {
                     this.show(this._currentProvider);
                 }
@@ -147,6 +149,8 @@ let AccessibleView = class AccessibleView extends Disposable {
         this._accessibleViewVerbosityEnabled.reset();
         this._accessibleViewGoToSymbolSupported.reset();
         this._accessibleViewCurrentProviderId.reset();
+        this._hasAssignedKeybindings.reset();
+        this._hasUnassignedKeybindings.reset();
     }
     getPosition(id) {
         if (!id || !this._lastProvider || this._lastProvider.id !== id) {
@@ -202,17 +206,17 @@ let AccessibleView = class AccessibleView extends Disposable {
             return;
         }
         provider.onOpen?.();
-        let viewContainer;
         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 }; },
             render: (container) => {
-                viewContainer = container;
-                viewContainer.classList.add('accessible-view-container');
+                this._viewContainer = container;
+                this._viewContainer.classList.add('accessible-view-container');
                 return this._render(provider, container, showAccessibleViewHelp);
             },
             onHide: () => {
                 if (!showAccessibleViewHelp) {
                     this._updateLastProvider();
+                    this._currentProvider?.dispose();
                     this._currentProvider = undefined;
                     this._resetContextKeys();
                 }
@@ -228,7 +232,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         if (symbol && this._currentProvider) {
             this.showSymbol(this._currentProvider, symbol);
         }
-        if (provider instanceof AdvancedContentProvider && provider.onDidRequestClearLastProvider) {
+        if (provider instanceof AccessibleContentProvider && provider.onDidRequestClearLastProvider) {
             this._register(provider.onDidRequestClearLastProvider((id) => {
                 if (this._lastProvider?.options.id === id) {
                     this._lastProvider = undefined;
@@ -246,23 +250,31 @@ let AccessibleView = class AccessibleView extends Disposable {
         }
         if (provider.onDidChangeContent) {
             this._register(provider.onDidChangeContent(() => {
-                if (viewContainer) {
-                    this._render(provider, viewContainer, showAccessibleViewHelp);
+                if (this._viewContainer) {
+                    this._render(provider, this._viewContainer, showAccessibleViewHelp);
                 }
             }));
         }
     }
     previous() {
-        this._currentProvider?.previous?.();
+        const newContent = this._currentProvider?.providePreviousContent?.();
+        if (!this._currentProvider || !this._viewContainer || !newContent) {
+            return;
+        }
+        this._render(this._currentProvider, this._viewContainer, undefined, newContent);
     }
     next() {
-        this._currentProvider?.next?.();
+        const newContent = this._currentProvider?.provideNextContent?.();
+        if (!this._currentProvider || !this._viewContainer || !newContent) {
+            return;
+        }
+        this._render(this._currentProvider, this._viewContainer, undefined, newContent);
     }
     _verbosityEnabled() {
         if (!this._currentProvider) {
             return false;
         }
-        return this._currentProvider instanceof AdvancedContentProvider ? 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}`, StorageScope.APPLICATION, false);
     }
     goToSymbol() {
         if (!this._currentProvider) {
@@ -271,6 +283,9 @@ let AccessibleView = class AccessibleView extends Disposable {
         this._instantiationService.createInstance(AccessibleViewSymbolQuickPick, this).show(this._currentProvider);
     }
     calculateCodeBlocks(markdown) {
+        if (!markdown) {
+            return;
+        }
         if (this._currentProvider?.id !== AccessibleViewProviderId.Chat) {
             return;
         }
@@ -298,7 +313,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         this._accessibleViewContainsCodeBlocks.set(this._codeBlocks.length > 0);
     }
     getSymbols() {
-        const provider = this._currentProvider instanceof AdvancedContentProvider ? this._currentProvider : undefined;
+        const provider = this._currentProvider instanceof AccessibleContentProvider ? this._currentProvider : undefined;
         if (!this._currentContent || !provider) {
             return;
         }
@@ -322,18 +337,18 @@ let AccessibleView = class AccessibleView extends Disposable {
         }
         this._openerService.open(( (URI.parse(this._currentProvider.options.readMoreUrl))));
     }
-    configureKeybindings() {
+    configureKeybindings(unassigned) {
         this._inQuickPick = true;
         const provider = this._updateLastProvider();
-        const items = provider?.options?.configureKeybindingItems;
+        const items = unassigned ? provider?.options?.configureKeybindingItems : provider?.options?.configuredKeybindingItems;
         if (!items) {
             return;
         }
         const quickPick = this._quickInputService.createQuickPick();
         this._register(quickPick);
         quickPick.items = items;
-        quickPick.title = ( localizeWithPath(_moduleId, 0, 'Configure keybindings'));
-        quickPick.placeholder = ( localizeWithPath(_moduleId, 1, 'Select a command ID to configure a keybinding for it'));
+        quickPick.title = ( localize(1791, 'Configure keybindings'));
+        quickPick.placeholder = ( localize(1792, 'Select a command ID to configure a keybinding for it'));
         quickPick.show();
         quickPick.onDidAccept(async () => {
             const item = quickPick.selectedItems[0];
@@ -373,7 +388,7 @@ let AccessibleView = class AccessibleView extends Disposable {
                 }
             }
             if (label) {
-                symbols.push({ markdownToParse: label, label: ( localizeWithPath(_moduleId, 2, "({0}) {1}", token.type, label)), ariaLabel: ( localizeWithPath(_moduleId, 3, "({0}) {1}", token.type, label)), firstListItem });
+                symbols.push({ markdownToParse: label, label: ( localize(1793, "({0}) {1}", token.type, label)), ariaLabel: ( localize(1794, "({0}) {1}", token.type, label)), firstListItem });
                 firstListItem = undefined;
             }
         }
@@ -400,13 +415,12 @@ let AccessibleView = class AccessibleView extends Disposable {
         this._updateContextKeys(provider, true);
     }
     disableHint() {
-        if (!(this._currentProvider instanceof AdvancedContentProvider)) {
+        if (!(this._currentProvider instanceof AccessibleContentProvider)) {
             return;
         }
         this._configurationService.updateValue(this._currentProvider?.verbositySettingKey, false);
-        alert(( localizeWithPath(
-            _moduleId,
-            4,
+        alert(( localize(
+            1795,
             '{0} accessibility verbosity is now disabled',
             this._currentProvider.verbositySettingKey
         )));
@@ -420,53 +434,52 @@ let AccessibleView = class AccessibleView extends Disposable {
             this._accessibleViewIsShown.set(shown);
             this._accessiblityHelpIsShown.reset();
         }
-        this._accessibleViewSupportsNavigation.set(provider.next !== undefined || provider.previous !== undefined);
+        this._accessibleViewSupportsNavigation.set(provider.provideNextContent !== undefined || provider.providePreviousContent !== undefined);
         this._accessibleViewVerbosityEnabled.set(this._verbosityEnabled());
         this._accessibleViewGoToSymbolSupported.set(this._goToSymbolsSupported() ? this.getSymbols()?.length > 0 : false);
     }
-    _render(provider, container, showAccessibleViewHelp) {
-        this._currentProvider = provider;
-        this._accessibleViewCurrentProviderId.set(provider.id);
-        const verbose = this._verbosityEnabled();
-        const readMoreLink = provider.options.readMoreUrl ? ( localizeWithPath(
-            _moduleId,
-            5,
-            "\n\nOpen a browser window with more information related to accessibility<keybinding:{0}>.",
-            AccessibilityCommandId.AccessibilityHelpOpenHelpLink
-        )) : '';
-        let disableHelpHint = '';
-        if (provider instanceof AdvancedContentProvider && provider.options.type === AccessibleViewType.Help && verbose) {
-            disableHelpHint = this._getDisableVerbosityHint();
+    _updateContent(provider, updatedContent) {
+        let content = updatedContent ?? provider.provideContent();
+        if (provider.options.type === AccessibleViewType.View) {
+            this._currentContent = content;
+            this._hasUnassignedKeybindings.reset();
+            this._hasAssignedKeybindings.reset();
+            return;
         }
-        const accessibilitySupport = this._accessibilityService.isScreenReaderOptimized();
-        let message = '';
-        if (provider.options.type === AccessibleViewType.Help) {
-            const turnOnMessage = (isMacintosh
-                ? AccessibilityHelpNLS.changeConfigToOnMac
-                : AccessibilityHelpNLS.changeConfigToOnWinLinux);
-            if (accessibilitySupport && provider instanceof AdvancedContentProvider && provider.verbositySettingKey === AccessibilityVerbositySettingId.Editor) {
-                message = AccessibilityHelpNLS.auto_on;
-                message += '\n';
+        const readMoreLinkHint = this._readMoreHint(provider);
+        const disableHelpHint = this._disableVerbosityHint(provider);
+        const screenReaderModeHint = this._screenReaderModeHint(provider);
+        const exitThisDialogHint = this._exitDialogHint(provider);
+        let configureKbHint = '';
+        let configureAssignedKbHint = '';
+        const resolvedContent = resolveContentAndKeybindingItems(this._keybindingService, screenReaderModeHint + content + readMoreLinkHint + disableHelpHint + exitThisDialogHint);
+        if (resolvedContent) {
+            content = resolvedContent.content.value;
+            if (resolvedContent.configureKeybindingItems) {
+                provider.options.configureKeybindingItems = resolvedContent.configureKeybindingItems;
+                this._hasUnassignedKeybindings.set(true);
+                configureKbHint = this._configureUnassignedKbHint();
             }
-            else if (!accessibilitySupport) {
-                message = AccessibilityHelpNLS.auto_off + '\n' + turnOnMessage;
-                message += '\n';
+            else {
+                this._hasAssignedKeybindings.reset();
             }
-        }
-        const exitThisDialogHint = verbose && !provider.options.position ? ( localizeWithPath(_moduleId, 6, '\n\nExit this dialog (Escape).')) : '';
-        let content = provider.provideContent();
-        if (provider.options.type === AccessibleViewType.Help) {
-            const resolvedContent = resolveContentAndKeybindingItems(this._keybindingService, content + readMoreLink + disableHelpHint + exitThisDialogHint);
-            if (resolvedContent) {
-                content = resolvedContent.content.value;
-                if (resolvedContent.configureKeybindingItems) {
-                    provider.options.configureKeybindingItems = resolvedContent.configureKeybindingItems;
-                }
+            if (resolvedContent.configuredKeybindingItems) {
+                provider.options.configuredKeybindingItems = resolvedContent.configuredKeybindingItems;
+                this._hasAssignedKeybindings.set(true);
+                configureAssignedKbHint = this._configureAssignedKbHint();
+            }
+            else {
+                this._hasAssignedKeybindings.reset();
             }
         }
-        const newContent = message + content;
-        this.calculateCodeBlocks(newContent);
-        this._currentContent = newContent;
+        this._currentContent = content + configureKbHint + configureAssignedKbHint;
+    }
+    _render(provider, container, showAccessibleViewHelp, updatedContent) {
+        this._currentProvider = provider;
+        this._accessibleViewCurrentProviderId.set(provider.id);
+        const verbose = this._verbosityEnabled();
+        this._updateContent(provider, updatedContent);
+        this.calculateCodeBlocks(this._currentContent);
         this._updateContextKeys(provider, true);
         const widgetIsFocused = this._editorWidget.hasTextFocus() || this._editorWidget.hasWidgetFocus();
         this._getTextModel(( (URI.from(
@@ -485,19 +498,18 @@ let AccessibleView = class AccessibleView extends Disposable {
             let actionsHint = '';
             const hasActions = this._accessibleViewSupportsNavigation.get() || this._accessibleViewVerbosityEnabled.get() || this._accessibleViewGoToSymbolSupported.get() || provider.actions?.length;
             if (verbose && !showAccessibleViewHelp && hasActions) {
-                actionsHint = provider.options.position ? ( localizeWithPath(
-                    _moduleId,
-                    7,
+                actionsHint = provider.options.position ? ( localize(
+                    1796,
                     'Explore actions such as disabling this hint (Shift+Tab), use Escape to exit this dialog.'
-                )) : ( localizeWithPath(_moduleId, 8, 'Explore actions such as disabling this hint (Shift+Tab).'));
+                )) : ( localize(1797, 'Explore actions such as disabling this hint (Shift+Tab).'));
             }
-            let ariaLabel = provider.options.type === AccessibleViewType.Help ? ( localizeWithPath(_moduleId, 9, "Accessibility Help")) : ( localizeWithPath(_moduleId, 10, "Accessible View"));
+            let ariaLabel = provider.options.type === AccessibleViewType.Help ? ( localize(1798, "Accessibility Help")) : ( localize(1799, "Accessible View"));
             this._title.textContent = ariaLabel;
             if (actionsHint && provider.options.type === AccessibleViewType.View) {
-                ariaLabel = ( localizeWithPath(_moduleId, 11, "Accessible View, {0}", actionsHint));
+                ariaLabel = ( localize(1800, "Accessible View, {0}", actionsHint));
             }
             else if (actionsHint) {
-                ariaLabel = ( localizeWithPath(_moduleId, 12, "Accessibility Help, {0}", actionsHint));
+                ariaLabel = ( localize(1801, "Accessibility Help, {0}", actionsHint));
             }
             if (isWindows && widgetIsFocused) {
                 ariaLabel = '';
@@ -527,6 +539,8 @@ let AccessibleView = class AccessibleView extends Disposable {
             this._updateContextKeys(provider, false);
             this._lastProvider = undefined;
             this._currentContent = undefined;
+            this._currentProvider?.dispose();
+            this._currentProvider = undefined;
         };
         const disposableStore = ( (new DisposableStore()));
         disposableStore.add(this._editorWidget.onKeyDown((e) => {
@@ -543,7 +557,7 @@ let AccessibleView = class AccessibleView extends Disposable {
                 e.preventDefault();
                 e.stopPropagation();
             }
-            if (provider instanceof AdvancedContentProvider) {
+            if (provider instanceof AccessibleContentProvider) {
                 provider.onKeyDown?.(e);
             }
         }));
@@ -563,7 +577,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         return disposableStore;
     }
     _updateToolbar(providedActions, type) {
-        this._toolbar.setAriaLabel(type === AccessibleViewType.Help ? ( localizeWithPath(_moduleId, 13, 'Accessibility Help')) : ( localizeWithPath(_moduleId, 14, "Accessible View")));
+        this._toolbar.setAriaLabel(type === AccessibleViewType.Help ? ( localize(1802, 'Accessibility Help')) : ( localize(1803, "Accessible View")));
         const menuActions = [];
         const toolbarMenu = this._register(this._menuService.createMenu(MenuId.AccessibleView, this._contextKeyService));
         createAndFillInActionBarActions(toolbarMenu, {}, menuActions);
@@ -596,14 +610,14 @@ 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 AdvancedContentProvider && !!this._currentProvider.getSymbols?.());
+        return this._currentProvider.options.type === AccessibleViewType.Help || this._currentProvider.options.language === 'markdown' || this._currentProvider.options.language === undefined || (this._currentProvider instanceof AccessibleContentProvider && !!this._currentProvider.getSymbols?.());
     }
     _updateLastProvider() {
         const provider = this._currentProvider;
         if (!provider) {
             return;
         }
-        const lastProvider = provider instanceof AdvancedContentProvider ? ( (new AdvancedContentProvider(
+        const lastProvider = provider instanceof AccessibleContentProvider ? ( (new AccessibleContentProvider(
             provider.id,
             provider.options,
             provider.provideContent.bind(provider),
@@ -611,8 +625,8 @@ let AccessibleView = class AccessibleView extends Disposable {
             provider.verbositySettingKey,
             provider.onOpen?.bind(provider),
             provider.actions,
-            provider.next?.bind(provider),
-            provider.previous?.bind(provider),
+            provider.provideNextContent?.bind(provider),
+            provider.providePreviousContent?.bind(provider),
             provider.onDidChangeContent?.bind(provider),
             provider.onKeyDown?.bind(provider),
             provider.getSymbols?.bind(provider)
@@ -622,8 +636,8 @@ let AccessibleView = class AccessibleView extends Disposable {
             provider.provideContent.bind(provider),
             provider.onClose.bind(provider),
             provider.onOpen?.bind(provider),
-            provider.next?.bind(provider),
-            provider.previous?.bind(provider),
+            provider.provideNextContent?.bind(provider),
+            provider.providePreviousContent?.bind(provider),
             provider.actions,
             provider.onDidChangeContent?.bind(provider)
         )));
@@ -634,25 +648,41 @@ let AccessibleView = class AccessibleView extends Disposable {
         if (!lastProvider) {
             return;
         }
-        const accessibleViewHelpProvider = {
-            id: lastProvider.id,
-            provideContent: () => lastProvider.options.customHelp ? lastProvider?.options.customHelp() : this._getAccessibleViewHelpDialogContent(this._goToSymbolsSupported()),
-            onClose: () => {
-                this._contextViewService.hideContextView();
-                queueMicrotask(() => this.show(lastProvider));
-            },
-            options: { type: AccessibleViewType.Help },
-            verbositySettingKey: lastProvider instanceof AdvancedContentProvider ? lastProvider.verbositySettingKey : undefined
-        };
+        let accessibleViewHelpProvider;
+        if (lastProvider instanceof AccessibleContentProvider) {
+            accessibleViewHelpProvider = ( (new AccessibleContentProvider(
+                lastProvider.id,
+                { type: AccessibleViewType.Help },
+                () => lastProvider.options.customHelp ? lastProvider?.options.customHelp() : this._accessibleViewHelpDialogContent(this._goToSymbolsSupported()),
+                () => {
+                    this._contextViewService.hideContextView();
+                    queueMicrotask(() => this.show(lastProvider));
+                },
+                lastProvider.verbositySettingKey
+            )));
+        }
+        else {
+            accessibleViewHelpProvider = ( (new ExtensionContentProvider(
+                lastProvider.id,
+                { type: AccessibleViewType.Help },
+                () => lastProvider.options.customHelp ? lastProvider?.options.customHelp() : this._accessibleViewHelpDialogContent(this._goToSymbolsSupported()),
+                () => {
+                    this._contextViewService.hideContextView();
+                    queueMicrotask(() => this.show(lastProvider));
+                }
+            )));
+        }
         this._contextViewService.hideContextView();
-        queueMicrotask(() => this.show(accessibleViewHelpProvider, undefined, true));
+        if (accessibleViewHelpProvider) {
+            queueMicrotask(() => this.show(accessibleViewHelpProvider, undefined, true));
+        }
     }
-    _getAccessibleViewHelpDialogContent(providerHasSymbols) {
-        const navigationHint = this._getNavigationHint();
-        const goToSymbolHint = this._getGoToSymbolHint(providerHasSymbols);
-        const toolbarHint = ( localizeWithPath(_moduleId, 15, "Navigate to the toolbar (Shift+Tab)."));
+    _accessibleViewHelpDialogContent(providerHasSymbols) {
+        const navigationHint = this._navigationHint();
+        const goToSymbolHint = this._goToSymbolHint(providerHasSymbols);
+        const toolbarHint = ( localize(1804, "Navigate to the toolbar (Shift+Tab)."));
         const chatHints = this._getChatHints();
-        let hint = ( localizeWithPath(_moduleId, 16, "In the accessible view, you can:\n"));
+        let hint = ( localize(1805, "In the accessible view, you can:\n"));
         if (navigationHint) {
             hint += ' - ' + navigationHint + '\n';
         }
@@ -671,50 +701,94 @@ let AccessibleView = class AccessibleView extends Disposable {
         if (this._currentProvider?.id !== AccessibleViewProviderId.Chat) {
             return;
         }
-        return [( localizeWithPath(
-            _moduleId,
-            17,
-            " - Insert the code block at the cursor<keybinding:workbench.action.chat.insertCodeBlock>."
+        return [( localize(
+            1806,
+            " - Insert the code block at the cursor{0}.",
+            '<keybinding:workbench.action.chat.insertCodeBlock>'
         )),
-            ( localizeWithPath(
-                _moduleId,
-                18,
-                " - Insert the code block into a new file<keybinding:workbench.action.chat.insertIntoNewFile>."
+            ( localize(
+                1807,
+                " - Insert the code block into a new file{0}.",
+                '<keybinding:workbench.action.chat.insertIntoNewFile>'
             )),
-            ( localizeWithPath(
-                _moduleId,
-                19,
-                " - Run the code block in the terminal<keybinding:'workbench.action.chat.runInTerminal>.\n"
+            ( localize(
+                1808,
+                " - Run the code block in the terminal{0}.\n",
+                '<keybinding:workbench.action.chat.runInTerminal>'
             ))].join('\n');
     }
-    _getNavigationHint() {
-        return ( localizeWithPath(
-            _moduleId,
-            20,
-            "Show the next item<keybinding:{0}> or previous item<keybinding:{1}>.",
-            AccessibilityCommandId.ShowNext,
-            AccessibilityCommandId.ShowPrevious
+    _navigationHint() {
+        return ( localize(
+            1809,
+            "Show the next item{0} or previous item{1}.",
+            `<keybinding:${AccessibilityCommandId.ShowNext}`,
+            `<keybinding:${AccessibilityCommandId.ShowPrevious}>`
         ));
     }
-    _getDisableVerbosityHint() {
-        return ( localizeWithPath(
-            _moduleId,
-            21,
-            "\n\nDisable accessibility verbosity for this feature<keybinding:{0}>.",
-            AccessibilityCommandId.DisableVerbosityHint
-        ));
+    _disableVerbosityHint(provider) {
+        if (provider.options.type === AccessibleViewType.Help && this._verbosityEnabled()) {
+            return ( localize(
+                1810,
+                "\nDisable accessibility verbosity for this feature{0}.",
+                `<keybinding:${AccessibilityCommandId.DisableVerbosityHint}>`
+            ));
+        }
+        return '';
     }
-    _getGoToSymbolHint(providerHasSymbols) {
+    _goToSymbolHint(providerHasSymbols) {
         if (!providerHasSymbols) {
             return;
         }
-        return ( localizeWithPath(
-            _moduleId,
-            22,
-            'Go to a symbol<keybinding:{0}>.',
-            AccessibilityCommandId.GoToSymbol
+        return ( localize(
+            1811,
+            'Go to a symbol{0}.',
+            `<keybinding:${AccessibilityCommandId.GoToSymbol}>`
         ));
     }
+    _configureUnassignedKbHint() {
+        const configureKb = this._keybindingService.lookupKeybinding(AccessibilityCommandId.AccessibilityHelpConfigureKeybindings)?.getAriaLabel();
+        const keybindingToConfigureQuickPick = configureKb ? '(' + configureKb + ')' : 'by assigning a keybinding to the command Accessibility Help Configure Unassigned Keybindings.';
+        return ( localize(
+            1812,
+            '\nConfigure keybindings for commands that lack them {0}.',
+            keybindingToConfigureQuickPick
+        ));
+    }
+    _configureAssignedKbHint() {
+        const configureKb = this._keybindingService.lookupKeybinding(AccessibilityCommandId.AccessibilityHelpConfigureAssignedKeybindings)?.getAriaLabel();
+        const keybindingToConfigureQuickPick = configureKb ? '(' + configureKb + ')' : 'by assigning a keybinding to the command Accessibility Help Configure Assigned Keybindings.';
+        return ( localize(
+            1813,
+            '\nConfigure keybindings for commands that already have assignments {0}.',
+            keybindingToConfigureQuickPick
+        ));
+    }
+    _screenReaderModeHint(provider) {
+        const accessibilitySupport = this._accessibilityService.isScreenReaderOptimized();
+        let screenReaderModeHint = '';
+        const turnOnMessage = (isMacintosh
+            ? AccessibilityHelpNLS.changeConfigToOnMac
+            : AccessibilityHelpNLS.changeConfigToOnWinLinux);
+        if (accessibilitySupport && provider.id === AccessibleViewProviderId.Editor) {
+            screenReaderModeHint = AccessibilityHelpNLS.auto_on;
+            screenReaderModeHint += '\n';
+        }
+        else if (!accessibilitySupport) {
+            screenReaderModeHint = AccessibilityHelpNLS.auto_off + '\n' + turnOnMessage;
+            screenReaderModeHint += '\n';
+        }
+        return screenReaderModeHint;
+    }
+    _exitDialogHint(provider) {
+        return this._verbosityEnabled() && !provider.options.position ? ( localize(1814, '\nExit this dialog (Escape).')) : '';
+    }
+    _readMoreHint(provider) {
+        return provider.options.readMoreUrl ? ( localize(
+            1815,
+            "\nOpen a browser window with more information related to accessibility{0}.",
+            `<keybinding:${AccessibilityCommandId.AccessibilityHelpOpenHelpLink}>`
+        )) : '';
+    }
 };
 AccessibleView = ( (__decorate([
     ( (__param(0, IOpenerService))),
@@ -745,8 +819,8 @@ let AccessibleViewService = class AccessibleViewService extends Disposable {
         }
         this._accessibleView.show(provider, undefined, undefined, position);
     }
-    configureKeybindings() {
-        this._accessibleView?.configureKeybindings();
+    configureKeybindings(unassigned) {
+        this._accessibleView?.configureKeybindings(unassigned);
     }
     openHelpLink() {
         this._accessibleView?.openHelpLink();
@@ -770,12 +844,11 @@ let AccessibleViewService = class AccessibleViewService extends Disposable {
         const keybinding = this._keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibleView)?.getAriaLabel();
         let hint = null;
         if (keybinding) {
-            hint = ( localizeWithPath(_moduleId, 23, "Inspect this in the accessible view with {0}", keybinding));
+            hint = ( localize(1816, "Inspect this in the accessible view with {0}", keybinding));
         }
         else {
-            hint = ( localizeWithPath(
-                _moduleId,
-                24,
+            hint = ( localize(
+                1817,
                 "Inspect this in the accessible view via the command Open Accessible View which is currently not triggerable via keybinding."
             ));
         }
@@ -820,8 +893,8 @@ let AccessibleViewSymbolQuickPick = class AccessibleViewSymbolQuickPick {
     }
     show(provider) {
         const quickPick = this._quickInputService.createQuickPick();
-        quickPick.placeholder = ( localizeWithPath(_moduleId, 25, "Type to search symbols"));
-        quickPick.title = ( localizeWithPath(_moduleId, 26, "Go to Symbol Accessible View"));
+        quickPick.placeholder = ( localize(1818, "Type to search symbols"));
+        quickPick.title = ( localize(1819, "Go to Symbol Accessible View"));
         const symbols = this._accessibleView.getSymbols();
         if (!symbols) {
             return;

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

@@ -20,11 +20,17 @@ class AccesibleViewContributions extends Disposable {
         AccessibleViewRegistry.getImplementations().forEach(impl => {
             const implementation = (accessor) => {
                 const provider = impl.getProvider(accessor);
-                if (provider) {
+                if (!provider) {
+                    return false;
+                }
+                try {
                     accessor.get(IAccessibleViewService).show(provider);
                     return true;
                 }
-                return false;
+                catch {
+                    provider.dispose();
+                    return false;
+                }
             };
             if (impl.type === AccessibleViewType.View) {
                 this._register(AccessibleViewAction.addImplementation(impl.priority, impl.name, implementation, impl.when));

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

@@ -1,11 +1,11 @@
 import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
-import { AccessibilityCommandId } from 'vscode/vscode/vs/workbench/contrib/accessibility/common/accessibilityCommands';
 
 function resolveContentAndKeybindingItems(keybindingService, value) {
     if (!value) {
         return;
     }
     const configureKeybindingItems = [];
+    const configuredKeybindingItems = [];
     const matches = value.matchAll(/\<keybinding:(?<commandId>.*)\>/gm);
     for (const match of [...matches]) {
         const commandId = match?.groups?.commandId;
@@ -13,9 +13,7 @@ function resolveContentAndKeybindingItems(keybindingService, value) {
         if (match?.length && commandId) {
             const keybinding = keybindingService.lookupKeybinding(commandId)?.getAriaLabel();
             if (!keybinding) {
-                const configureKb = keybindingService.lookupKeybinding(AccessibilityCommandId.AccessibilityHelpConfigureKeybindings)?.getAriaLabel();
-                const keybindingToConfigureQuickPick = configureKb ? '(' + configureKb + ')' : 'by assigning a keybinding to the command Accessibility Help Configure Keybindings.';
-                kbLabel = `, configure a keybinding ` + keybindingToConfigureQuickPick;
+                kbLabel = ` (unassigned keybinding)`;
                 configureKeybindingItems.push({
                     label: commandId,
                     id: commandId
@@ -23,13 +21,17 @@ function resolveContentAndKeybindingItems(keybindingService, value) {
             }
             else {
                 kbLabel = ' (' + keybinding + ')';
+                configuredKeybindingItems.push({
+                    label: commandId,
+                    id: commandId
+                });
             }
             value = value.replace(match[0], kbLabel);
         }
     }
     const content = ( new MarkdownString(value));
     content.isTrusted = true;
-    return { content, configureKeybindingItems: configureKeybindingItems.length ? configureKeybindingItems : undefined };
+    return { content, configureKeybindingItems: configureKeybindingItems.length ? configureKeybindingItems : undefined, configuredKeybindingItems: configuredKeybindingItems.length ? configuredKeybindingItems : undefined };
 }
 
 export { resolveContentAndKeybindingItems };

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

@@ -54,7 +54,6 @@ function registerAccessibilityHelpAction(keybindingService, viewDescriptor) {
                 () => viewsService.openView(viewDescriptor.id, true)
             ));
         },
-        dispose: () => { },
     }));
     disposableStore.add(keybindingService.onDidUpdateKeybindings(() => {
         disposableStore.clear();

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

@@ -6,9 +6,9 @@ import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs
 import { AccessibilitySignalLineDebuggerContribution } from './accessibilitySignalDebuggerContribution.js';
 import { ShowSignalSoundHelp, ShowAccessibilityAnnouncementHelp } from './commands.js';
 import { EditorTextPropertySignalsContribution } from './editorTextPropertySignalsContribution.js';
-import { wrapInReloadableClass } from './reloadableWorkbenchContribution.js';
+import { wrapInReloadableClass0 } from 'vscode/vscode/vs/platform/observable/common/wrapInReloadableClass';
 
-registerWorkbenchContribution2('EditorTextPropertySignalsContribution', wrapInReloadableClass(() => EditorTextPropertySignalsContribution), WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2('EditorTextPropertySignalsContribution', wrapInReloadableClass0(() => EditorTextPropertySignalsContribution), WorkbenchPhase.AfterRestored);
 registerWorkbenchContribution2('AccessibilitySignalLineDebuggerContribution', AccessibilitySignalLineDebuggerContribution, WorkbenchPhase.AfterRestored);
 registerAction2(ShowSignalSoundHelp);
 registerAction2(ShowAccessibilityAnnouncementHelp);

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

@@ -1,6 +1,6 @@
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility.service';
 import { Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { AccessibilitySignal, AcknowledgeDocCommentsToken } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
@@ -9,18 +9,16 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/preferences/common/preferences.service';
 
-const _moduleId = "vs/workbench/contrib/accessibilitySignals/browser/commands";
 class ShowSignalSoundHelp extends Action2 {
     static { this.ID = 'signals.sounds.help'; }
     constructor() {
         super({
             id: ShowSignalSoundHelp.ID,
-            title: ( localize2WithPath(_moduleId, 0, "Help: List Signal Sounds")),
+            title: ( localize2(5579, "Help: List Signal Sounds")),
             f1: true,
             metadata: {
-                description: ( localizeWithPath(
-                    _moduleId,
-                    1,
+                description: ( localize(
+                    5580,
                     "List all accessibility sounds, noises, or audio cues and configure their settings"
                 ))
             }
@@ -38,7 +36,7 @@ class ShowSignalSoundHelp extends Action2 {
             signal,
             buttons: userGestureSignals.includes(signal) ? [{
                     iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-                    tooltip: ( localizeWithPath(_moduleId, 2, 'Configure Sound')),
+                    tooltip: ( localize(5581, 'Configure Sound')),
                     alwaysVisible: true
                 }] : []
         })))).sort((a, b) => a.label.localeCompare(b.label));
@@ -72,7 +70,7 @@ class ShowSignalSoundHelp extends Action2 {
         qp.onDidChangeActive(() => {
             accessibilitySignalService.playSound(qp.activeItems[0].signal.sound.getSound(true), true, AcknowledgeDocCommentsToken);
         });
-        qp.placeholder = ( localizeWithPath(_moduleId, 3, 'Select a sound to play and configure'));
+        qp.placeholder = ( localize(5582, 'Select a sound to play and configure'));
         qp.canSelectMany = true;
         await qp.show();
     }
@@ -85,12 +83,11 @@ class ShowAccessibilityAnnouncementHelp extends Action2 {
     constructor() {
         super({
             id: ShowAccessibilityAnnouncementHelp.ID,
-            title: ( localize2WithPath(_moduleId, 4, "Help: List Signal Announcements")),
+            title: ( localize2(5583, "Help: List Signal Announcements")),
             f1: true,
             metadata: {
-                description: ( localizeWithPath(
-                    _moduleId,
-                    5,
+                description: ( localize(
+                    5584,
                     "List all accessibility announcements, alerts, braille messages, and configure their settings"
                 ))
             }
@@ -108,7 +105,7 @@ class ShowAccessibilityAnnouncementHelp extends Action2 {
             signal,
             buttons: userGestureSignals.includes(signal) ? [{
                     iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-                    tooltip: ( localizeWithPath(_moduleId, 6, 'Configure Announcement')),
+                    tooltip: ( localize(5585, 'Configure Announcement')),
                     alwaysVisible: true,
                 }] : []
         })))).sort((a, b) => a.label.localeCompare(b.label));
@@ -139,9 +136,8 @@ class ShowAccessibilityAnnouncementHelp extends Action2 {
         qp.onDidTriggerItemButton(e => {
             preferencesService.openUserSettings({ jsonEditor: true, revealSetting: { key: e.item.signal.settingsKey, edit: true } });
         });
-        qp.placeholder = screenReaderOptimized ? ( localizeWithPath(_moduleId, 7, 'Select an announcement to configure')) : ( localizeWithPath(
-            _moduleId,
-            8,
+        qp.placeholder = screenReaderOptimized ? ( localize(5586, 'Select an announcement to configure')) : ( localize(
+            5587,
             'Screen reader is not active, announcements are disabled by default.'
         ));
         qp.canSelectMany = true;

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

@@ -58,7 +58,7 @@ let EditorTextPropertySignalsContribution = class EditorTextPropertySignalsContr
     _registerAccessibilitySignalsForEditor(editor, editorModel, store) {
         let lastLine = -1;
         const ignoredLineSignalsForCurrentLine = ( new Set());
-        const timeouts = ( new DisposableStore());
+        const timeouts = store.add(( new DisposableStore()));
         const propertySources = ( this._textProperties.map(p => ({ source: p.createSource(editor, editorModel), property: p })));
         const didType = wasEventTriggeredRecently(editor.onDidChangeModelContent, 100, store);
         store.add(editor.onDidChangeCursorPosition(args => {

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

@@ -1,14 +1,13 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { isDiffEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility.service';
 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';
 
-const _moduleId = "vs/workbench/contrib/accessibilitySignals/browser/openDiffEditorAnnouncement";
 let DiffEditorActiveAnnouncementContribution = class DiffEditorActiveAnnouncementContribution extends Disposable {
     static { this.ID = 'workbench.contrib.diffEditorActiveAnnouncement'; }
     constructor(_editorService, _accessibilityService, _configurationService) {
@@ -36,7 +35,7 @@ let DiffEditorActiveAnnouncementContribution = class DiffEditorActiveAnnouncemen
         }
         this._onDidActiveEditorChangeListener = this._register(this._editorService.onDidActiveEditorChange(() => {
             if (isDiffEditor(this._editorService.activeTextEditorControl)) {
-                this._accessibilityService.alert(( localizeWithPath(_moduleId, 0, "Diff editor")));
+                this._accessibilityService.alert(( localize(5578, "Diff editor")));
             }
         }));
     }

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

@@ -1,5 +1,5 @@
 import './accessibility.css.js';
-import { localize2WithPath } from 'vscode/vscode/vs/nls';
+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';
@@ -10,16 +10,14 @@ 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';
 
-const _moduleId = "vs/workbench/contrib/codeEditor/browser/accessibility/accessibility";
 class ToggleScreenReaderMode extends Action2 {
     constructor() {
         super({
             id: 'editor.action.toggleScreenReaderAccessibilityMode',
-            title: ( localize2WithPath(_moduleId, 0, "Toggle Screen Reader Accessibility Mode")),
+            title: ( localize2(1869, "Toggle Screen Reader Accessibility Mode")),
             metadata: {
-                description: ( localize2WithPath(
-                    _moduleId,
-                    1,
+                description: ( localize2(
+                    1870,
                     "Toggles an optimized mode for usage with screen readers, braille devices, and other assistive technologies."
                 )),
             },

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

@@ -1,42 +0,0 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { isHotReloadEnabled } from 'vscode/vscode/vs/base/common/hotReload';
-import 'vscode/vscode/vs/base/common/arrays';
-import 'vscode/vscode/vs/base/common/observableInternal/derived';
-import { autorunWithStore } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
-import 'vscode/vscode/vs/base/common/observableInternal/utils';
-import 'vscode/vscode/vs/base/common/cancellation';
-import { readHotReloadableExport } from 'vscode/vscode/vs/editor/browser/widget/diffEditor/utils';
-import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-
-function wrapInReloadableClass(getClass) {
-    if (!isHotReloadEnabled()) {
-        return getClass();
-    }
-    return class ReloadableWrapper extends BaseClass {
-        constructor() {
-            super(...arguments);
-            this._autorun = undefined;
-        }
-        init() {
-            this._autorun = autorunWithStore((reader, store) => {
-                const clazz = readHotReloadableExport(getClass(), reader);
-                store.add(this.instantiationService.createInstance(clazz));
-            });
-        }
-        dispose() {
-            this._autorun?.dispose();
-        }
-    };
-}
-let BaseClass = class BaseClass {
-    constructor(instantiationService) {
-        this.instantiationService = instantiationService;
-        this.init();
-    }
-    init() { }
-};
-BaseClass = ( __decorate([
-    ( __param(0, IInstantiationService))
-], BaseClass));
-
-export { wrapInReloadableClass };