@codingame/monaco-vscode-accessibility-service-override 24.2.0 → 25.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-accessibility-service-override",
-  "version": "24.2.0",
+  "version": "25.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": "24.2.0",
+    "@codingame/monaco-vscode-api": "25.0.0",
     "marked": "14.0.0"
   },
   "main": "index.js",

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

@@ -40,22 +40,22 @@ let AccessibilityStatus = class AccessibilityStatus extends Disposable {
     }
     showScreenReaderNotification() {
         this.screenReaderNotification = this.notificationService.prompt(Severity.Info, ( localize(
-            4347,
+            4376,
             "Screen reader usage detected. Do you want to enable {0} to optimize the editor for screen reader usage?",
             'editor.accessibilitySupport'
         )), [{
-                label: ( localize(4348, "Yes")),
+                label: ( localize(4377, "Yes")),
                 run: () => {
                     this.configurationService.updateValue('editor.accessibilitySupport', 'on', ConfigurationTarget.USER);
                 }
             }, {
-                label: ( localize(4349, "No")),
+                label: ( localize(4378, "No")),
                 run: () => {
                     this.configurationService.updateValue('editor.accessibilitySupport', 'off', ConfigurationTarget.USER);
                 }
             },
             {
-                label: ( localize(4350, "Learn More")),
+                label: ( localize(4379, "Learn More")),
                 run: () => {
                     this.openerService.open('https://code.visualstudio.com/docs/editor/accessibility#_screen-readers');
                 }
@@ -68,9 +68,9 @@ let AccessibilityStatus = class AccessibilityStatus extends Disposable {
     updateScreenReaderModeElement(visible) {
         if (visible) {
             if (!this.screenReaderModeElement.value) {
-                const text = ( localize(4351, "Screen Reader Optimized"));
+                const text = ( localize(4380, "Screen Reader Optimized"));
                 this.screenReaderModeElement.value = this.statusbarService.addEntry({
-                    name: ( localize(4352, "Screen Reader Mode")),
+                    name: ( localize(4381, "Screen Reader Mode")),
                     text,
                     ariaLabel: text,
                     command: 'showEditorScreenReaderNotification',

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

@@ -22,7 +22,7 @@ import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IQuickInputService } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { IChatCodeBlockContextProviderService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-import { ICodeBlockActionContext } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart";
+import { ICodeBlockActionContext } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/codeBlockPart";
 import { AccessibilityVerbositySettingId } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration";
 export type AccesibleViewContentProvider = AccessibleContentProvider | ExtensionContentProvider;
 export declare class AccessibleView extends Disposable implements ITextModelContentProvider {

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

@@ -384,8 +384,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(4353, 'Configure keybindings'));
-        quickPick.placeholder = ( localize(4354, 'Select a command ID to configure a keybinding for it'));
+        quickPick.title = ( localize(4382, 'Configure keybindings'));
+        quickPick.placeholder = ( localize(4383, 'Select a command ID to configure a keybinding for it'));
         quickPick.show();
         disposables.add(quickPick.onDidAccept(async () => {
             const item = quickPick.selectedItems[0];
@@ -425,7 +425,7 @@ let AccessibleView = class AccessibleView extends Disposable {
                 }
             }
             if (label) {
-                symbols.push({ markdownToParse: label, label: ( localize(4355, "({0}) {1}", token.type, label)), ariaLabel: ( localize(4356, "({0}) {1}", token.type, label)), firstListItem });
+                symbols.push({ markdownToParse: label, label: ( localize(4384, "({0}) {1}", token.type, label)), ariaLabel: ( localize(4385, "({0}) {1}", token.type, label)), firstListItem });
                 firstListItem = undefined;
             }
         }
@@ -458,7 +458,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         }
         this._configurationService.updateValue(this._currentProvider?.verbositySettingKey, false);
         alert(( localize(
-            4357,
+            4386,
             '{0} accessibility verbosity is now disabled',
             this._currentProvider.verbositySettingKey
         )));
@@ -537,17 +537,17 @@ let AccessibleView = class AccessibleView extends Disposable {
             const hasActions = this._accessibleViewSupportsNavigation.get() || this._accessibleViewVerbosityEnabled.get() || this._accessibleViewGoToSymbolSupported.get() || provider.actions?.length;
             if (verbose && !showAccessibleViewHelp && hasActions) {
                 actionsHint = provider.options.position ? ( localize(
-                    4358,
+                    4387,
                     'Explore actions such as disabling this hint (Shift+Tab), use Escape to exit this dialog.'
-                )) : ( localize(4359, 'Explore actions such as disabling this hint (Shift+Tab).'));
+                )) : ( localize(4388, 'Explore actions such as disabling this hint (Shift+Tab).'));
             }
-            let ariaLabel = provider.options.type === AccessibleViewType.Help ? ( localize(4360, "Accessibility Help")) : ( localize(4361, "Accessible View"));
+            let ariaLabel = provider.options.type === AccessibleViewType.Help ? ( localize(4389, "Accessibility Help")) : ( localize(4390, "Accessible View"));
             this._title.textContent = ariaLabel;
             if (actionsHint && provider.options.type === AccessibleViewType.View) {
-                ariaLabel = ( localize(4362, "Accessible View, {0}", actionsHint));
+                ariaLabel = ( localize(4391, "Accessible View, {0}", actionsHint));
             }
             else if (actionsHint) {
-                ariaLabel = ( localize(4363, "Accessibility Help, {0}", actionsHint));
+                ariaLabel = ( localize(4392, "Accessibility Help, {0}", actionsHint));
             }
             if (isWindows && widgetIsFocused) {
                 ariaLabel = '';
@@ -624,7 +624,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         return disposableStore;
     }
     _updateToolbar(providedActions, type) {
-        this._toolbar.setAriaLabel(type === AccessibleViewType.Help ? ( localize(4364, 'Accessibility Help')) : ( localize(4365, "Accessible View")));
+        this._toolbar.setAriaLabel(type === AccessibleViewType.Help ? ( localize(4393, 'Accessibility Help')) : ( localize(4394, "Accessible View")));
         const toolbarMenu = this._register(this._menuService.createMenu(MenuId.AccessibleView, this._contextKeyService));
         const menuActions = getFlatActionBarActions(toolbarMenu.getActions({}));
         if (providedActions) {
@@ -726,9 +726,9 @@ let AccessibleView = class AccessibleView extends Disposable {
     _accessibleViewHelpDialogContent(providerHasSymbols) {
         const navigationHint = this._navigationHint();
         const goToSymbolHint = this._goToSymbolHint(providerHasSymbols);
-        const toolbarHint = ( localize(4366, "Navigate to the toolbar (Shift+Tab)."));
+        const toolbarHint = ( localize(4395, "Navigate to the toolbar (Shift+Tab)."));
         const chatHints = this._getChatHints();
-        let hint = ( localize(4367, "In the accessible view, you can:\n"));
+        let hint = ( localize(4396, "In the accessible view, you can:\n"));
         if (navigationHint) {
             hint += ' - ' + navigationHint + '\n';
         }
@@ -748,24 +748,24 @@ let AccessibleView = class AccessibleView extends Disposable {
             return;
         }
         return [( localize(
-            4368,
+            4397,
             " - Insert the code block at the cursor{0}.",
             '<keybinding:workbench.action.chat.insertCodeBlock>'
         )),
             ( localize(
-            4369,
+            4398,
             " - Insert the code block into a new file{0}.",
             '<keybinding:workbench.action.chat.insertIntoNewFile>'
         )),
             ( localize(
-            4370,
+            4399,
             " - Run the code block in the terminal{0}.\n",
             '<keybinding:workbench.action.chat.runInTerminal>'
         ))].join('\n');
     }
     _navigationHint() {
         return localize(
-            4371,
+            4400,
             "Show the next item{0} or previous item{1}.",
             `<keybinding:${AccessibilityCommandId.ShowNext}`,
             `<keybinding:${AccessibilityCommandId.ShowPrevious}>`
@@ -774,7 +774,7 @@ let AccessibleView = class AccessibleView extends Disposable {
     _disableVerbosityHint(provider) {
         if (provider.options.type === AccessibleViewType.Help && this._verbosityEnabled()) {
             return localize(
-                4372,
+                4401,
                 "\nDisable accessibility verbosity for this feature{0}.",
                 `<keybinding:${AccessibilityCommandId.DisableVerbosityHint}>`
             );
@@ -786,7 +786,7 @@ let AccessibleView = class AccessibleView extends Disposable {
             return;
         }
         return localize(
-            4373,
+            4402,
             'Go to a symbol{0}.',
             `<keybinding:${AccessibilityCommandId.GoToSymbol}>`
         );
@@ -795,7 +795,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(
-            4374,
+            4403,
             '\nConfigure keybindings for commands that lack them {0}.',
             keybindingToConfigureQuickPick
         );
@@ -804,7 +804,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(
-            4375,
+            4404,
             '\nConfigure keybindings for commands that already have assignments {0}.',
             keybindingToConfigureQuickPick
         );
@@ -826,11 +826,11 @@ let AccessibleView = class AccessibleView extends Disposable {
         return screenReaderModeHint;
     }
     _exitDialogHint(provider) {
-        return this._verbosityEnabled() && !provider.options.position ? ( localize(4376, '\nExit this dialog (Escape).')) : '';
+        return this._verbosityEnabled() && !provider.options.position ? ( localize(4405, '\nExit this dialog (Escape).')) : '';
     }
     _readMoreHint(provider) {
         return provider.options.readMoreUrl ? ( localize(
-            4377,
+            4406,
             "\nOpen a browser window with more information related to accessibility{0}.",
             `<keybinding:${AccessibilityCommandId.AccessibilityHelpOpenHelpLink}>`
         )) : '';
@@ -892,11 +892,11 @@ let AccessibleViewService = class AccessibleViewService extends Disposable {
         const keybinding = this._keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibleView)?.getAriaLabel();
         let hint = null;
         if (keybinding) {
-            hint = ( localize(4378, "Inspect this in the accessible view with {0}", keybinding));
+            hint = ( localize(4407, "Inspect this in the accessible view with {0}", keybinding));
         }
         else {
             hint = ( localize(
-                4379,
+                4408,
                 "Inspect this in the accessible view via the command Open Accessible View which is currently not triggerable via keybinding."
             ));
         }
@@ -938,8 +938,8 @@ let AccessibleViewSymbolQuickPick = class AccessibleViewSymbolQuickPick {
     show(provider) {
         const disposables = ( new DisposableStore());
         const quickPick = disposables.add(this._quickInputService.createQuickPick());
-        quickPick.placeholder = ( localize(4380, "Type to search symbols"));
-        quickPick.title = ( localize(4381, "Go to Symbol Accessible View"));
+        quickPick.placeholder = ( localize(4409, "Type to search symbols"));
+        quickPick.title = ( localize(4410, "Go to Symbol Accessible View"));
         const picks = [];
         const symbols = this._accessibleView.getSymbols();
         if (!symbols) {

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

@@ -16,11 +16,11 @@ class ShowSignalSoundHelp extends Action2 {
     constructor() {
         super({
             id: ShowSignalSoundHelp.ID,
-            title: ( localize2(4394, "Help: List Signal Sounds")),
+            title: ( localize2(4423, "Help: List Signal Sounds")),
             f1: true,
             metadata: {
                 description: ( localize(
-                    4395,
+                    4424,
                     "List all accessibility sounds, noises, or audio cues and configure their settings"
                 ))
             }
@@ -38,7 +38,7 @@ class ShowSignalSoundHelp extends Action2 {
             signal,
             buttons: userGestureSignals.includes(signal) ? [{
                     iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-                    tooltip: ( localize(4396, 'Configure Sound')),
+                    tooltip: ( localize(4425, 'Configure Sound')),
                     alwaysVisible: true
                 }] : []
         }))).sort((a, b) => a.label.localeCompare(b.label));
@@ -74,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(4397, 'Select a sound to play and configure'));
+        qp.placeholder = ( localize(4426, 'Select a sound to play and configure'));
         qp.canSelectMany = true;
         await qp.show();
     }
@@ -87,11 +87,11 @@ class ShowAccessibilityAnnouncementHelp extends Action2 {
     constructor() {
         super({
             id: ShowAccessibilityAnnouncementHelp.ID,
-            title: ( localize2(4398, "Help: List Signal Announcements")),
+            title: ( localize2(4427, "Help: List Signal Announcements")),
             f1: true,
             metadata: {
                 description: ( localize(
-                    4399,
+                    4428,
                     "List all accessibility announcements, alerts, braille messages, and configure their settings"
                 ))
             }
@@ -109,7 +109,7 @@ class ShowAccessibilityAnnouncementHelp extends Action2 {
             signal,
             buttons: userGestureSignals.includes(signal) ? [{
                     iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-                    tooltip: ( localize(4400, 'Configure Announcement')),
+                    tooltip: ( localize(4429, 'Configure Announcement')),
                     alwaysVisible: true,
                 }] : []
         }))).sort((a, b) => a.label.localeCompare(b.label));
@@ -142,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(4401, 'Select an announcement to configure')) : ( localize(
-            4402,
+        qp.placeholder = screenReaderOptimized ? ( localize(4430, 'Select an announcement to configure')) : ( localize(
+            4431,
             'Screen reader is not active, announcements are disabled by default.'
         ));
         qp.canSelectMany = true;

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

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

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

@@ -1,7 +1,7 @@
 
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import * as accessibility from './accessibility.css';
-import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service';
@@ -9,18 +9,20 @@ import { Action2, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs
 import { accessibilityHelpIsShown } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
-import { alert } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
 import { AccessibilityHelpNLS } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/standaloneStrings';
+import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
+import { alert } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
+import { CursorColumns } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/cursorColumns';
 
 registerCss(accessibility);
 class ToggleScreenReaderMode extends Action2 {
     constructor() {
         super({
             id: 'editor.action.toggleScreenReaderAccessibilityMode',
-            title: ( localize2(6122, "Toggle Screen Reader Accessibility Mode")),
+            title: ( localize2(6141, "Toggle Screen Reader Accessibility Mode")),
             metadata: {
                 description: ( localize2(
-                    6123,
+                    6142,
                     "Toggles an optimized mode for usage with screen readers, braille devices, and other assistive technologies."
                 )),
             },
@@ -46,3 +48,39 @@ class ToggleScreenReaderMode extends Action2 {
     }
 }
 registerAction2(ToggleScreenReaderMode);
+class AnnounceCursorPosition extends Action2 {
+    constructor() {
+        super({
+            id: 'editor.action.announceCursorPosition',
+            title: ( localize2(6143, "Announce Cursor Position")),
+            f1: true,
+            metadata: {
+                description: ( localize2(
+                    6144,
+                    "Announce the current cursor position (line and column) via screen reader."
+                ))
+            },
+            keybinding: {
+                primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyG,
+                weight: KeybindingWeight.WorkbenchContrib + 10
+            }
+        });
+    }
+    async run(accessor) {
+        const codeEditorService = accessor.get(ICodeEditorService);
+        const editor = codeEditorService.getFocusedCodeEditor();
+        if (!editor) {
+            return;
+        }
+        const position = editor.getPosition();
+        const model = editor.getModel();
+        if (!position || !model) {
+            return;
+        }
+        const tabSize = model.getOptions().tabSize;
+        const lineContent = model.getLineContent(position.lineNumber);
+        const visibleColumn = CursorColumns.visibleColumnFromColumn(lineContent, position.column, tabSize) + 1;
+        alert(( localize(6145, "Line {0}, Column {1}", position.lineNumber, visibleColumn)));
+    }
+}
+registerAction2(AnnounceCursorPosition);