@codingame/monaco-vscode-accessibility-service-override 36.2.7 → 37.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-accessibility-service-override",
-  "version": "36.2.7",
+  "version": "37.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": "36.2.7",
+    "@codingame/monaco-vscode-api": "37.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(
-            4710,
+            5010,
             "Screen reader usage detected. Do you want to enable {0} to optimize the editor for screen reader usage?",
             "editor.accessibilitySupport"
         )), [{
-            label: ( localize(4711, "Yes")),
+            label: ( localize(5011, "Yes")),
             run: () => {
                 this.configurationService.updateValue("editor.accessibilitySupport", "on", ConfigurationTarget.USER);
             }
         }, {
-            label: ( localize(4712, "No")),
+            label: ( localize(5012, "No")),
             run: () => {
                 this.configurationService.updateValue("editor.accessibilitySupport", "off", ConfigurationTarget.USER);
             }
         }, {
-            label: ( localize(4713, "Learn More")),
+            label: ( localize(5013, "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(4714, "Screen Reader Optimized"));
+                const text = ( localize(5014, "Screen Reader Optimized"));
                 this.screenReaderModeElement.value = this.statusbarService.addEntry({
-                    name: ( localize(4715, "Screen Reader Mode")),
+                    name: ( localize(5015, "Screen Reader Mode")),
                     text,
                     ariaLabel: text,
                     command: "showEditorScreenReaderNotification",

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

@@ -55,6 +55,7 @@ export declare class AccessibleView extends Disposable {
     private _container;
     private _title;
     private readonly _toolbar;
+    private readonly _toolbarMenu;
     private _currentProvider;
     private _currentContent;
     private _lastProvider;
@@ -68,6 +69,11 @@ export declare class AccessibleView extends Disposable {
     getCodeBlockContext(): ICodeBlockActionContext | undefined;
     navigateToCodeBlock(type: "next" | "previous"): void;
     showLastProvider(id: AccessibleViewProviderId): void;
+    getAccessibilityStatus(): {
+        providerId: string | undefined;
+        isInCodeBlock: boolean;
+        onLastLine: boolean;
+    };
     show(provider?: AccesibleViewContentProvider, symbol?: IAccessibleViewSymbol, showAccessibleViewHelp?: boolean, position?: IPosition): void;
     previous(): void;
     next(): void;

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

@@ -6,7 +6,7 @@ import { ActionsOrientation } from '@codingame/monaco-vscode-api/vscode/vs/base/
 import { alert } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
-import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, MutableDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { marked } from 'marked';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { isWindows, isMacintosh } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
@@ -92,6 +92,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         this._quickInputService = _quickInputService;
         this._accessibilitySignalService = _accessibilitySignalService;
         this._isInQuickPick = false;
+        this._toolbarMenu = this._register(( new MutableDisposable()));
         this._lastProviderPosition = ( new Map());
         this._accessiblityHelpIsShown = accessibilityHelpIsShown.bindTo(this._contextKeyService);
         this._accessibleViewIsShown = accessibleViewIsShown.bindTo(this._contextKeyService);
@@ -281,6 +282,13 @@ let AccessibleView = class AccessibleView extends Disposable {
         }
         this.show(this._lastProvider);
     }
+    getAccessibilityStatus() {
+        return {
+            providerId: this._currentProvider?.id,
+            isInCodeBlock: this._accessibleViewInCodeBlock.get() ?? false,
+            onLastLine: this._onLastLine.get() ?? false
+        };
+    }
     show(provider, symbol, showAccessibleViewHelp, position) {
         provider = provider ?? this._currentProvider;
         if (!provider) {
@@ -303,6 +311,7 @@ let AccessibleView = class AccessibleView extends Disposable {
                 return this._render(provider, container, showAccessibleViewHelp);
             },
             onHide: () => {
+                this._toolbarMenu.clear();
                 if (!showAccessibleViewHelp) {
                     this._updateLastProvider();
                     if (this._currentProvider) {
@@ -465,8 +474,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(4716, "Configure keybindings"));
-        quickPick.placeholder = ( localize(4717, "Select a command ID to configure a keybinding for it"));
+        quickPick.title = ( localize(5016, "Configure keybindings"));
+        quickPick.placeholder = ( localize(5017, "Select a command ID to configure a keybinding for it"));
         quickPick.show();
         disposables.add(quickPick.onDidAccept(async () => {
             const item = quickPick.selectedItems[0];
@@ -509,8 +518,8 @@ let AccessibleView = class AccessibleView extends Disposable {
             if (label) {
                 symbols.push({
                     markdownToParse: label,
-                    label: ( localize(4718, "({0}) {1}", token.type, label)),
-                    ariaLabel: ( localize(4719, "({0}) {1}", token.type, label)),
+                    label: ( localize(5018, "({0}) {1}", token.type, label)),
+                    ariaLabel: ( localize(5019, "({0}) {1}", token.type, label)),
                     firstListItem
                 });
                 firstListItem = undefined;
@@ -550,7 +559,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         }
         this._configurationService.updateValue(this._currentProvider?.verbositySettingKey, false);
         alert(( localize(
-            4720,
+            5020,
             "{0} accessibility verbosity is now disabled",
             this._currentProvider.verbositySettingKey
         )));
@@ -615,6 +624,7 @@ let AccessibleView = class AccessibleView extends Disposable {
     _render(provider, container, showAccessibleViewHelp, updatedContent) {
         const isSameProvider = this._currentProvider?.id === provider.id;
         const previousPosition = isSameProvider ? this._editorWidget.getPosition() : undefined;
+        const previousScrollTop = isSameProvider ? this._editorWidget.getScrollTop() : undefined;
         this._currentProvider = provider;
         this._accessibleViewCurrentProviderId.set(provider.id);
         const verbose = this._verbosityEnabled();
@@ -644,16 +654,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(
-                    4721,
+                    5021,
                     "Explore actions such as disabling this hint (Shift+Tab), use Escape to exit this dialog."
-                )) : ( localize(4722, "Explore actions such as disabling this hint (Shift+Tab)."));
+                )) : ( localize(5022, "Explore actions such as disabling this hint (Shift+Tab)."));
             }
-            let ariaLabel = provider.options.type === AccessibleViewType.Help ? ( localize(4723, "Accessibility Help")) : ( localize(4724, "Accessible View"));
+            let ariaLabel = provider.options.type === AccessibleViewType.Help ? ( localize(5023, "Accessibility Help")) : ( localize(5024, "Accessible View"));
             this._title.textContent = ariaLabel;
             if (actionsHint && provider.options.type === AccessibleViewType.View) {
-                ariaLabel = ( localize(4725, "Accessible View, {0}", actionsHint));
+                ariaLabel = ( localize(5025, "Accessible View, {0}", actionsHint));
             } else if (actionsHint) {
-                ariaLabel = ( localize(4726, "Accessibility Help, {0}", actionsHint));
+                ariaLabel = ( localize(5026, "Accessibility Help, {0}", actionsHint));
             }
             if (isWindows && widgetIsFocused) {
                 ariaLabel = "";
@@ -665,8 +675,18 @@ let AccessibleView = class AccessibleView extends Disposable {
             if (this._currentProvider?.options.position) {
                 const position = this._editorWidget.getPosition();
                 const isDefaultPosition = position?.lineNumber === 1 && position.column === 1;
-                if (this._currentProvider.options.position === "bottom" || this._currentProvider.options.position === "initial-bottom" && isDefaultPosition) {
-                    const lastLine = this.editorWidget.getModel()?.getLineCount();
+                const lineCount = this.editorWidget.getModel()?.getLineCount();
+                const savedPosition = this._lastProviderPosition.get(provider.id);
+                const preservedPosition = this._currentProvider.options.position === "initial-bottom-preserve" ? previousPosition ?? savedPosition : this._currentProvider.options.position === "initial-bottom" && !isSameProvider ? savedPosition : undefined;
+                if (preservedPosition && preservedPosition.lineNumber <= (lineCount ?? 0)) {
+                    this._editorWidget.setPosition(preservedPosition);
+                    if (this._currentProvider.options.position === "initial-bottom-preserve" && previousScrollTop !== undefined) {
+                        this._editorWidget.setScrollTop(previousScrollTop);
+                    } else {
+                        this._editorWidget.revealLine(preservedPosition.lineNumber);
+                    }
+                } else if (this._currentProvider.options.position === "bottom" || this._currentProvider.options.position === "initial-bottom-preserve" || this._currentProvider.options.position === "initial-bottom" && isDefaultPosition) {
+                    const lastLine = lineCount;
                     const position = lastLine !== undefined && lastLine > 0 ? ( new Position(lastLine, 1)) : undefined;
                     if (position) {
                         this._editorWidget.setPosition(position);
@@ -747,10 +767,9 @@ let AccessibleView = class AccessibleView extends Disposable {
         return disposableStore;
     }
     _updateToolbar(providedActions, type) {
-        this._toolbar.setAriaLabel(type === AccessibleViewType.Help ? ( localize(4727, "Accessibility Help")) : ( localize(4728, "Accessible View")));
-        const toolbarMenu = this._register(
-            this._menuService.createMenu(MenuId.AccessibleView, this._contextKeyService)
-        );
+        this._toolbar.setAriaLabel(type === AccessibleViewType.Help ? ( localize(5027, "Accessibility Help")) : ( localize(5028, "Accessible View")));
+        const toolbarMenu = this._menuService.createMenu(MenuId.AccessibleView, this._contextKeyService);
+        this._toolbarMenu.value = toolbarMenu;
         const menuActions = getFlatActionBarActions(toolbarMenu.getActions({}));
         if (providedActions) {
             for (const providedAction of providedActions) {
@@ -845,9 +864,9 @@ let AccessibleView = class AccessibleView extends Disposable {
     _accessibleViewHelpDialogContent(providerHasSymbols) {
         const navigationHint = this._navigationHint();
         const goToSymbolHint = this._goToSymbolHint(providerHasSymbols);
-        const toolbarHint = ( localize(4729, "Navigate to the toolbar (Shift+Tab)."));
+        const toolbarHint = ( localize(5029, "Navigate to the toolbar (Shift+Tab)."));
         const chatHints = this._getChatHints();
-        let hint = ( localize(4730, "In the accessible view, you can:\n"));
+        let hint = ( localize(5030, "In the accessible view, you can:\n"));
         if (navigationHint) {
             hint += " - " + navigationHint + "\n";
         }
@@ -867,22 +886,22 @@ let AccessibleView = class AccessibleView extends Disposable {
             return;
         }
         return [( localize(
-            4731,
+            5031,
             " - Insert the code block at the cursor{0}.",
             "<keybinding:workbench.action.chat.insertCodeBlock>"
         )), ( localize(
-            4732,
+            5032,
             " - Insert the code block into a new file{0}.",
             "<keybinding:workbench.action.chat.insertIntoNewFile>"
         )), ( localize(
-            4733,
+            5033,
             " - Run the code block in the terminal{0}.\n",
             "<keybinding:workbench.action.chat.runInTerminal>"
         ))].join("\n");
     }
     _navigationHint() {
         return localize(
-            4734,
+            5034,
             "Show the next item{0} or previous item{1}.",
             `<keybinding:${AccessibilityCommandId.ShowNext}>`,
             `<keybinding:${AccessibilityCommandId.ShowPrevious}>`
@@ -891,7 +910,7 @@ let AccessibleView = class AccessibleView extends Disposable {
     _disableVerbosityHint(provider) {
         if (provider.options.type === AccessibleViewType.Help && this._verbosityEnabled()) {
             return localize(
-                4735,
+                5035,
                 "\nDisable accessibility verbosity for this feature{0}.",
                 `<keybinding:${AccessibilityCommandId.DisableVerbosityHint}>`
             );
@@ -903,7 +922,7 @@ let AccessibleView = class AccessibleView extends Disposable {
             return;
         }
         return localize(
-            4736,
+            5036,
             "Go to a symbol{0}.",
             `<keybinding:${AccessibilityCommandId.GoToSymbol}>`
         );
@@ -912,7 +931,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(
-            4737,
+            5037,
             "\nConfigure keybindings for commands that lack them {0}.",
             keybindingToConfigureQuickPick
         );
@@ -921,7 +940,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(
-            4738,
+            5038,
             "\nConfigure keybindings for commands that already have assignments {0}.",
             keybindingToConfigureQuickPick
         );
@@ -940,11 +959,11 @@ let AccessibleView = class AccessibleView extends Disposable {
         return screenReaderModeHint;
     }
     _exitDialogHint(provider) {
-        return this._verbosityEnabled() && !provider.options.position ? ( localize(4739, "\nExit this dialog (Escape).")) : "";
+        return this._verbosityEnabled() && !provider.options.position ? ( localize(5039, "\nExit this dialog (Escape).")) : "";
     }
     _readMoreHint(provider) {
         return provider.options.readMoreUrl ? ( localize(
-            4740,
+            5040,
             "\nOpen a browser window with more information related to accessibility{0}.",
             `<keybinding:${AccessibilityCommandId.AccessibilityHelpOpenHelpLink}>`
         )) : "";
@@ -989,10 +1008,10 @@ let AccessibleViewService = class AccessibleViewService extends Disposable {
         const keybinding = this._keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibleView)?.getAriaLabel();
         let hint = null;
         if (keybinding) {
-            hint = ( localize(4741, "Inspect this in the accessible view with {0}", keybinding));
+            hint = ( localize(5041, "Inspect this in the accessible view with {0}", keybinding));
         } else {
             hint = ( localize(
-                4742,
+                5042,
                 "Inspect this in the accessible view via the command Open Accessible View which is currently not triggerable via keybinding."
             ));
         }
@@ -1030,8 +1049,8 @@ let AccessibleViewSymbolQuickPick = class AccessibleViewSymbolQuickPick {
     show(provider) {
         const disposables = ( new DisposableStore());
         const quickPick = disposables.add(this._quickInputService.createQuickPick());
-        quickPick.placeholder = ( localize(4743, "Type to search symbols"));
-        quickPick.title = ( localize(4744, "Go to Symbol Accessible View"));
+        quickPick.placeholder = ( localize(5043, "Type to search symbols"));
+        quickPick.title = ( localize(5044, "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(4757, "Help: List Signal Sounds")),
+            title: ( localize2(5057, "Help: List Signal Sounds")),
             f1: true,
             metadata: {
                 description: ( localize(
-                    4758,
+                    5058,
                     "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(4759, "Configure Sound")),
+                tooltip: ( localize(5059, "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(4760, "Select a sound to play and configure"));
+        qp.placeholder = ( localize(5060, "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(4761, "Help: List Signal Announcements")),
+            title: ( localize2(5061, "Help: List Signal Announcements")),
             f1: true,
             metadata: {
                 description: ( localize(
-                    4762,
+                    5062,
                     "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(4763, "Configure Announcement")),
+                tooltip: ( localize(5063, "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(4764, "Select an announcement to configure")) : ( localize(
-            4765,
+        qp.placeholder = screenReaderOptimized ? ( localize(5064, "Select an announcement to configure")) : ( localize(
+            5065,
             "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(4766, "Diff editor")));
+                this._accessibilityService.alert(( localize(5066, "Diff editor")));
             }
         }));
     }

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(9041, "Toggle Screen Reader Accessibility Mode")),
+            title: ( localize2(10781, "Toggle Screen Reader Accessibility Mode")),
             metadata: {
                 description: ( localize2(
-                    9042,
+                    10782,
                     "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(9043, "Announce Cursor Position")),
+            title: ( localize2(10783, "Announce Cursor Position")),
             f1: true,
             metadata: {
                 description: ( localize2(
-                    9044,
+                    10784,
                     "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(9045, "Line {0}, Column {1}", position.lineNumber, visibleColumn)));
+        alert(( localize(10785, "Line {0}, Column {1}", position.lineNumber, visibleColumn)));
     }
 }
 registerAction2(AnnounceCursorPosition);