@codingame/monaco-vscode-accessibility-service-override 10.1.3 → 11.0.0

package/package.json

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

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

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

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

@@ -36,10 +36,12 @@ import { accessibilityHelpIsShown, accessibleViewIsShown, accessibleViewSupports
 import { resolveContentAndKeybindingItems } from './accessibleViewKeybindingResolver.js';
 import { IChatCodeBlockContextProviderService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { getSimpleEditorOptions } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
 
 let AccessibleView = class AccessibleView extends Disposable {
     get editorWidget() { return this._editorWidget; }
-    constructor(_openerService, _instantiationService, _configurationService, _modelService, _contextViewService, _contextKeyService, _accessibilityService, _keybindingService, _layoutService, _menuService, _commandService, _codeBlockContextProviderService, _storageService, _quickInputService) {
+    constructor(_openerService, _instantiationService, _configurationService, _modelService, _contextViewService, _contextKeyService, _accessibilityService, _keybindingService, _layoutService, _menuService, _commandService, _codeBlockContextProviderService, _storageService, textModelResolverService, _quickInputService) {
         super();
         this._openerService = _openerService;
         this._instantiationService = _instantiationService;
@@ -54,6 +56,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         this._commandService = _commandService;
         this._codeBlockContextProviderService = _codeBlockContextProviderService;
         this._storageService = _storageService;
+        this.textModelResolverService = textModelResolverService;
         this._quickInputService = _quickInputService;
         this._inQuickPick = false;
         this._accessiblityHelpIsShown = accessibilityHelpIsShown.bindTo(this._contextKeyService);
@@ -103,6 +106,7 @@ let AccessibleView = class AccessibleView extends Disposable {
             readOnly: true,
             fontFamily: 'var(--monaco-monospace-font)'
         };
+        this.textModelResolverService.registerTextModelContentProvider(Schemas.accessibleView, this);
         this._editorWidget = this._register(this._instantiationService.createInstance(CodeEditorWidget, this._container, editorOptions, codeEditorWidgetOptions));
         this._register(this._accessibilityService.onDidChangeScreenReaderOptimized(() => {
             if (this._currentProvider && this._accessiblityHelpIsShown.get()) {
@@ -133,6 +137,9 @@ let AccessibleView = class AccessibleView extends Disposable {
             }
         }));
     }
+    provideTextContent(resource) {
+        return this._getTextModel(resource);
+    }
     _resetContextKeys() {
         this._accessiblityHelpIsShown.reset();
         this._accessibleViewIsShown.reset();
@@ -239,7 +246,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         if (provider.options.id) {
             this._lastProvider = provider;
         }
-        if (provider.id === "panelChat" ) {
+        if (provider.id === "panelChat"  || provider.id === "quickChat" ) {
             this._register(this._codeBlockContextProviderService.registerProvider({ getCodeBlockContext: () => this.getCodeBlockContext() }, 'accessibleView'));
         }
         if (provider instanceof ExtensionContentProvider) {
@@ -283,7 +290,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         if (!markdown) {
             return;
         }
-        if (this._currentProvider?.id !== "panelChat" ) {
+        if (this._currentProvider?.id !== "panelChat"  && this._currentProvider?.id !== "quickChat" ) {
             return;
         }
         if (this._currentProvider.options.language && this._currentProvider.options.language !== 'markdown') {
@@ -344,8 +351,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(2311, 'Configure keybindings'));
-        quickPick.placeholder = ( localize(2312, 'Select a command ID to configure a keybinding for it'));
+        quickPick.title = ( localize(1777, 'Configure keybindings'));
+        quickPick.placeholder = ( localize(1778, 'Select a command ID to configure a keybinding for it'));
         quickPick.show();
         disposables.add(quickPick.onDidAccept(async () => {
             const item = quickPick.selectedItems[0];
@@ -385,7 +392,7 @@ let AccessibleView = class AccessibleView extends Disposable {
                 }
             }
             if (label) {
-                symbols.push({ markdownToParse: label, label: ( localize(2313, "({0}) {1}", token.type, label)), ariaLabel: ( localize(2314, "({0}) {1}", token.type, label)), firstListItem });
+                symbols.push({ markdownToParse: label, label: ( localize(1779, "({0}) {1}", token.type, label)), ariaLabel: ( localize(1780, "({0}) {1}", token.type, label)), firstListItem });
                 firstListItem = undefined;
             }
         }
@@ -417,7 +424,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         }
         this._configurationService.updateValue(this._currentProvider?.verbositySettingKey, false);
         alert(( localize(
-            2315,
+            1781,
             '{0} accessibility verbosity is now disabled',
             this._currentProvider.verbositySettingKey
         )));
@@ -480,7 +487,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         this._updateContextKeys(provider, true);
         const widgetIsFocused = this._editorWidget.hasTextFocus() || this._editorWidget.hasWidgetFocus();
         this._getTextModel(( (URI.from(
-            { path: `accessible-view-${provider.id}`, scheme: 'accessible-view', fragment: this._currentContent }
+            { path: `accessible-view-${provider.id}`, scheme: Schemas.accessibleView, fragment: this._currentContent }
         )))).then((model) => {
             if (!model) {
                 return;
@@ -496,17 +503,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(
-                    2316,
+                    1782,
                     'Explore actions such as disabling this hint (Shift+Tab), use Escape to exit this dialog.'
-                )) : ( localize(2317, 'Explore actions such as disabling this hint (Shift+Tab).'));
+                )) : ( localize(1783, 'Explore actions such as disabling this hint (Shift+Tab).'));
             }
-            let ariaLabel = provider.options.type === "help"  ? ( localize(2318, "Accessibility Help")) : ( localize(2319, "Accessible View"));
+            let ariaLabel = provider.options.type === "help"  ? ( localize(1784, "Accessibility Help")) : ( localize(1785, "Accessible View"));
             this._title.textContent = ariaLabel;
             if (actionsHint && provider.options.type === "view" ) {
-                ariaLabel = ( localize(2320, "Accessible View, {0}", actionsHint));
+                ariaLabel = ( localize(1786, "Accessible View, {0}", actionsHint));
             }
             else if (actionsHint) {
-                ariaLabel = ( localize(2321, "Accessibility Help, {0}", actionsHint));
+                ariaLabel = ( localize(1787, "Accessibility Help, {0}", actionsHint));
             }
             if (isWindows && widgetIsFocused) {
                 ariaLabel = '';
@@ -574,7 +581,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         return disposableStore;
     }
     _updateToolbar(providedActions, type) {
-        this._toolbar.setAriaLabel(type === "help"  ? ( localize(2322, 'Accessibility Help')) : ( localize(2323, "Accessible View")));
+        this._toolbar.setAriaLabel(type === "help"  ? ( localize(1788, 'Accessibility Help')) : ( localize(1789, "Accessible View")));
         const menuActions = [];
         const toolbarMenu = this._register(this._menuService.createMenu(MenuId.AccessibleView, this._contextKeyService));
         createAndFillInActionBarActions(toolbarMenu, {}, menuActions);
@@ -677,9 +684,9 @@ let AccessibleView = class AccessibleView extends Disposable {
     _accessibleViewHelpDialogContent(providerHasSymbols) {
         const navigationHint = this._navigationHint();
         const goToSymbolHint = this._goToSymbolHint(providerHasSymbols);
-        const toolbarHint = ( localize(2324, "Navigate to the toolbar (Shift+Tab)."));
+        const toolbarHint = ( localize(1790, "Navigate to the toolbar (Shift+Tab)."));
         const chatHints = this._getChatHints();
-        let hint = ( localize(2325, "In the accessible view, you can:\n"));
+        let hint = ( localize(1791, "In the accessible view, you can:\n"));
         if (navigationHint) {
             hint += ' - ' + navigationHint + '\n';
         }
@@ -695,28 +702,28 @@ let AccessibleView = class AccessibleView extends Disposable {
         return hint;
     }
     _getChatHints() {
-        if (this._currentProvider?.id !== "panelChat" ) {
+        if (this._currentProvider?.id !== "panelChat"  && this._currentProvider?.id !== "quickChat" ) {
             return;
         }
         return [( localize(
-            2326,
+            1792,
             " - Insert the code block at the cursor{0}.",
             '<keybinding:workbench.action.chat.insertCodeBlock>'
         )),
             ( localize(
-                2327,
+                1793,
                 " - Insert the code block into a new file{0}.",
                 '<keybinding:workbench.action.chat.insertIntoNewFile>'
             )),
             ( localize(
-                2328,
+                1794,
                 " - Run the code block in the terminal{0}.\n",
                 '<keybinding:workbench.action.chat.runInTerminal>'
             ))].join('\n');
     }
     _navigationHint() {
         return ( localize(
-            2329,
+            1795,
             "Show the next item{0} or previous item{1}.",
             `<keybinding:${"editor.action.accessibleViewNext" }`,
             `<keybinding:${"editor.action.accessibleViewPrevious" }>`
@@ -725,7 +732,7 @@ let AccessibleView = class AccessibleView extends Disposable {
     _disableVerbosityHint(provider) {
         if (provider.options.type === "help"  && this._verbosityEnabled()) {
             return ( localize(
-                2330,
+                1796,
                 "\nDisable accessibility verbosity for this feature{0}.",
                 `<keybinding:${"editor.action.accessibleViewDisableHint" }>`
             ));
@@ -737,7 +744,7 @@ let AccessibleView = class AccessibleView extends Disposable {
             return;
         }
         return ( localize(
-            2331,
+            1797,
             'Go to a symbol{0}.',
             `<keybinding:${"editor.action.accessibleViewGoToSymbol" }>`
         ));
@@ -746,7 +753,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         const configureKb = this._keybindingService.lookupKeybinding("editor.action.accessibilityHelpConfigureKeybindings" )?.getAriaLabel();
         const keybindingToConfigureQuickPick = configureKb ? '(' + configureKb + ')' : 'by assigning a keybinding to the command Accessibility Help Configure Unassigned Keybindings.';
         return ( localize(
-            2332,
+            1798,
             '\nConfigure keybindings for commands that lack them {0}.',
             keybindingToConfigureQuickPick
         ));
@@ -755,7 +762,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         const configureKb = this._keybindingService.lookupKeybinding("editor.action.accessibilityHelpConfigureAssignedKeybindings" )?.getAriaLabel();
         const keybindingToConfigureQuickPick = configureKb ? '(' + configureKb + ')' : 'by assigning a keybinding to the command Accessibility Help Configure Assigned Keybindings.';
         return ( localize(
-            2333,
+            1799,
             '\nConfigure keybindings for commands that already have assignments {0}.',
             keybindingToConfigureQuickPick
         ));
@@ -777,11 +784,11 @@ let AccessibleView = class AccessibleView extends Disposable {
         return screenReaderModeHint;
     }
     _exitDialogHint(provider) {
-        return this._verbosityEnabled() && !provider.options.position ? ( localize(2334, '\nExit this dialog (Escape).')) : '';
+        return this._verbosityEnabled() && !provider.options.position ? ( localize(1800, '\nExit this dialog (Escape).')) : '';
     }
     _readMoreHint(provider) {
         return provider.options.readMoreUrl ? ( localize(
-            2335,
+            1801,
             "\nOpen a browser window with more information related to accessibility{0}.",
             `<keybinding:${"editor.action.accessibilityHelpOpenHelpLink" }>`
         )) : '';
@@ -801,7 +808,8 @@ AccessibleView = ( (__decorate([
     ( (__param(10, ICommandService))),
     ( (__param(11, IChatCodeBlockContextProviderService))),
     ( (__param(12, IStorageService))),
-    ( (__param(13, IQuickInputService)))
+    ( (__param(13, ITextModelService))),
+    ( (__param(14, IQuickInputService)))
 ], AccessibleView)));
 let AccessibleViewService = class AccessibleViewService extends Disposable {
     constructor(_instantiationService, _configurationService, _keybindingService) {
@@ -841,11 +849,11 @@ let AccessibleViewService = class AccessibleViewService extends Disposable {
         const keybinding = this._keybindingService.lookupKeybinding("editor.action.accessibleView" )?.getAriaLabel();
         let hint = null;
         if (keybinding) {
-            hint = ( localize(2336, "Inspect this in the accessible view with {0}", keybinding));
+            hint = ( localize(1802, "Inspect this in the accessible view with {0}", keybinding));
         }
         else {
             hint = ( localize(
-                2337,
+                1803,
                 "Inspect this in the accessible view via the command Open Accessible View which is currently not triggerable via keybinding."
             ));
         }
@@ -887,8 +895,8 @@ let AccessibleViewSymbolQuickPick = class AccessibleViewSymbolQuickPick {
     show(provider) {
         const disposables = ( (new DisposableStore()));
         const quickPick = disposables.add(this._quickInputService.createQuickPick());
-        quickPick.placeholder = ( localize(2338, "Type to search symbols"));
-        quickPick.title = ( localize(2339, "Go to Symbol Accessible View"));
+        quickPick.placeholder = ( localize(1804, "Type to search symbols"));
+        quickPick.title = ( localize(1805, "Go to Symbol Accessible View"));
         const symbols = this._accessibleView.getSymbols();
         if (!symbols) {
             return;

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

@@ -15,11 +15,11 @@ class ShowSignalSoundHelp extends Action2 {
     constructor() {
         super({
             id: ShowSignalSoundHelp.ID,
-            title: ( localize2(5562, "Help: List Signal Sounds")),
+            title: ( localize2(5560, "Help: List Signal Sounds")),
             f1: true,
             metadata: {
                 description: ( localize(
-                    5563,
+                    5561,
                     "List all accessibility sounds, noises, or audio cues and configure their settings"
                 ))
             }
@@ -37,7 +37,7 @@ class ShowSignalSoundHelp extends Action2 {
             signal,
             buttons: userGestureSignals.includes(signal) ? [{
                     iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-                    tooltip: ( localize(5564, 'Configure Sound')),
+                    tooltip: ( localize(5562, 'Configure Sound')),
                     alwaysVisible: true
                 }] : []
         })))).sort((a, b) => a.label.localeCompare(b.label));
@@ -73,7 +73,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(5565, 'Select a sound to play and configure'));
+        qp.placeholder = ( localize(5563, 'Select a sound to play and configure'));
         qp.canSelectMany = true;
         await qp.show();
     }
@@ -86,11 +86,11 @@ class ShowAccessibilityAnnouncementHelp extends Action2 {
     constructor() {
         super({
             id: ShowAccessibilityAnnouncementHelp.ID,
-            title: ( localize2(5566, "Help: List Signal Announcements")),
+            title: ( localize2(5564, "Help: List Signal Announcements")),
             f1: true,
             metadata: {
                 description: ( localize(
-                    5567,
+                    5565,
                     "List all accessibility announcements, alerts, braille messages, and configure their settings"
                 ))
             }
@@ -108,7 +108,7 @@ class ShowAccessibilityAnnouncementHelp extends Action2 {
             signal,
             buttons: userGestureSignals.includes(signal) ? [{
                     iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-                    tooltip: ( localize(5568, 'Configure Announcement')),
+                    tooltip: ( localize(5566, 'Configure Announcement')),
                     alwaysVisible: true,
                 }] : []
         })))).sort((a, b) => a.label.localeCompare(b.label));
@@ -141,8 +141,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(5569, 'Select an announcement to configure')) : ( localize(
-            5570,
+        qp.placeholder = screenReaderOptimized ? ( localize(5567, 'Select an announcement to configure')) : ( localize(
+            5568,
             'Screen reader is not active, announcements are disabled by default.'
         ));
         qp.canSelectMany = true;

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

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

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

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