@codingame/monaco-vscode-accessibility-service-override 21.6.0 → 22.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-accessibility-service-override",
-  "version": "21.6.0",
+  "version": "22.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - accessibility service-override",
   "keywords": [],
@@ -15,8 +15,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "21.6.0",
-    "@codingame/monaco-vscode-e39a1c8f-7892-5d9b-9987-7b10b79e1a0a-common": "21.6.0",
+    "@codingame/monaco-vscode-api": "22.0.0",
+    "@codingame/monaco-vscode-e39a1c8f-7892-5d9b-9987-7b10b79e1a0a-common": "22.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(
-            4280,
+            4288,
             "Screen reader usage detected. Do you want to enable {0} to optimize the editor for screen reader usage?",
             'editor.accessibilitySupport'
         )), [{
-                label: ( localize(4281, "Yes")),
+                label: ( localize(4289, "Yes")),
                 run: () => {
                     this.configurationService.updateValue('editor.accessibilitySupport', 'on', ConfigurationTarget.USER);
                 }
             }, {
-                label: ( localize(4282, "No")),
+                label: ( localize(4290, "No")),
                 run: () => {
                     this.configurationService.updateValue('editor.accessibilitySupport', 'off', ConfigurationTarget.USER);
                 }
             },
             {
-                label: ( localize(4283, "Learn More")),
+                label: ( localize(4291, "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(4284, "Screen Reader Optimized"));
+                const text = ( localize(4292, "Screen Reader Optimized"));
                 this.screenReaderModeElement.value = this.statusbarService.addEntry({
-                    name: ( localize(4285, "Screen Reader Mode")),
+                    name: ( localize(4293, "Screen Reader Mode")),
                     text,
                     ariaLabel: text,
                     command: 'showEditorScreenReaderNotification',

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

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { createElement, getActiveWindow, addDisposableListener, EventType, isActiveElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { createElement, getActiveWindow, getWindow, addDisposableListener, EventType, isActiveElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { StandardKeyboardEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/keyboardEvent';
 import { ActionsOrientation } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { alert } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
@@ -19,6 +19,7 @@ import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/com
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { AccessibilityHelpNLS } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/standaloneStrings';
 import { CodeActionController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/codeAction/browser/codeActionController';
+import { FloatingEditorToolbar } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/floatingMenu/browser/floatingMenu';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { isIAccessibleViewContentProvider, AccessibleContentProvider, AccessibleViewProviderId, ExtensionContentProvider, AccessibleViewType } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleView';
 import { ACCESSIBLE_VIEW_SHOWN_STORAGE_PREFIX } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility';
@@ -90,7 +91,8 @@ let AccessibleView = class AccessibleView extends Disposable {
             this._container.classList.add('hide');
         }
         const codeEditorWidgetOptions = {
-            contributions: EditorExtensionsRegistry.getEditorContributions().filter(c => c.id !== CodeActionController.ID && c.id !== FloatingEditorClickMenu.ID)
+            contributions: EditorExtensionsRegistry.getEditorContributions()
+                .filter(c => c.id !== CodeActionController.ID && c.id !== FloatingEditorClickMenu.ID && c.id !== FloatingEditorToolbar.ID)
         };
         const titleBar = createElement('div');
         titleBar.classList.add('accessible-view-title-bar');
@@ -379,8 +381,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(4286, 'Configure keybindings'));
-        quickPick.placeholder = ( localize(4287, 'Select a command ID to configure a keybinding for it'));
+        quickPick.title = ( localize(4294, 'Configure keybindings'));
+        quickPick.placeholder = ( localize(4295, 'Select a command ID to configure a keybinding for it'));
         quickPick.show();
         disposables.add(quickPick.onDidAccept(async () => {
             const item = quickPick.selectedItems[0];
@@ -420,7 +422,7 @@ let AccessibleView = class AccessibleView extends Disposable {
                 }
             }
             if (label) {
-                symbols.push({ markdownToParse: label, label: ( localize(4288, "({0}) {1}", token.type, label)), ariaLabel: ( localize(4289, "({0}) {1}", token.type, label)), firstListItem });
+                symbols.push({ markdownToParse: label, label: ( localize(4296, "({0}) {1}", token.type, label)), ariaLabel: ( localize(4297, "({0}) {1}", token.type, label)), firstListItem });
                 firstListItem = undefined;
             }
         }
@@ -453,7 +455,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         }
         this._configurationService.updateValue(this._currentProvider?.verbositySettingKey, false);
         alert(( localize(
-            4290,
+            4298,
             '{0} accessibility verbosity is now disabled',
             this._currentProvider.verbositySettingKey
         )));
@@ -532,17 +534,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(
-                    4291,
+                    4299,
                     'Explore actions such as disabling this hint (Shift+Tab), use Escape to exit this dialog.'
-                )) : ( localize(4292, 'Explore actions such as disabling this hint (Shift+Tab).'));
+                )) : ( localize(4300, 'Explore actions such as disabling this hint (Shift+Tab).'));
             }
-            let ariaLabel = provider.options.type === AccessibleViewType.Help ? ( localize(4293, "Accessibility Help")) : ( localize(4294, "Accessible View"));
+            let ariaLabel = provider.options.type === AccessibleViewType.Help ? ( localize(4301, "Accessibility Help")) : ( localize(4302, "Accessible View"));
             this._title.textContent = ariaLabel;
             if (actionsHint && provider.options.type === AccessibleViewType.View) {
-                ariaLabel = ( localize(4295, "Accessible View, {0}", actionsHint));
+                ariaLabel = ( localize(4303, "Accessible View, {0}", actionsHint));
             }
             else if (actionsHint) {
-                ariaLabel = ( localize(4296, "Accessibility Help, {0}", actionsHint));
+                ariaLabel = ( localize(4304, "Accessibility Help, {0}", actionsHint));
             }
             if (isWindows && widgetIsFocused) {
                 ariaLabel = '';
@@ -564,6 +566,12 @@ let AccessibleView = class AccessibleView extends Disposable {
         });
         this._updateToolbar(this._currentProvider.actions, provider.options.type);
         const hide = (e) => {
+            const thisWindowIsFocused = getWindow(this._editorWidget.getDomNode()).document.hasFocus();
+            if (!thisWindowIsFocused) {
+                e?.preventDefault();
+                e?.stopPropagation();
+                return;
+            }
             if (!this._isInQuickPick) {
                 provider.onClose();
             }
@@ -613,7 +621,7 @@ let AccessibleView = class AccessibleView extends Disposable {
         return disposableStore;
     }
     _updateToolbar(providedActions, type) {
-        this._toolbar.setAriaLabel(type === AccessibleViewType.Help ? ( localize(4297, 'Accessibility Help')) : ( localize(4298, "Accessible View")));
+        this._toolbar.setAriaLabel(type === AccessibleViewType.Help ? ( localize(4305, 'Accessibility Help')) : ( localize(4306, "Accessible View")));
         const toolbarMenu = this._register(this._menuService.createMenu(MenuId.AccessibleView, this._contextKeyService));
         const menuActions = getFlatActionBarActions(toolbarMenu.getActions({}));
         if (providedActions) {
@@ -715,9 +723,9 @@ let AccessibleView = class AccessibleView extends Disposable {
     _accessibleViewHelpDialogContent(providerHasSymbols) {
         const navigationHint = this._navigationHint();
         const goToSymbolHint = this._goToSymbolHint(providerHasSymbols);
-        const toolbarHint = ( localize(4299, "Navigate to the toolbar (Shift+Tab)."));
+        const toolbarHint = ( localize(4307, "Navigate to the toolbar (Shift+Tab)."));
         const chatHints = this._getChatHints();
-        let hint = ( localize(4300, "In the accessible view, you can:\n"));
+        let hint = ( localize(4308, "In the accessible view, you can:\n"));
         if (navigationHint) {
             hint += ' - ' + navigationHint + '\n';
         }
@@ -737,24 +745,24 @@ let AccessibleView = class AccessibleView extends Disposable {
             return;
         }
         return [( localize(
-            4301,
+            4309,
             " - Insert the code block at the cursor{0}.",
             '<keybinding:workbench.action.chat.insertCodeBlock>'
         )),
             ( localize(
-            4302,
+            4310,
             " - Insert the code block into a new file{0}.",
             '<keybinding:workbench.action.chat.insertIntoNewFile>'
         )),
             ( localize(
-            4303,
+            4311,
             " - Run the code block in the terminal{0}.\n",
             '<keybinding:workbench.action.chat.runInTerminal>'
         ))].join('\n');
     }
     _navigationHint() {
         return localize(
-            4304,
+            4312,
             "Show the next item{0} or previous item{1}.",
             `<keybinding:${AccessibilityCommandId.ShowNext}`,
             `<keybinding:${AccessibilityCommandId.ShowPrevious}>`
@@ -763,7 +771,7 @@ let AccessibleView = class AccessibleView extends Disposable {
     _disableVerbosityHint(provider) {
         if (provider.options.type === AccessibleViewType.Help && this._verbosityEnabled()) {
             return localize(
-                4305,
+                4313,
                 "\nDisable accessibility verbosity for this feature{0}.",
                 `<keybinding:${AccessibilityCommandId.DisableVerbosityHint}>`
             );
@@ -775,7 +783,7 @@ let AccessibleView = class AccessibleView extends Disposable {
             return;
         }
         return localize(
-            4306,
+            4314,
             'Go to a symbol{0}.',
             `<keybinding:${AccessibilityCommandId.GoToSymbol}>`
         );
@@ -784,7 +792,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(
-            4307,
+            4315,
             '\nConfigure keybindings for commands that lack them {0}.',
             keybindingToConfigureQuickPick
         );
@@ -793,7 +801,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(
-            4308,
+            4316,
             '\nConfigure keybindings for commands that already have assignments {0}.',
             keybindingToConfigureQuickPick
         );
@@ -815,11 +823,11 @@ let AccessibleView = class AccessibleView extends Disposable {
         return screenReaderModeHint;
     }
     _exitDialogHint(provider) {
-        return this._verbosityEnabled() && !provider.options.position ? ( localize(4309, '\nExit this dialog (Escape).')) : '';
+        return this._verbosityEnabled() && !provider.options.position ? ( localize(4317, '\nExit this dialog (Escape).')) : '';
     }
     _readMoreHint(provider) {
         return provider.options.readMoreUrl ? ( localize(
-            4310,
+            4318,
             "\nOpen a browser window with more information related to accessibility{0}.",
             `<keybinding:${AccessibilityCommandId.AccessibilityHelpOpenHelpLink}>`
         )) : '';
@@ -881,11 +889,11 @@ let AccessibleViewService = class AccessibleViewService extends Disposable {
         const keybinding = this._keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibleView)?.getAriaLabel();
         let hint = null;
         if (keybinding) {
-            hint = ( localize(4311, "Inspect this in the accessible view with {0}", keybinding));
+            hint = ( localize(4319, "Inspect this in the accessible view with {0}", keybinding));
         }
         else {
             hint = ( localize(
-                4312,
+                4320,
                 "Inspect this in the accessible view via the command Open Accessible View which is currently not triggerable via keybinding."
             ));
         }
@@ -927,8 +935,8 @@ let AccessibleViewSymbolQuickPick = class AccessibleViewSymbolQuickPick {
     show(provider) {
         const disposables = ( new DisposableStore());
         const quickPick = disposables.add(this._quickInputService.createQuickPick());
-        quickPick.placeholder = ( localize(4313, "Type to search symbols"));
-        quickPick.title = ( localize(4314, "Go to Symbol Accessible View"));
+        quickPick.placeholder = ( localize(4321, "Type to search symbols"));
+        quickPick.title = ( localize(4322, "Go to Symbol Accessible View"));
         const picks = [];
         const symbols = this._accessibleView.getSymbols();
         if (!symbols) {

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

@@ -1,6 +1,6 @@
 import { MarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent";
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
-import { IPickerQuickAccessItem } from "@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess";
+import { IPickerQuickAccessItem } from "@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess";
 export declare function resolveContentAndKeybindingItems(keybindingService: IKeybindingService, value?: string): {
     content: MarkdownString;
     configureKeybindingItems: IPickerQuickAccessItem[] | undefined;

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(4327, "Help: List Signal Sounds")),
+            title: ( localize2(4335, "Help: List Signal Sounds")),
             f1: true,
             metadata: {
                 description: ( localize(
-                    4328,
+                    4336,
                     "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(4329, 'Configure Sound')),
+                    tooltip: ( localize(4337, '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(4330, 'Select a sound to play and configure'));
+        qp.placeholder = ( localize(4338, '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(4331, "Help: List Signal Announcements")),
+            title: ( localize2(4339, "Help: List Signal Announcements")),
             f1: true,
             metadata: {
                 description: ( localize(
-                    4332,
+                    4340,
                     "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(4333, 'Configure Announcement')),
+                    tooltip: ( localize(4341, '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(4334, 'Select an announcement to configure')) : ( localize(
-            4335,
+        qp.placeholder = screenReaderOptimized ? ( localize(4342, 'Select an announcement to configure')) : ( localize(
+            4343,
             '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(4336, "Diff editor")));
+                this._accessibilityService.alert(( localize(4344, "Diff editor")));
             }
         }));
     }

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

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