@codingame/monaco-vscode-accessibility-service-override 26.2.2 → 28.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-accessibility-service-override",
-  "version": "26.2.2",
+  "version": "28.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - accessibility service-override",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "26.2.2",
+    "@codingame/monaco-vscode-api": "28.0.0",
     "marked": "14.0.0"
   },
   "main": "index.js",

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

@@ -53,21 +53,21 @@ let AccessibilityStatus = class AccessibilityStatus extends Disposable {
     }
     showScreenReaderNotification() {
         this.screenReaderNotification = this.notificationService.prompt(Severity.Info, ( localize(
-            4386,
+            4478,
             "Screen reader usage detected. Do you want to enable {0} to optimize the editor for screen reader usage?",
             "editor.accessibilitySupport"
         )), [{
-            label: ( localize(4387, "Yes")),
+            label: ( localize(4479, "Yes")),
             run: () => {
                 this.configurationService.updateValue("editor.accessibilitySupport", "on", ConfigurationTarget.USER);
             }
         }, {
-            label: ( localize(4388, "No")),
+            label: ( localize(4480, "No")),
             run: () => {
                 this.configurationService.updateValue("editor.accessibilitySupport", "off", ConfigurationTarget.USER);
             }
         }, {
-            label: ( localize(4389, "Learn More")),
+            label: ( localize(4481, "Learn More")),
             run: () => {
                 this.openerService.open("https://code.visualstudio.com/docs/editor/accessibility#_screen-readers");
             }
@@ -80,9 +80,9 @@ let AccessibilityStatus = class AccessibilityStatus extends Disposable {
     updateScreenReaderModeElement(visible) {
         if (visible) {
             if (!this.screenReaderModeElement.value) {
-                const text = ( localize(4390, "Screen Reader Optimized"));
+                const text = ( localize(4482, "Screen Reader Optimized"));
                 this.screenReaderModeElement.value = this.statusbarService.addEntry({
-                    name: ( localize(4391, "Screen Reader Mode")),
+                    name: ( localize(4483, "Screen Reader Mode")),
                     text,
                     ariaLabel: text,
                     command: "showEditorScreenReaderNotification",

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

@@ -58,6 +58,7 @@ export declare class AccessibleView extends Disposable {
     private _currentProvider;
     private _currentContent;
     private _lastProvider;
+    private _lastProviderPosition;
     private _viewContainer;
     constructor(_openerService: IOpenerService, _instantiationService: IInstantiationService, _configurationService: IConfigurationService, _modelService: IModelService, _contextViewService: IContextViewService, _contextKeyService: IContextKeyService, _accessibilityService: IAccessibilityService, _keybindingService: IKeybindingService, _layoutService: ILayoutService, _menuService: IMenuService, _commandService: ICommandService, _codeBlockContextProviderService: IChatCodeBlockContextProviderService, _storageService: IStorageService, _quickInputService: IQuickInputService, _accessibilitySignalService: IAccessibilitySignalService);
     private _playDiffSignals;

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

@@ -90,6 +90,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         this._quickInputService = _quickInputService;
         this._accessibilitySignalService = _accessibilitySignalService;
         this._isInQuickPick = false;
+        this._lastProviderPosition = ( new Map());
         this._accessiblityHelpIsShown = accessibilityHelpIsShown.bindTo(this._contextKeyService);
         this._accessibleViewIsShown = accessibleViewIsShown.bindTo(this._contextKeyService);
         this._accessibleViewSupportsNavigation = accessibleViewSupportsNavigation.bindTo(this._contextKeyService);
@@ -302,6 +303,12 @@ let AccessibleView = class AccessibleView extends Disposable {
             onHide: () => {
                 if (!showAccessibleViewHelp) {
                     this._updateLastProvider();
+                    if (this._currentProvider) {
+                        const currentPosition = this._editorWidget.getPosition();
+                        if (currentPosition) {
+                            this._lastProviderPosition.set(this._currentProvider.id, currentPosition);
+                        }
+                    }
                     this._currentProvider?.dispose();
                     this._currentProvider = undefined;
                     this._resetContextKeys();
@@ -328,6 +335,7 @@ let AccessibleView = class AccessibleView extends Disposable {
                 if (this._lastProvider?.options.id === id) {
                     this._lastProvider = undefined;
                 }
+                this._lastProviderPosition.delete(id);
             }));
         }
         if (provider.options.id) {
@@ -455,8 +463,8 @@ let AccessibleView = class AccessibleView extends Disposable {
         const disposables = this._register(( new DisposableStore()));
         const quickPick = disposables.add(this._quickInputService.createQuickPick());
         quickPick.items = items;
-        quickPick.title = ( localize(4392, "Configure keybindings"));
-        quickPick.placeholder = ( localize(4393, "Select a command ID to configure a keybinding for it"));
+        quickPick.title = ( localize(4484, "Configure keybindings"));
+        quickPick.placeholder = ( localize(4485, "Select a command ID to configure a keybinding for it"));
         quickPick.show();
         disposables.add(quickPick.onDidAccept(async () => {
             const item = quickPick.selectedItems[0];
@@ -499,8 +507,8 @@ let AccessibleView = class AccessibleView extends Disposable {
             if (label) {
                 symbols.push({
                     markdownToParse: label,
-                    label: ( localize(4394, "({0}) {1}", token.type, label)),
-                    ariaLabel: ( localize(4395, "({0}) {1}", token.type, label)),
+                    label: ( localize(4486, "({0}) {1}", token.type, label)),
+                    ariaLabel: ( localize(4487, "({0}) {1}", token.type, label)),
                     firstListItem
                 });
                 firstListItem = undefined;
@@ -540,7 +548,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         }
         this._configurationService.updateValue(this._currentProvider?.verbositySettingKey, false);
         alert(( localize(
-            4396,
+            4488,
             "{0} accessibility verbosity is now disabled",
             this._currentProvider.verbositySettingKey
         )));
@@ -634,16 +642,16 @@ let AccessibleView = class AccessibleView extends Disposable {
             const hasActions = this._accessibleViewSupportsNavigation.get() || this._accessibleViewVerbosityEnabled.get() || this._accessibleViewGoToSymbolSupported.get() || provider.actions?.length;
             if (verbose && !showAccessibleViewHelp && hasActions) {
                 actionsHint = provider.options.position ? ( localize(
-                    4397,
+                    4489,
                     "Explore actions such as disabling this hint (Shift+Tab), use Escape to exit this dialog."
-                )) : ( localize(4398, "Explore actions such as disabling this hint (Shift+Tab)."));
+                )) : ( localize(4490, "Explore actions such as disabling this hint (Shift+Tab)."));
             }
-            let ariaLabel = provider.options.type === AccessibleViewType.Help ? ( localize(4399, "Accessibility Help")) : ( localize(4400, "Accessible View"));
+            let ariaLabel = provider.options.type === AccessibleViewType.Help ? ( localize(4491, "Accessibility Help")) : ( localize(4492, "Accessible View"));
             this._title.textContent = ariaLabel;
             if (actionsHint && provider.options.type === AccessibleViewType.View) {
-                ariaLabel = ( localize(4401, "Accessible View, {0}", actionsHint));
+                ariaLabel = ( localize(4493, "Accessible View, {0}", actionsHint));
             } else if (actionsHint) {
-                ariaLabel = ( localize(4402, "Accessibility Help, {0}", actionsHint));
+                ariaLabel = ( localize(4494, "Accessibility Help, {0}", actionsHint));
             }
             if (isWindows && widgetIsFocused) {
                 ariaLabel = "";
@@ -665,6 +673,15 @@ let AccessibleView = class AccessibleView extends Disposable {
                 }
             } else if (previousPosition) {
                 this._editorWidget.setPosition(previousPosition);
+            } else {
+                const savedPosition = this._lastProviderPosition.get(provider.id);
+                if (savedPosition) {
+                    const lineCount = this._editorWidget.getModel()?.getLineCount() ?? 0;
+                    if (savedPosition.lineNumber <= lineCount) {
+                        this._editorWidget.setPosition(savedPosition);
+                        this._editorWidget.revealPosition(savedPosition);
+                    }
+                }
             }
         });
         this._updateToolbar(this._currentProvider.actions, provider.options.type);
@@ -684,6 +701,10 @@ let AccessibleView = class AccessibleView extends Disposable {
                 return;
             }
             this._updateContextKeys(provider, false);
+            const currentPosition = this._editorWidget.getPosition();
+            if (currentPosition) {
+                this._lastProviderPosition.set(provider.id, currentPosition);
+            }
             this._lastProvider = undefined;
             this._currentContent = undefined;
             this._currentProvider?.dispose();
@@ -724,7 +745,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         return disposableStore;
     }
     _updateToolbar(providedActions, type) {
-        this._toolbar.setAriaLabel(type === AccessibleViewType.Help ? ( localize(4403, "Accessibility Help")) : ( localize(4404, "Accessible View")));
+        this._toolbar.setAriaLabel(type === AccessibleViewType.Help ? ( localize(4495, "Accessibility Help")) : ( localize(4496, "Accessible View")));
         const toolbarMenu = this._register(
             this._menuService.createMenu(MenuId.AccessibleView, this._contextKeyService)
         );
@@ -822,9 +843,9 @@ let AccessibleView = class AccessibleView extends Disposable {
     _accessibleViewHelpDialogContent(providerHasSymbols) {
         const navigationHint = this._navigationHint();
         const goToSymbolHint = this._goToSymbolHint(providerHasSymbols);
-        const toolbarHint = ( localize(4405, "Navigate to the toolbar (Shift+Tab)."));
+        const toolbarHint = ( localize(4497, "Navigate to the toolbar (Shift+Tab)."));
         const chatHints = this._getChatHints();
-        let hint = ( localize(4406, "In the accessible view, you can:\n"));
+        let hint = ( localize(4498, "In the accessible view, you can:\n"));
         if (navigationHint) {
             hint += " - " + navigationHint + "\n";
         }
@@ -844,31 +865,31 @@ let AccessibleView = class AccessibleView extends Disposable {
             return;
         }
         return [( localize(
-            4407,
+            4499,
             " - Insert the code block at the cursor{0}.",
             "<keybinding:workbench.action.chat.insertCodeBlock>"
         )), ( localize(
-            4408,
+            4500,
             " - Insert the code block into a new file{0}.",
             "<keybinding:workbench.action.chat.insertIntoNewFile>"
         )), ( localize(
-            4409,
+            4501,
             " - Run the code block in the terminal{0}.\n",
             "<keybinding:workbench.action.chat.runInTerminal>"
         ))].join("\n");
     }
     _navigationHint() {
         return localize(
-            4410,
+            4502,
             "Show the next item{0} or previous item{1}.",
-            `<keybinding:${AccessibilityCommandId.ShowNext}`,
+            `<keybinding:${AccessibilityCommandId.ShowNext}>`,
             `<keybinding:${AccessibilityCommandId.ShowPrevious}>`
         );
     }
     _disableVerbosityHint(provider) {
         if (provider.options.type === AccessibleViewType.Help && this._verbosityEnabled()) {
             return localize(
-                4411,
+                4503,
                 "\nDisable accessibility verbosity for this feature{0}.",
                 `<keybinding:${AccessibilityCommandId.DisableVerbosityHint}>`
             );
@@ -880,7 +901,7 @@ let AccessibleView = class AccessibleView extends Disposable {
             return;
         }
         return localize(
-            4412,
+            4504,
             "Go to a symbol{0}.",
             `<keybinding:${AccessibilityCommandId.GoToSymbol}>`
         );
@@ -889,7 +910,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         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(
-            4413,
+            4505,
             "\nConfigure keybindings for commands that lack them {0}.",
             keybindingToConfigureQuickPick
         );
@@ -898,7 +919,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         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(
-            4414,
+            4506,
             "\nConfigure keybindings for commands that already have assignments {0}.",
             keybindingToConfigureQuickPick
         );
@@ -917,11 +938,11 @@ let AccessibleView = class AccessibleView extends Disposable {
         return screenReaderModeHint;
     }
     _exitDialogHint(provider) {
-        return this._verbosityEnabled() && !provider.options.position ? ( localize(4415, "\nExit this dialog (Escape).")) : "";
+        return this._verbosityEnabled() && !provider.options.position ? ( localize(4507, "\nExit this dialog (Escape).")) : "";
     }
     _readMoreHint(provider) {
         return provider.options.readMoreUrl ? ( localize(
-            4416,
+            4508,
             "\nOpen a browser window with more information related to accessibility{0}.",
             `<keybinding:${AccessibilityCommandId.AccessibilityHelpOpenHelpLink}>`
         )) : "";
@@ -966,10 +987,10 @@ let AccessibleViewService = class AccessibleViewService extends Disposable {
         const keybinding = this._keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibleView)?.getAriaLabel();
         let hint = null;
         if (keybinding) {
-            hint = ( localize(4417, "Inspect this in the accessible view with {0}", keybinding));
+            hint = ( localize(4509, "Inspect this in the accessible view with {0}", keybinding));
         } else {
             hint = ( localize(
-                4418,
+                4510,
                 "Inspect this in the accessible view via the command Open Accessible View which is currently not triggerable via keybinding."
             ));
         }
@@ -1007,8 +1028,8 @@ let AccessibleViewSymbolQuickPick = class AccessibleViewSymbolQuickPick {
     show(provider) {
         const disposables = ( new DisposableStore());
         const quickPick = disposables.add(this._quickInputService.createQuickPick());
-        quickPick.placeholder = ( localize(4419, "Type to search symbols"));
-        quickPick.title = ( localize(4420, "Go to Symbol Accessible View"));
+        quickPick.placeholder = ( localize(4511, "Type to search symbols"));
+        quickPick.title = ( localize(4512, "Go to Symbol Accessible View"));
         const picks = [];
         const symbols = this._accessibleView.getSymbols();
         if (!symbols) {

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

@@ -18,11 +18,11 @@ class ShowSignalSoundHelp extends Action2 {
     constructor() {
         super({
             id: ShowSignalSoundHelp.ID,
-            title: ( localize2(4433, "Help: List Signal Sounds")),
+            title: ( localize2(4525, "Help: List Signal Sounds")),
             f1: true,
             metadata: {
                 description: ( localize(
-                    4434,
+                    4526,
                     "List all accessibility sounds, noises, or audio cues and configure their settings"
                 ))
             }
@@ -40,7 +40,7 @@ class ShowSignalSoundHelp extends Action2 {
             signal,
             buttons: userGestureSignals.includes(signal) ? [{
                 iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-                tooltip: ( localize(4435, "Configure Sound")),
+                tooltip: ( localize(4527, "Configure Sound")),
                 alwaysVisible: true
             }] : []
         }))).sort((a, b) => a.label.localeCompare(b.label));
@@ -103,7 +103,7 @@ class ShowSignalSoundHelp extends Action2 {
             );
         }));
         disposables.add(qp.onDidHide(() => disposables.dispose()));
-        qp.placeholder = ( localize(4436, "Select a sound to play and configure"));
+        qp.placeholder = ( localize(4528, "Select a sound to play and configure"));
         qp.canSelectMany = true;
         await qp.show();
     }
@@ -118,11 +118,11 @@ class ShowAccessibilityAnnouncementHelp extends Action2 {
     constructor() {
         super({
             id: ShowAccessibilityAnnouncementHelp.ID,
-            title: ( localize2(4437, "Help: List Signal Announcements")),
+            title: ( localize2(4529, "Help: List Signal Announcements")),
             f1: true,
             metadata: {
                 description: ( localize(
-                    4438,
+                    4530,
                     "List all accessibility announcements, alerts, braille messages, and configure their settings"
                 ))
             }
@@ -140,7 +140,7 @@ class ShowAccessibilityAnnouncementHelp extends Action2 {
             signal,
             buttons: userGestureSignals.includes(signal) ? [{
                 iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-                tooltip: ( localize(4439, "Configure Announcement")),
+                tooltip: ( localize(4531, "Configure Announcement")),
                 alwaysVisible: true
             }] : []
         }))).sort((a, b) => a.label.localeCompare(b.label));
@@ -194,8 +194,8 @@ class ShowAccessibilityAnnouncementHelp extends Action2 {
             });
         }));
         disposables.add(qp.onDidHide(() => disposables.dispose()));
-        qp.placeholder = screenReaderOptimized ? ( localize(4440, "Select an announcement to configure")) : ( localize(
-            4441,
+        qp.placeholder = screenReaderOptimized ? ( localize(4532, "Select an announcement to configure")) : ( localize(
+            4533,
             "Screen reader is not active, announcements are disabled by default."
         ));
         qp.canSelectMany = true;

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

@@ -41,7 +41,7 @@ let DiffEditorActiveAnnouncementContribution = class DiffEditorActiveAnnouncemen
         }
         this._onDidActiveEditorChangeListener = this._register(this._editorService.onDidActiveEditorChange(() => {
             if (isDiffEditor(this._editorService.activeTextEditorControl)) {
-                this._accessibilityService.alert(( localize(4442, "Diff editor")));
+                this._accessibilityService.alert(( localize(4534, "Diff editor")));
             }
         }));
     }

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

@@ -7,7 +7,7 @@
 	position: absolute;
 	background-color: var(--vscode-editorWidget-background);
 	color: var(--vscode-editorWidget-foreground);
-	box-shadow: 0 2px 8px var(--vscode-widget-shadow);
+	box-shadow: var(--vscode-shadow-lg);
 	border: 2px solid var(--vscode-focusBorder);
 	border-radius: 6px;
 	margin-top: -1px;

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

@@ -22,10 +22,10 @@ class ToggleScreenReaderMode extends Action2 {
     constructor() {
         super({
             id: "editor.action.toggleScreenReaderAccessibilityMode",
-            title: ( localize2(6643, "Toggle Screen Reader Accessibility Mode")),
+            title: ( localize2(7435, "Toggle Screen Reader Accessibility Mode")),
             metadata: {
                 description: ( localize2(
-                    6644,
+                    7436,
                     "Toggles an optimized mode for usage with screen readers, braille devices, and other assistive technologies."
                 ))
             },
@@ -62,11 +62,11 @@ class AnnounceCursorPosition extends Action2 {
     constructor() {
         super({
             id: "editor.action.announceCursorPosition",
-            title: ( localize2(6645, "Announce Cursor Position")),
+            title: ( localize2(7437, "Announce Cursor Position")),
             f1: true,
             metadata: {
                 description: ( localize2(
-                    6646,
+                    7438,
                     "Announce the current cursor position (line and column) via screen reader."
                 ))
             },
@@ -91,7 +91,7 @@ class AnnounceCursorPosition extends Action2 {
         const tabSize = model.getOptions().tabSize;
         const lineContent = model.getLineContent(position.lineNumber);
         const visibleColumn = CursorColumns.visibleColumnFromColumn(lineContent, position.column, tabSize) + 1;
-        alert(( localize(6647, "Line {0}, Column {1}", position.lineNumber, visibleColumn)));
+        alert(( localize(7439, "Line {0}, Column {1}", position.lineNumber, visibleColumn)));
     }
 }
 registerAction2(AnnounceCursorPosition);