@codingame/monaco-vscode-accessibility-service-override 8.0.4 → 9.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-accessibility-service-override",
-  "version": "8.0.4",
+  "version": "9.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@8.0.4"
+    "vscode": "npm:@codingame/monaco-vscode-api@9.0.0",
+    "marked": "~14.0.0"
   }
 }

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

@@ -36,13 +36,13 @@ let AccessibilityStatus = class AccessibilityStatus extends Disposable {
         }));
     }
     showScreenReaderNotification() {
-        this.screenReaderNotification = this.notificationService.prompt(Severity$1.Info, ( localize(5553, "Are you using a screen reader to operate VS Code?")), [{
-                label: ( localize(5554, "Yes")),
+        this.screenReaderNotification = this.notificationService.prompt(Severity$1.Info, ( localize(5497, "Are you using a screen reader to operate VS Code?")), [{
+                label: ( localize(5498, "Yes")),
                 run: () => {
                     this.configurationService.updateValue('editor.accessibilitySupport', 'on', ConfigurationTarget.USER);
                 }
             }, {
-                label: ( localize(5555, "No")),
+                label: ( localize(5499, "No")),
                 run: () => {
                     this.configurationService.updateValue('editor.accessibilitySupport', 'off', ConfigurationTarget.USER);
                 }
@@ -55,9 +55,9 @@ let AccessibilityStatus = class AccessibilityStatus extends Disposable {
     updateScreenReaderModeElement(visible) {
         if (visible) {
             if (!this.screenReaderModeElement.value) {
-                const text = ( localize(5556, "Screen Reader Optimized"));
+                const text = ( localize(5500, "Screen Reader Optimized"));
                 this.screenReaderModeElement.value = this.statusbarService.addEntry({
-                    name: ( localize(5557, "Screen Reader Mode")),
+                    name: ( localize(5501, "Screen Reader Mode")),
                     text,
                     ariaLabel: text,
                     command: 'showEditorScreenReaderNotification',

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

@@ -6,7 +6,7 @@ import { alert } from 'vscode/vscode/vs/base/browser/ui/aria/aria';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
-import marked_1 from 'vscode/external/vscode-marked/lib/marked.esm.js';
+import { marked } from 'marked';
 import { isWindows, isMacintosh } from 'vscode/vscode/vs/base/common/platform';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
@@ -158,11 +158,17 @@ let AccessibleView = class AccessibleView extends Disposable {
         }
         return this._editorWidget.getPosition() || undefined;
     }
-    setPosition(position, reveal) {
+    setPosition(position, reveal, select) {
         this._editorWidget.setPosition(position);
         if (reveal) {
             this._editorWidget.revealPosition(position);
         }
+        if (select) {
+            const lineLength = this._editorWidget.getModel()?.getLineLength(position.lineNumber) ?? 0;
+            if (lineLength) {
+                this._editorWidget.setSelection({ startLineNumber: position.lineNumber, startColumn: 1, endLineNumber: position.lineNumber, endColumn: lineLength + 1 });
+            }
+        }
     }
     getCodeBlockContext() {
         const position = this._editorWidget.getPosition();
@@ -324,7 +330,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         if (provider.options.language && provider.options.language !== 'markdown') {
             return;
         }
-        const markdownTokens = marked_1.lexer(this._currentContent);
+        const markdownTokens = marked.lexer(this._currentContent);
         if (!markdownTokens) {
             return;
         }
@@ -344,26 +350,26 @@ let AccessibleView = class AccessibleView extends Disposable {
         if (!items) {
             return;
         }
-        const quickPick = this._quickInputService.createQuickPick();
-        this._register(quickPick);
+        const disposables = this._register(( (new DisposableStore())));
+        const quickPick = disposables.add(this._quickInputService.createQuickPick());
         quickPick.items = items;
-        quickPick.title = ( localize(2291, 'Configure keybindings'));
-        quickPick.placeholder = ( localize(2292, 'Select a command ID to configure a keybinding for it'));
+        quickPick.title = ( localize(1823, 'Configure keybindings'));
+        quickPick.placeholder = ( localize(1824, 'Select a command ID to configure a keybinding for it'));
         quickPick.show();
-        quickPick.onDidAccept(async () => {
+        disposables.add(quickPick.onDidAccept(async () => {
             const item = quickPick.selectedItems[0];
             if (item) {
                 await this._commandService.executeCommand('workbench.action.openGlobalKeybindings', item.id);
             }
             quickPick.dispose();
-        });
-        quickPick.onDidHide(() => {
+        }));
+        disposables.add(quickPick.onDidHide(() => {
             if (!quickPick.selectedItems.length && provider) {
                 this.show(provider);
             }
-            quickPick.dispose();
+            disposables.dispose();
             this._inQuickPick = false;
-        });
+        }));
     }
     _convertTokensToSymbols(tokens, symbols) {
         let firstListItem;
@@ -377,18 +383,18 @@ let AccessibleView = class AccessibleView extends Disposable {
                         label = token.text;
                         break;
                     case 'list': {
-                        const firstItem = token.items?.[0];
+                        const firstItem = token.items[0];
                         if (!firstItem) {
                             break;
                         }
                         firstListItem = `- ${firstItem.text}`;
-                        label = token.items?.map(i => i.text).join(', ');
+                        label = ( (token.items.map(i => i.text))).join(', ');
                         break;
                     }
                 }
             }
             if (label) {
-                symbols.push({ markdownToParse: label, label: ( localize(2293, "({0}) {1}", token.type, label)), ariaLabel: ( localize(2294, "({0}) {1}", token.type, label)), firstListItem });
+                symbols.push({ markdownToParse: label, label: ( localize(1825, "({0}) {1}", token.type, label)), ariaLabel: ( localize(1826, "({0}) {1}", token.type, label)), firstListItem });
                 firstListItem = undefined;
             }
         }
@@ -420,7 +426,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         }
         this._configurationService.updateValue(this._currentProvider?.verbositySettingKey, false);
         alert(( localize(
-            2295,
+            1827,
             '{0} accessibility verbosity is now disabled',
             this._currentProvider.verbositySettingKey
         )));
@@ -499,17 +505,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(
-                    2296,
+                    1828,
                     'Explore actions such as disabling this hint (Shift+Tab), use Escape to exit this dialog.'
-                )) : ( localize(2297, 'Explore actions such as disabling this hint (Shift+Tab).'));
+                )) : ( localize(1829, 'Explore actions such as disabling this hint (Shift+Tab).'));
             }
-            let ariaLabel = provider.options.type === AccessibleViewType.Help ? ( localize(2298, "Accessibility Help")) : ( localize(2299, "Accessible View"));
+            let ariaLabel = provider.options.type === AccessibleViewType.Help ? ( localize(1830, "Accessibility Help")) : ( localize(1831, "Accessible View"));
             this._title.textContent = ariaLabel;
             if (actionsHint && provider.options.type === AccessibleViewType.View) {
-                ariaLabel = ( localize(2300, "Accessible View, {0}", actionsHint));
+                ariaLabel = ( localize(1832, "Accessible View, {0}", actionsHint));
             }
             else if (actionsHint) {
-                ariaLabel = ( localize(2301, "Accessibility Help, {0}", actionsHint));
+                ariaLabel = ( localize(1833, "Accessibility Help, {0}", actionsHint));
             }
             if (isWindows && widgetIsFocused) {
                 ariaLabel = '';
@@ -577,7 +583,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         return disposableStore;
     }
     _updateToolbar(providedActions, type) {
-        this._toolbar.setAriaLabel(type === AccessibleViewType.Help ? ( localize(2302, 'Accessibility Help')) : ( localize(2303, "Accessible View")));
+        this._toolbar.setAriaLabel(type === AccessibleViewType.Help ? ( localize(1834, 'Accessibility Help')) : ( localize(1835, "Accessible View")));
         const menuActions = [];
         const toolbarMenu = this._register(this._menuService.createMenu(MenuId.AccessibleView, this._contextKeyService));
         createAndFillInActionBarActions(toolbarMenu, {}, menuActions);
@@ -680,9 +686,9 @@ let AccessibleView = class AccessibleView extends Disposable {
     _accessibleViewHelpDialogContent(providerHasSymbols) {
         const navigationHint = this._navigationHint();
         const goToSymbolHint = this._goToSymbolHint(providerHasSymbols);
-        const toolbarHint = ( localize(2304, "Navigate to the toolbar (Shift+Tab)."));
+        const toolbarHint = ( localize(1836, "Navigate to the toolbar (Shift+Tab)."));
         const chatHints = this._getChatHints();
-        let hint = ( localize(2305, "In the accessible view, you can:\n"));
+        let hint = ( localize(1837, "In the accessible view, you can:\n"));
         if (navigationHint) {
             hint += ' - ' + navigationHint + '\n';
         }
@@ -702,24 +708,24 @@ let AccessibleView = class AccessibleView extends Disposable {
             return;
         }
         return [( localize(
-            2306,
+            1838,
             " - Insert the code block at the cursor{0}.",
             '<keybinding:workbench.action.chat.insertCodeBlock>'
         )),
             ( localize(
-                2307,
+                1839,
                 " - Insert the code block into a new file{0}.",
                 '<keybinding:workbench.action.chat.insertIntoNewFile>'
             )),
             ( localize(
-                2308,
+                1840,
                 " - Run the code block in the terminal{0}.\n",
                 '<keybinding:workbench.action.chat.runInTerminal>'
             ))].join('\n');
     }
     _navigationHint() {
         return ( localize(
-            2309,
+            1841,
             "Show the next item{0} or previous item{1}.",
             `<keybinding:${AccessibilityCommandId.ShowNext}`,
             `<keybinding:${AccessibilityCommandId.ShowPrevious}>`
@@ -728,7 +734,7 @@ let AccessibleView = class AccessibleView extends Disposable {
     _disableVerbosityHint(provider) {
         if (provider.options.type === AccessibleViewType.Help && this._verbosityEnabled()) {
             return ( localize(
-                2310,
+                1842,
                 "\nDisable accessibility verbosity for this feature{0}.",
                 `<keybinding:${AccessibilityCommandId.DisableVerbosityHint}>`
             ));
@@ -740,7 +746,7 @@ let AccessibleView = class AccessibleView extends Disposable {
             return;
         }
         return ( localize(
-            2311,
+            1843,
             'Go to a symbol{0}.',
             `<keybinding:${AccessibilityCommandId.GoToSymbol}>`
         ));
@@ -749,7 +755,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(
-            2312,
+            1844,
             '\nConfigure keybindings for commands that lack them {0}.',
             keybindingToConfigureQuickPick
         ));
@@ -758,7 +764,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(
-            2313,
+            1845,
             '\nConfigure keybindings for commands that already have assignments {0}.',
             keybindingToConfigureQuickPick
         ));
@@ -780,11 +786,11 @@ let AccessibleView = class AccessibleView extends Disposable {
         return screenReaderModeHint;
     }
     _exitDialogHint(provider) {
-        return this._verbosityEnabled() && !provider.options.position ? ( localize(2314, '\nExit this dialog (Escape).')) : '';
+        return this._verbosityEnabled() && !provider.options.position ? ( localize(1846, '\nExit this dialog (Escape).')) : '';
     }
     _readMoreHint(provider) {
         return provider.options.readMoreUrl ? ( localize(
-            2315,
+            1847,
             "\nOpen a browser window with more information related to accessibility{0}.",
             `<keybinding:${AccessibilityCommandId.AccessibilityHelpOpenHelpLink}>`
         )) : '';
@@ -844,11 +850,11 @@ let AccessibleViewService = class AccessibleViewService extends Disposable {
         const keybinding = this._keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibleView)?.getAriaLabel();
         let hint = null;
         if (keybinding) {
-            hint = ( localize(2316, "Inspect this in the accessible view with {0}", keybinding));
+            hint = ( localize(1848, "Inspect this in the accessible view with {0}", keybinding));
         }
         else {
             hint = ( localize(
-                2317,
+                1849,
                 "Inspect this in the accessible view via the command Open Accessible View which is currently not triggerable via keybinding."
             ));
         }
@@ -867,12 +873,8 @@ let AccessibleViewService = class AccessibleViewService extends Disposable {
         const lastLine = this._accessibleView?.editorWidget.getModel()?.getLineCount();
         return lastLine !== undefined && lastLine > 0 ? ( (new Position(lastLine, 1))) : undefined;
     }
-    setPosition(position, reveal) {
-        const editorWidget = this._accessibleView?.editorWidget;
-        editorWidget?.setPosition(position);
-        if (reveal) {
-            editorWidget?.revealLine(position.lineNumber);
-        }
+    setPosition(position, reveal, select) {
+        this._accessibleView?.setPosition(position, reveal, select);
     }
     getCodeBlockContext() {
         return this._accessibleView?.getCodeBlockContext();
@@ -892,9 +894,10 @@ let AccessibleViewSymbolQuickPick = class AccessibleViewSymbolQuickPick {
         this._quickInputService = _quickInputService;
     }
     show(provider) {
-        const quickPick = this._quickInputService.createQuickPick();
-        quickPick.placeholder = ( localize(2318, "Type to search symbols"));
-        quickPick.title = ( localize(2319, "Go to Symbol Accessible View"));
+        const disposables = ( (new DisposableStore()));
+        const quickPick = disposables.add(this._quickInputService.createQuickPick());
+        quickPick.placeholder = ( localize(1850, "Type to search symbols"));
+        quickPick.title = ( localize(1851, "Go to Symbol Accessible View"));
         const symbols = this._accessibleView.getSymbols();
         if (!symbols) {
             return;
@@ -904,15 +907,16 @@ let AccessibleViewSymbolQuickPick = class AccessibleViewSymbolQuickPick {
         quickPick.canSelectMany = false;
         quickPick.items = symbols;
         quickPick.show();
-        quickPick.onDidAccept(() => {
+        disposables.add(quickPick.onDidAccept(() => {
             this._accessibleView.showSymbol(provider, quickPick.selectedItems[0]);
             quickPick.hide();
-        });
-        quickPick.onDidHide(() => {
+        }));
+        disposables.add(quickPick.onDidHide(() => {
             if (quickPick.selectedItems.length === 0) {
                 this._accessibleView.show(provider);
             }
-        });
+            disposables.dispose();
+        }));
     }
 };
 AccessibleViewSymbolQuickPick = ( (__decorate([

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

@@ -6,7 +6,7 @@ function resolveContentAndKeybindingItems(keybindingService, value) {
     }
     const configureKeybindingItems = [];
     const configuredKeybindingItems = [];
-    const matches = value.matchAll(/\<keybinding:(?<commandId>.*)\>/gm);
+    const matches = value.matchAll(/(\<keybinding:(?<commandId>[^\<]*)\>)/gm);
     for (const match of [...matches]) {
         const commandId = match?.groups?.commandId;
         let kbLabel;

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

@@ -8,17 +8,18 @@ import { IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibi
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/preferences/common/preferences.service';
+import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 
 class ShowSignalSoundHelp extends Action2 {
     static { this.ID = 'signals.sounds.help'; }
     constructor() {
         super({
             id: ShowSignalSoundHelp.ID,
-            title: ( localize2(5559, "Help: List Signal Sounds")),
+            title: ( localize2(5503, "Help: List Signal Sounds")),
             f1: true,
             metadata: {
                 description: ( localize(
-                    5560,
+                    5504,
                     "List all accessibility sounds, noises, or audio cues and configure their settings"
                 ))
             }
@@ -36,14 +37,15 @@ class ShowSignalSoundHelp extends Action2 {
             signal,
             buttons: userGestureSignals.includes(signal) ? [{
                     iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-                    tooltip: ( localize(5561, 'Configure Sound')),
+                    tooltip: ( localize(5505, 'Configure Sound')),
                     alwaysVisible: true
                 }] : []
         })))).sort((a, b) => a.label.localeCompare(b.label));
-        const qp = quickInputService.createQuickPick();
+        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');
-        qp.onDidAccept(() => {
+        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));
             for (const signal of enabledSounds) {
@@ -63,14 +65,15 @@ class ShowSignalSoundHelp extends Action2 {
                 configurationService.updateValue(signal.settingsKey, value);
             }
             qp.hide();
-        });
-        qp.onDidTriggerItemButton(e => {
+        }));
+        disposables.add(qp.onDidTriggerItemButton(e => {
             preferencesService.openUserSettings({ jsonEditor: true, revealSetting: { key: e.item.signal.settingsKey, edit: true } });
-        });
-        qp.onDidChangeActive(() => {
+        }));
+        disposables.add(qp.onDidChangeActive(() => {
             accessibilitySignalService.playSound(qp.activeItems[0].signal.sound.getSound(true), true, AcknowledgeDocCommentsToken);
-        });
-        qp.placeholder = ( localize(5562, 'Select a sound to play and configure'));
+        }));
+        disposables.add(qp.onDidHide(() => disposables.dispose()));
+        qp.placeholder = ( localize(5506, 'Select a sound to play and configure'));
         qp.canSelectMany = true;
         await qp.show();
     }
@@ -83,11 +86,11 @@ class ShowAccessibilityAnnouncementHelp extends Action2 {
     constructor() {
         super({
             id: ShowAccessibilityAnnouncementHelp.ID,
-            title: ( localize2(5563, "Help: List Signal Announcements")),
+            title: ( localize2(5507, "Help: List Signal Announcements")),
             f1: true,
             metadata: {
                 description: ( localize(
-                    5564,
+                    5508,
                     "List all accessibility announcements, alerts, braille messages, and configure their settings"
                 ))
             }
@@ -105,15 +108,16 @@ class ShowAccessibilityAnnouncementHelp extends Action2 {
             signal,
             buttons: userGestureSignals.includes(signal) ? [{
                     iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-                    tooltip: ( localize(5565, 'Configure Announcement')),
+                    tooltip: ( localize(5509, 'Configure Announcement')),
                     alwaysVisible: true,
                 }] : []
         })))).sort((a, b) => a.label.localeCompare(b.label));
-        const qp = quickInputService.createQuickPick();
+        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');
         const screenReaderOptimized = accessibilityService.isScreenReaderOptimized();
-        qp.onDidAccept(() => {
+        disposables.add(qp.onDidAccept(() => {
             if (!screenReaderOptimized) {
                 qp.hide();
                 return;
@@ -132,12 +136,13 @@ class ShowAccessibilityAnnouncementHelp extends Action2 {
                 configurationService.updateValue(signal.settingsKey, value);
             }
             qp.hide();
-        });
-        qp.onDidTriggerItemButton(e => {
+        }));
+        disposables.add(qp.onDidTriggerItemButton(e => {
             preferencesService.openUserSettings({ jsonEditor: true, revealSetting: { key: e.item.signal.settingsKey, edit: true } });
-        });
-        qp.placeholder = screenReaderOptimized ? ( localize(5566, 'Select an announcement to configure')) : ( localize(
-            5567,
+        }));
+        disposables.add(qp.onDidHide(() => disposables.dispose()));
+        qp.placeholder = screenReaderOptimized ? ( localize(5510, 'Select an announcement to configure')) : ( localize(
+            5511,
             'Screen reader is not active, announcements are disabled by default.'
         ));
         qp.canSelectMany = true;

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

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

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

@@ -14,10 +14,10 @@ class ToggleScreenReaderMode extends Action2 {
     constructor() {
         super({
             id: 'editor.action.toggleScreenReaderAccessibilityMode',
-            title: ( localize2(2320, "Toggle Screen Reader Accessibility Mode")),
+            title: ( localize2(1852, "Toggle Screen Reader Accessibility Mode")),
             metadata: {
                 description: ( localize2(
-                    2321,
+                    1853,
                     "Toggles an optimized mode for usage with screen readers, braille devices, and other assistive technologies."
                 )),
             },