@codingame/monaco-vscode-accessibility-service-override 11.1.2 → 12.0.0

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

@@ -1,6 +1,8 @@
+
 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';
 
@@ -31,7 +33,7 @@ class AccesibleViewContributions extends Disposable {
                     return false;
                 }
             };
-            if (impl.type === "view" ) {
+            if (impl.type === AccessibleViewType.View) {
                 this._register(AccessibleViewAction.addImplementation(impl.priority, impl.name, implementation, impl.when));
             }
             else {

package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleViewKeybindingResolver.d.ts

@@ -0,0 +1,8 @@
+import { MarkdownString } from "vscode/vscode/vs/base/common/htmlContent";
+import { IKeybindingService } from "vscode/vscode/vs/platform/keybinding/common/keybinding.service";
+import { IPickerQuickAccessItem } from "@codingame/monaco-vscode-219d9a5f-b446-507b-a188-1178a0867c75-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess";
+export declare function resolveContentAndKeybindingItems(keybindingService: IKeybindingService, value?: string): {
+    content: MarkdownString;
+    configureKeybindingItems: IPickerQuickAccessItem[] | undefined;
+    configuredKeybindingItems: IPickerQuickAccessItem[] | undefined;
+} | undefined;

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

@@ -1,3 +1,4 @@
+
 import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
 
 function resolveContentAndKeybindingItems(keybindingService, value) {

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

@@ -0,0 +1,7 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IKeybindingService } from "vscode/vscode/vs/platform/keybinding/common/keybinding.service";
+export declare class ExtensionAccessibilityHelpDialogContribution extends Disposable {
+    static ID: string;
+    private _viewHelpDialogMap;
+    constructor(keybindingService: IKeybindingService);
+}

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

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

package/vscode/src/vs/workbench/contrib/accessibility/browser/unfocusedViewDimmingContribution.d.ts

@@ -0,0 +1,10 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+export declare class UnfocusedViewDimmingContribution extends Disposable implements IWorkbenchContribution {
+    private _styleElement?;
+    private _styleElementDisposables;
+    constructor(configurationService: IConfigurationService);
+    private _getStyleElement;
+    private _removeStyleElement;
+}

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

@@ -1,9 +1,11 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { createStyleSheet } from 'vscode/vscode/vs/base/browser/dom';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
+import { createStyleSheet } from 'vscode/vscode/vs/base/browser/domStylesheets';
 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) {
@@ -11,13 +13,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("accessibility.dimUnfocused.enabled" ) && !e.affectsConfiguration("accessibility.dimUnfocused.opacity" )) {
+            if (e && !e.affectsConfiguration(AccessibilityWorkbenchSettingId.DimUnfocusedEnabled) && !e.affectsConfiguration(AccessibilityWorkbenchSettingId.DimUnfocusedOpacity)) {
                 return;
             }
             let cssTextContent = '';
-            const enabled = ensureBoolean(configurationService.getValue("accessibility.dimUnfocused.enabled" ), false);
+            const enabled = ensureBoolean(configurationService.getValue(AccessibilityWorkbenchSettingId.DimUnfocusedEnabled), false);
             if (enabled) {
-                const opacity = clamp(ensureNumber(configurationService.getValue("accessibility.dimUnfocused.opacity" ), 0.75 ), 0.2 , 1 );
+                const opacity = clamp(ensureNumber(configurationService.getValue(AccessibilityWorkbenchSettingId.DimUnfocusedOpacity), ViewDimUnfocusedOpacityProperties.Default), ViewDimUnfocusedOpacityProperties.Minimum, ViewDimUnfocusedOpacityProperties.Maximum);
                 if (opacity !== 1) {
                     const rules = ( new Set());
                     const filterRule = `filter: opacity(${opacity});`;

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

@@ -0,0 +1 @@
+export {};

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

@@ -1,13 +1,15 @@
+
 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 { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
+import { registerWorkbenchContribution2, WorkbenchPhase } 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), 3 );
-registerWorkbenchContribution2('AccessibilitySignalLineDebuggerContribution', AccessibilitySignalLineDebuggerContribution, 3 );
+registerWorkbenchContribution2('EditorTextPropertySignalsContribution', wrapInReloadableClass0(() => EditorTextPropertySignalsContribution), WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2('AccessibilitySignalLineDebuggerContribution', AccessibilitySignalLineDebuggerContribution, WorkbenchPhase.AfterRestored);
 registerAction2(ShowSignalSoundHelp);
 registerAction2(ShowAccessibilityAnnouncementHelp);

package/vscode/src/vs/workbench/contrib/accessibilitySignals/browser/accessibilitySignalDebuggerContribution.d.ts

@@ -0,0 +1,9 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { AccessibilitySignalService } from "vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+import { IDebugService } from "vscode/vscode/vs/workbench/contrib/debug/common/debug.service";
+export declare class AccessibilitySignalLineDebuggerContribution extends Disposable implements IWorkbenchContribution {
+    private readonly accessibilitySignalService;
+    constructor(debugService: IDebugService, accessibilitySignalService: AccessibilitySignalService);
+    private handleSession;
+}

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import 'vscode/vscode/vs/base/common/arrays';
 import 'vscode/vscode/vs/base/common/event';

package/vscode/src/vs/workbench/contrib/accessibilitySignals/browser/commands.d.ts

@@ -0,0 +1,12 @@
+import { Action2 } from "vscode/vscode/vs/platform/actions/common/actions";
+import { ServicesAccessor } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+export declare class ShowSignalSoundHelp extends Action2 {
+    static readonly ID = "signals.sounds.help";
+    constructor();
+    run(accessor: ServicesAccessor): Promise<void>;
+}
+export declare class ShowAccessibilityAnnouncementHelp extends Action2 {
+    static readonly ID = "accessibility.announcement.help";
+    constructor();
+    run(accessor: ServicesAccessor): Promise<void>;
+}

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

@@ -1,3 +1,4 @@
+
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { localize2, localize } from 'vscode/vscode/vs/nls';
@@ -15,11 +16,11 @@ class ShowSignalSoundHelp extends Action2 {
     constructor() {
         super({
             id: ShowSignalSoundHelp.ID,
-            title: ( localize2(5567, "Help: List Signal Sounds")),
+            title: ( localize2(4051, "Help: List Signal Sounds")),
             f1: true,
             metadata: {
                 description: ( localize(
-                    5568,
+                    4052,
                     "List all accessibility sounds, noises, or audio cues and configure their settings"
                 ))
             }
@@ -32,22 +33,22 @@ class ShowSignalSoundHelp extends Action2 {
         const accessibilityService = accessor.get(IAccessibilityService);
         const preferencesService = accessor.get(IPreferencesService);
         const userGestureSignals = [AccessibilitySignal.save, AccessibilitySignal.format];
-        const items = ( (AccessibilitySignal.allAccessibilitySignals.map((signal, idx) => ({
+        const items = ( AccessibilitySignal.allAccessibilitySignals.map((signal, idx) => ({
             label: userGestureSignals.includes(signal) ? `${signal.name} (${configurationService.getValue(signal.settingsKey + '.sound')})` : signal.name,
             signal,
             buttons: userGestureSignals.includes(signal) ? [{
                     iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-                    tooltip: ( localize(5569, 'Configure Sound')),
+                    tooltip: ( localize(4053, 'Configure Sound')),
                     alwaysVisible: true
                 }] : []
-        })))).sort((a, b) => a.label.localeCompare(b.label));
-        const disposables = ( (new DisposableStore()));
+        }))).sort((a, b) => a.label.localeCompare(b.label));
+        const disposables = ( new DisposableStore());
         const qp = disposables.add(quickInputService.createQuickPick());
         qp.items = items;
         qp.selectedItems = items.filter(i => accessibilitySignalService.isSoundEnabled(i.signal) || userGestureSignals.includes(i.signal) && configurationService.getValue(i.signal.settingsKey + '.sound') !== 'never');
         disposables.add(qp.onDidAccept(() => {
-            const enabledSounds = ( (qp.selectedItems.map(i => i.signal)));
-            const disabledSounds = ( (qp.items.map(i => i.signal))).filter(i => !enabledSounds.includes(i));
+            const enabledSounds = ( qp.selectedItems.map(i => i.signal));
+            const disabledSounds = ( qp.items.map(i => i.signal)).filter(i => !enabledSounds.includes(i));
             for (const signal of enabledSounds) {
                 let { sound, announcement } = configurationService.getValue(signal.settingsKey);
                 sound = userGestureSignals.includes(signal) ? 'userGesture' : accessibilityService.isScreenReaderOptimized() ? 'auto' : 'on';
@@ -73,7 +74,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(5570, 'Select a sound to play and configure'));
+        qp.placeholder = ( localize(4054, 'Select a sound to play and configure'));
         qp.canSelectMany = true;
         await qp.show();
     }
@@ -86,11 +87,11 @@ class ShowAccessibilityAnnouncementHelp extends Action2 {
     constructor() {
         super({
             id: ShowAccessibilityAnnouncementHelp.ID,
-            title: ( localize2(5571, "Help: List Signal Announcements")),
+            title: ( localize2(4055, "Help: List Signal Announcements")),
             f1: true,
             metadata: {
                 description: ( localize(
-                    5572,
+                    4056,
                     "List all accessibility announcements, alerts, braille messages, and configure their settings"
                 ))
             }
@@ -103,16 +104,16 @@ class ShowAccessibilityAnnouncementHelp extends Action2 {
         const accessibilityService = accessor.get(IAccessibilityService);
         const preferencesService = accessor.get(IPreferencesService);
         const userGestureSignals = [AccessibilitySignal.save, AccessibilitySignal.format];
-        const items = ( (AccessibilitySignal.allAccessibilitySignals.filter(c => !!c.legacyAnnouncementSettingsKey).map((signal, idx) => ({
+        const items = ( AccessibilitySignal.allAccessibilitySignals.filter(c => !!c.legacyAnnouncementSettingsKey).map((signal, idx) => ({
             label: userGestureSignals.includes(signal) ? `${signal.name} (${configurationService.getValue(signal.settingsKey + '.announcement')})` : signal.name,
             signal,
             buttons: userGestureSignals.includes(signal) ? [{
                     iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-                    tooltip: ( localize(5573, 'Configure Announcement')),
+                    tooltip: ( localize(4057, 'Configure Announcement')),
                     alwaysVisible: true,
                 }] : []
-        })))).sort((a, b) => a.label.localeCompare(b.label));
-        const disposables = ( (new DisposableStore()));
+        }))).sort((a, b) => a.label.localeCompare(b.label));
+        const disposables = ( new DisposableStore());
         const qp = disposables.add(quickInputService.createQuickPick());
         qp.items = items;
         qp.selectedItems = items.filter(i => accessibilitySignalService.isAnnouncementEnabled(i.signal) || userGestureSignals.includes(i.signal) && configurationService.getValue(i.signal.settingsKey + '.announcement') !== 'never');
@@ -122,7 +123,7 @@ class ShowAccessibilityAnnouncementHelp extends Action2 {
                 qp.hide();
                 return;
             }
-            const enabledAnnouncements = ( (qp.selectedItems.map(i => i.signal)));
+            const enabledAnnouncements = ( qp.selectedItems.map(i => i.signal));
             const disabledAnnouncements = AccessibilitySignal.allAccessibilitySignals.filter(cue => !!cue.legacyAnnouncementSettingsKey && !enabledAnnouncements.includes(cue));
             for (const signal of enabledAnnouncements) {
                 let { sound, announcement } = configurationService.getValue(signal.settingsKey);
@@ -141,8 +142,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(5574, 'Select an announcement to configure')) : ( localize(
-            5575,
+        qp.placeholder = screenReaderOptimized ? ( localize(4058, 'Select an announcement to configure')) : ( localize(
+            4059,
             'Screen reader is not active, announcements are disabled by default.'
         ));
         qp.canSelectMany = true;

package/vscode/src/vs/workbench/contrib/accessibilitySignals/browser/editorTextPropertySignalsContribution.d.ts

@@ -0,0 +1,15 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IAccessibilitySignalService } from "vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+import { IEditorService } from "vscode/vscode/vs/workbench/services/editor/common/editorService.service";
+export declare class EditorTextPropertySignalsContribution extends Disposable implements IWorkbenchContribution {
+    private readonly _editorService;
+    private readonly _instantiationService;
+    private readonly _accessibilitySignalService;
+    private readonly _textProperties;
+    private readonly _someAccessibilitySignalIsEnabled;
+    private readonly _activeEditorObservable;
+    constructor(_editorService: IEditorService, _instantiationService: IInstantiationService, _accessibilitySignalService: IAccessibilitySignalService);
+    private _registerAccessibilitySignalsForEditor;
+}

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 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';
@@ -9,6 +10,7 @@ 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';
@@ -64,8 +66,8 @@ let EditorTextPropertySignalsContribution = class EditorTextPropertySignalsContr
         store.add(editor.onDidChangeCursorPosition(args => {
             timeouts.clear();
             if (args &&
-                args.reason !== 3  &&
-                args.reason !== 0 ) {
+                args.reason !== CursorChangeReason.Explicit &&
+                args.reason !== CursorChangeReason.NotSet) {
                 ignoredLineSignalsForCurrentLine.clear();
                 return;
             }

package/vscode/src/vs/workbench/contrib/accessibilitySignals/browser/openDiffEditorAnnouncement.d.ts

@@ -0,0 +1,14 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IAccessibilityService } from "vscode/vscode/vs/platform/accessibility/common/accessibility.service";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+import { IEditorService } from "vscode/vscode/vs/workbench/services/editor/common/editorService.service";
+export declare class DiffEditorActiveAnnouncementContribution extends Disposable implements IWorkbenchContribution {
+    private readonly _editorService;
+    private readonly _accessibilityService;
+    private readonly _configurationService;
+    static readonly ID = "workbench.contrib.diffEditorActiveAnnouncement";
+    private _onDidActiveEditorChangeListener?;
+    constructor(_editorService: IEditorService, _accessibilityService: IAccessibilityService, _configurationService: IConfigurationService);
+    private _updateListener;
+}

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { isDiffEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
 import { localize } from 'vscode/vscode/vs/nls';
@@ -6,6 +7,7 @@ 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'; }
@@ -16,13 +18,13 @@ let DiffEditorActiveAnnouncementContribution = class DiffEditorActiveAnnouncemen
         this._configurationService = _configurationService;
         this._register(Event.runAndSubscribe(_accessibilityService.onDidChangeScreenReaderOptimized, () => this._updateListener()));
         this._register(_configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration("accessibility.verbosity.diffEditorActive" )) {
+            if (e.affectsConfiguration(AccessibilityVerbositySettingId.DiffEditorActive)) {
                 this._updateListener();
             }
         }));
     }
     _updateListener() {
-        const announcementEnabled = this._configurationService.getValue("accessibility.verbosity.diffEditorActive" );
+        const announcementEnabled = this._configurationService.getValue(AccessibilityVerbositySettingId.DiffEditorActive);
         const screenReaderOptimized = this._accessibilityService.isScreenReaderOptimized();
         if (!announcementEnabled || !screenReaderOptimized) {
             this._onDidActiveEditorChangeListener?.dispose();
@@ -34,15 +36,15 @@ let DiffEditorActiveAnnouncementContribution = class DiffEditorActiveAnnouncemen
         }
         this._onDidActiveEditorChangeListener = this._register(this._editorService.onDidActiveEditorChange(() => {
             if (isDiffEditor(this._editorService.activeTextEditorControl)) {
-                this._accessibilityService.alert(( localize(5566, "Diff editor")));
+                this._accessibilityService.alert(( localize(4060, "Diff editor")));
             }
         }));
     }
 };
-DiffEditorActiveAnnouncementContribution = ( (__decorate([
-    ( (__param(0, IEditorService))),
-    ( (__param(1, IAccessibilityService))),
-    ( (__param(2, IConfigurationService)))
-], DiffEditorActiveAnnouncementContribution)));
+DiffEditorActiveAnnouncementContribution = ( __decorate([
+    ( __param(0, IEditorService)),
+    ( __param(1, IAccessibilityService)),
+    ( __param(2, IConfigurationService))
+], DiffEditorActiveAnnouncementContribution));
 
 export { DiffEditorActiveAnnouncementContribution };

package/vscode/src/vs/workbench/contrib/accessibilitySignals/browser/saveAccessibilitySignal.d.ts

@@ -0,0 +1,10 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IAccessibilitySignalService } from "vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+import { IWorkingCopyService } from "vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service";
+export declare class SaveAccessibilitySignalContribution extends Disposable implements IWorkbenchContribution {
+    private readonly _accessibilitySignalService;
+    private readonly _workingCopyService;
+    static readonly ID = "workbench.contrib.saveAccessibilitySignal";
+    constructor(_accessibilitySignalService: IAccessibilitySignalService, _workingCopyService: IWorkingCopyService);
+}

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

@@ -1,7 +1,9 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 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 {
@@ -10,7 +12,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 === 1  })));
+        this._register(this._workingCopyService.onDidSave(e => this._accessibilitySignalService.playSignal(AccessibilitySignal.save, { userGesture: e.reason === SaveReason.EXPLICIT })));
     }
 };
 SaveAccessibilitySignalContribution = ( __decorate([

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

@@ -1,4 +1,4 @@
-import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
+import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css';
 
 var css = ".accessible-view{background-color:var(--vscode-editorWidget-background);border:2px solid var(--vscode-focusBorder);border-radius:6px;box-shadow:0 2px 8px var(--vscode-widget-shadow);color:var(--vscode-editorWidget-foreground);margin-top:-1px;position:absolute;z-index:2550}.accessible-view-container .actions-container{display:flex;justify-content:flex-end;margin:0 auto;padding:0;width:100%}.accessible-view-title-bar{align-items:center;border-top-left-radius:5px;border-top-right-radius:5px;display:flex}.accessible-view-title{overflow:hidden;padding:3px 0;text-align:center;text-overflow:ellipsis;width:100%}.accessible-view-action-bar{flex:1;justify-content:flex-end;margin-right:4px}.accessible-view-action-bar>.actions-container{justify-content:flex-end}.accessible-view-title-bar .monaco-action-bar .action-label.codicon{background-position:50%;background-repeat:no-repeat;padding:2px}.accessible-view.hide{left:-2000px;pointer-events:none;position:fixed;top:-2000px}";
 n(css,{});

package/vscode/src/vs/workbench/contrib/codeEditor/browser/accessibility/accessibility.d.ts

@@ -0,0 +1 @@
+

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

@@ -1,9 +1,13 @@
+
 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';
 
@@ -11,23 +15,23 @@ class ToggleScreenReaderMode extends Action2 {
     constructor() {
         super({
             id: 'editor.action.toggleScreenReaderAccessibilityMode',
-            title: ( localize2(2337, "Toggle Screen Reader Accessibility Mode")),
+            title: ( localize2(4654, "Toggle Screen Reader Accessibility Mode")),
             metadata: {
                 description: ( localize2(
-                    2338,
+                    4655,
                     "Toggles an optimized mode for usage with screen readers, braille devices, and other assistive technologies."
                 )),
             },
             f1: true,
             keybinding: [{
-                    primary: 2048  | 35 ,
-                    weight: 200  + 10,
+                    primary: KeyMod.CtrlCmd | KeyCode.KeyE,
+                    weight: KeybindingWeight.WorkbenchContrib + 10,
                     when: accessibilityHelpIsShown
                 },
                 {
-                    primary: 512  | 59  | 1024 ,
-                    linux: { primary: 512  | 62  | 1024  },
-                    weight: 200  + 10,
+                    primary: KeyMod.Alt | KeyCode.F1 | KeyMod.Shift,
+                    linux: { primary: KeyMod.Alt | KeyCode.F4 | KeyMod.Shift },
+                    weight: KeybindingWeight.WorkbenchContrib + 10,
                 }]
         });
     }
@@ -35,7 +39,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', 2 );
+        configurationService.updateValue('editor.accessibilitySupport', isScreenReaderOptimized ? 'off' : 'on', ConfigurationTarget.USER);
         alert(isScreenReaderOptimized ? AccessibilityHelpNLS.screenReaderModeDisabled : AccessibilityHelpNLS.screenReaderModeEnabled);
     }
 }

package/vscode/src/vs/workbench/contrib/speech/browser/speechAccessibilitySignal.d.ts

@@ -0,0 +1,10 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IAccessibilitySignalService } from "vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+import { ISpeechService } from "vscode/vscode/vs/workbench/contrib/speech/common/speechService.service";
+export declare class SpeechAccessibilitySignalContribution extends Disposable implements IWorkbenchContribution {
+    private readonly _accessibilitySignalService;
+    private readonly _speechService;
+    static readonly ID = "workbench.contrib.speechAccessibilitySignal";
+    constructor(_accessibilitySignalService: IAccessibilitySignalService, _speechService: ISpeechService);
+}

package/vscode/src/vs/workbench/contrib/speech/browser/speechAccessibilitySignal.js

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 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';

package/vscode/src/vs/workbench/services/accessibility/common/accessibleViewInformationService.d.ts

@@ -0,0 +1,9 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { IAccessibleViewInformationService } from "vscode/vscode/vs/workbench/services/accessibility/common/accessibleViewInformationService.service";
+export declare class AccessibleViewInformationService extends Disposable implements IAccessibleViewInformationService {
+    private readonly _storageService;
+    readonly _serviceBrand: undefined;
+    constructor(_storageService: IStorageService);
+    hasShownAccessibleView(viewId: string): boolean;
+}

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

@@ -1,6 +1,8 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 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 {
@@ -9,7 +11,7 @@ let AccessibleViewInformationService = class AccessibleViewInformationService ex
         this._storageService = _storageService;
     }
     hasShownAccessibleView(viewId) {
-        return this._storageService.getBoolean(`${ACCESSIBLE_VIEW_SHOWN_STORAGE_PREFIX}${viewId}`, -1 , false) === true;
+        return this._storageService.getBoolean(`${ACCESSIBLE_VIEW_SHOWN_STORAGE_PREFIX}${viewId}`, StorageScope.APPLICATION, false) === true;
     }
 };
 AccessibleViewInformationService = ( __decorate([

package/accessibility.js

@@ -1,26 +0,0 @@
-import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { AccessibleViewService } from './vscode/src/vs/workbench/contrib/accessibility/browser/accessibleView.js';
-import { AccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import audioAssets from './vscode/src/vs/platform/accessibilitySignal/browser/media/all.mp3.js';
-import { IAccessibleViewService } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView.service';
-import { IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
-import { IAccessibleViewInformationService } from 'vscode/vscode/vs/workbench/services/accessibility/common/accessibleViewInformationService.service';
-import { AccessibleViewInformationService } from './vscode/src/vs/workbench/services/accessibility/common/accessibleViewInformationService.js';
-import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility.service';
-import { AccessibilityService } from 'vscode/vscode/vs/platform/accessibility/browser/accessibilityService';
-import { registerAssets } from 'vscode/assets';
-import './vscode/src/vs/workbench/contrib/accessibility/browser/accessibility.contribution.js';
-import './vscode/src/vs/workbench/contrib/codeEditor/browser/accessibility/accessibility.js';
-import './vscode/src/vs/workbench/contrib/accessibilitySignals/browser/accessibilitySignal.contribution.js';
-
-registerAssets(audioAssets);
-function getServiceOverride() {
-    return {
-        [( IAccessibleViewService.toString())]: new SyncDescriptor(AccessibleViewService, [], true),
-        [( IAccessibilitySignalService.toString())]: new SyncDescriptor(AccessibilitySignalService, [], true),
-        [( IAccessibilityService.toString())]: new SyncDescriptor(AccessibilityService, [], true),
-        [( IAccessibleViewInformationService.toString())]: new SyncDescriptor(AccessibleViewInformationService, [], true)
-    };
-}
-
-export { getServiceOverride as default };