@codingame/monaco-vscode-api 1.81.8-next.3 → 1.82.0-next.0

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

@@ -1,249 +1,13 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { ICodeEditorService } from 'monaco-editor/esm/vs/editor/browser/services/codeEditorService.js';
-import { AccessibilityHelpNLS } from 'monaco-editor/esm/vs/editor/common/standaloneStrings.js';
-import { ToggleTabFocusModeAction } from 'monaco-editor/esm/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
-import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
-import { registerAccessibilityConfiguration, AccessibilityHelpAction, AccessibleViewAction, AccessibleViewNextAction, AccessibleViewPreviousAction } from './accessibilityContribution.js';
-import * as strings from 'monaco-editor/esm/vs/base/common/strings.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { registerAccessibilityConfiguration } from './accessibilityConfiguration.js';
 import { Extensions } from '../../../common/contributions.js';
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
-import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
-import { NEW_UNTITLED_FILE_COMMAND_ID } from '../../files/browser/fileConstants.js';
-import { ModesHoverController } from 'monaco-editor/esm/vs/editor/contrib/hover/browser/hover.js';
-import { IContextViewService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
-import { EditorContextKeys } from 'monaco-editor/esm/vs/editor/common/editorContextKeys.js';
-import { getNotificationFromContext } from '../../../browser/parts/notifications/notificationsCommands.js';
-import { IListService, WorkbenchList } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
-import { NotificationFocusedContext } from '../../../common/contextkeys.js';
-import { IAccessibleViewService } from './accessibleView.js';
-import { IHoverService } from '../../../services/hover/browser/hover.js';
-import { alert } from 'monaco-editor/esm/vs/base/browser/ui/aria/aria.js';
+import { UnfocusedViewDimmingContribution } from './unfocusedViewDimmingContribution.js';
+import { EditorAccessibilityHelpContribution, HoverAccessibleViewContribution, NotificationAccessibleViewContribution, InlineCompletionsAccessibleViewContribution } from './accessibilityContributions.js';
 registerAccessibilityConfiguration();
-let AccessibilityHelpProvider = class AccessibilityHelpProvider {
-    onClose() {
-        this._editor.focus();
-    }
-    constructor(_editor, _keybindingService) {
-        this._editor = _editor;
-        this._keybindingService = _keybindingService;
-        this.options = { type: "help" , ariaLabel: ( localize('editor-help', "editor accessibility help")), readMoreUrl: 'https://go.microsoft.com/fwlink/?linkid=851010' };
-        this.verbositySettingKey = "accessibility.verbosity.editor" ;
-    }
-    _descriptionForCommand(commandId, msg, noKbMsg) {
-        const kb = this._keybindingService.lookupKeybinding(commandId);
-        if (kb) {
-            return strings.format(msg, kb.getAriaLabel());
-        }
-        return strings.format(noKbMsg, commandId);
-    }
-    provideContent() {
-        const options = this._editor.getOptions();
-        const content = [];
-        if (options.get(60 )) {
-            if (options.get(89 )) {
-                content.push(AccessibilityHelpNLS.readonlyDiffEditor);
-            }
-            else {
-                content.push(AccessibilityHelpNLS.editableDiffEditor);
-            }
-        }
-        else {
-            if (options.get(89 )) {
-                content.push(AccessibilityHelpNLS.readonlyEditor);
-            }
-            else {
-                content.push(AccessibilityHelpNLS.editableEditor);
-            }
-        }
-        if (options.get(141 )) {
-            content.push(this._descriptionForCommand(ToggleTabFocusModeAction.ID, AccessibilityHelpNLS.tabFocusModeOnMsg, AccessibilityHelpNLS.tabFocusModeOnMsgNoKb));
-        }
-        else {
-            content.push(this._descriptionForCommand(ToggleTabFocusModeAction.ID, AccessibilityHelpNLS.tabFocusModeOffMsg, AccessibilityHelpNLS.tabFocusModeOffMsgNoKb));
-        }
-        return content.join('\n');
-    }
-};
-AccessibilityHelpProvider = ( __decorate([
-    ( __param(1, IKeybindingService))
-], AccessibilityHelpProvider));
-class EditorAccessibilityHelpContribution extends Disposable {
-    constructor() {
-        super();
-        this._register(AccessibilityHelpAction.addImplementation(95, 'editor', async (accessor) => {
-            const codeEditorService = accessor.get(ICodeEditorService);
-            const accessibleViewService = accessor.get(IAccessibleViewService);
-            const instantiationService = accessor.get(IInstantiationService);
-            const commandService = accessor.get(ICommandService);
-            let codeEditor = codeEditorService.getActiveCodeEditor() || codeEditorService.getFocusedCodeEditor();
-            if (!codeEditor) {
-                await commandService.executeCommand(NEW_UNTITLED_FILE_COMMAND_ID);
-                codeEditor = codeEditorService.getActiveCodeEditor();
-            }
-            accessibleViewService.show(instantiationService.createInstance(AccessibilityHelpProvider, codeEditor));
-        }));
-    }
-}
 const workbenchRegistry = ( Registry.as(Extensions.Workbench));
 workbenchRegistry.registerWorkbenchContribution(EditorAccessibilityHelpContribution, 4 );
-class HoverAccessibleViewContribution extends Disposable {
-    constructor() {
-        super();
-        this._options = {
-            ariaLabel: ( localize('hoverAccessibleView', "Hover Accessible View")), language: 'typescript', type: "view"
-        };
-        this._register(AccessibleViewAction.addImplementation(95, 'hover', accessor => {
-            const accessibleViewService = accessor.get(IAccessibleViewService);
-            const codeEditorService = accessor.get(ICodeEditorService);
-            const editor = codeEditorService.getActiveCodeEditor() || codeEditorService.getFocusedCodeEditor();
-            const editorHoverContent = editor ? ModesHoverController.get(editor)?.getWidgetContent() ?? undefined : undefined;
-            if (!editor || !editorHoverContent) {
-                return false;
-            }
-            this._options.language = editor?.getModel()?.getLanguageId() ?? undefined;
-            accessibleViewService.show({
-                verbositySettingKey: "accessibility.verbosity.hover" ,
-                provideContent() { return editorHoverContent; },
-                onClose() {
-                    ModesHoverController.get(editor)?.focus();
-                },
-                options: this._options
-            });
-            return true;
-        }, EditorContextKeys.hoverFocused));
-        this._register(AccessibleViewAction.addImplementation(90, 'extension-hover', accessor => {
-            const accessibleViewService = accessor.get(IAccessibleViewService);
-            const contextViewService = accessor.get(IContextViewService);
-            const contextViewElement = contextViewService.getContextViewElement();
-            const extensionHoverContent = contextViewElement?.textContent ?? undefined;
-            const hoverService = accessor.get(IHoverService);
-            if (contextViewElement.classList.contains('accessible-view-container') || !extensionHoverContent) {
-                return false;
-            }
-            accessibleViewService.show({
-                verbositySettingKey: "accessibility.verbosity.hover" ,
-                provideContent() { return extensionHoverContent; },
-                onClose() {
-                    hoverService.showAndFocusLastHover();
-                },
-                options: this._options
-            });
-            return true;
-        }));
-    }
-}
+workbenchRegistry.registerWorkbenchContribution(UnfocusedViewDimmingContribution, 3 );
 const workbenchContributionsRegistry = ( Registry.as(Extensions.Workbench));
 workbenchContributionsRegistry.registerWorkbenchContribution(HoverAccessibleViewContribution, 4 );
-class NotificationAccessibleViewContribution extends Disposable {
-    constructor() {
-        super();
-        this._register(AccessibleViewAction.addImplementation(90, 'notifications', accessor => {
-            const accessibleViewService = accessor.get(IAccessibleViewService);
-            const listService = accessor.get(IListService);
-            const commandService = accessor.get(ICommandService);
-            function renderAccessibleView() {
-                const notification = getNotificationFromContext(listService);
-                if (!notification) {
-                    return false;
-                }
-                commandService.executeCommand('notifications.showList');
-                let notificationIndex;
-                let length;
-                const list = listService.lastFocusedList;
-                if (list instanceof WorkbenchList) {
-                    notificationIndex = list.indexOf(notification);
-                    length = list.length;
-                }
-                if (notificationIndex === undefined) {
-                    return false;
-                }
-                function focusList() {
-                    commandService.executeCommand('notifications.showList');
-                    if (list && notificationIndex !== undefined) {
-                        list.domFocus();
-                        try {
-                            list.setFocus([notificationIndex]);
-                        }
-                        catch { }
-                    }
-                }
-                const message = ( notification.message.original.toString());
-                if (!message) {
-                    return false;
-                }
-                accessibleViewService.show({
-                    provideContent: () => {
-                        return ( localize(
-                            'notification.accessibleView',
-                            '{0} Source: {1}',
-                            message,
-                            notification.source
-                        ));
-                    },
-                    onClose() {
-                        focusList();
-                    },
-                    next() {
-                        if (!list) {
-                            return;
-                        }
-                        focusList();
-                        list.focusNext();
-                        alertFocusChange(notificationIndex, length, 'next');
-                        renderAccessibleView();
-                    },
-                    previous() {
-                        if (!list) {
-                            return;
-                        }
-                        focusList();
-                        list.focusPrevious();
-                        alertFocusChange(notificationIndex, length, 'previous');
-                        renderAccessibleView();
-                    },
-                    verbositySettingKey: "accessibility.verbosity.notification" ,
-                    options: {
-                        ariaLabel: ( localize('notification', "Notification Accessible View")),
-                        type: "view"
-                    }
-                });
-                return true;
-            }
-            return renderAccessibleView();
-        }, NotificationFocusedContext));
-    }
-}
 workbenchContributionsRegistry.registerWorkbenchContribution(NotificationAccessibleViewContribution, 4 );
-class AccessibleViewNavigatorContribution extends Disposable {
-    constructor() {
-        super();
-        this._register(AccessibleViewNextAction.addImplementation(95, 'next', accessor => {
-            const accessibleViewService = accessor.get(IAccessibleViewService);
-            accessibleViewService.next();
-            return true;
-        }));
-        this._register(AccessibleViewPreviousAction.addImplementation(95, 'previous', accessor => {
-            const accessibleViewService = accessor.get(IAccessibleViewService);
-            accessibleViewService.previous();
-            return true;
-        }));
-    }
-}
-workbenchContributionsRegistry.registerWorkbenchContribution(AccessibleViewNavigatorContribution, 4 );
-function alertFocusChange(index, length, type) {
-    if (index === undefined || length === undefined) {
-        return;
-    }
-    const number = index + 1;
-    if (type === 'next' && number + 1 <= length) {
-        alert(`Focused ${number + 1} of ${length}`);
-    }
-    else if (type === 'previous' && number - 1 > 0) {
-        alert(`Focused ${number - 1} of ${length}`);
-    }
-    return;
-}
-export { alertFocusChange };
+workbenchContributionsRegistry.registerWorkbenchContribution(InlineCompletionsAccessibleViewContribution, 4 );

package/vscode/src/vs/workbench/contrib/accessibility/browser/{accessibilityContribution.js → accessibilityConfiguration.js}

@@ -1,11 +1,14 @@
 import { localize } from 'monaco-editor/esm/vs/nls.js';
 import { Extensions } from 'monaco-editor/esm/vs/platform/configuration/common/configurationRegistry.js';
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
-import { MultiCommand } from 'monaco-editor/esm/vs/editor/browser/editorExtensions.js';
-import { MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 import { RawContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { workbenchConfigurationNodeBase } from '../../../common/configuration.js';
 const accessibilityHelpIsShown = ( new RawContextKey('accessibilityHelpIsShown', false, true));
 const accessibleViewIsShown = ( new RawContextKey('accessibleViewIsShown', false, true));
+const accessibleViewSupportsNavigation = ( new RawContextKey('accessibleViewSupportsNavigation', false, true));
+const accessibleViewVerbosityEnabled = ( new RawContextKey('accessibleViewVerbosityEnabled', false, true));
+const accessibleViewGoToSymbolSupported = ( new RawContextKey('accessibleViewGoToSymbolSupported', false, true));
+const accessibleViewCurrentProviderId = ( new RawContextKey('accessibleViewCurrentProviderId', undefined, undefined));
 const baseProperty = {
     type: 'boolean',
     default: true,
@@ -44,6 +47,13 @@ const configuration = {
             )),
             ...baseProperty
         },
+        ["accessibility.verbosity.inlineCompletions" ]: {
+            description: ( localize(
+                'verbosity.inlineCompletions.description',
+                'Provide information about how to access the inline completions hover and accessible view'
+            )),
+            ...baseProperty
+        },
         ["accessibility.verbosity.keybindingsEditor" ]: {
             description: ( localize(
                 'verbosity.keybindingsEditor.description',
@@ -71,79 +81,46 @@ const configuration = {
                 'Provide information about how to open the notification in an accessible view.'
             )),
             ...baseProperty
+        },
+        ["accessibility.verbosity.untitledHint" ]: {
+            description: ( localize(
+                'verbosity.untitledhint',
+                'Provide information about relevant actions in an untitled text editor.'
+            )),
+            ...baseProperty
         }
     }
 };
 function registerAccessibilityConfiguration() {
-    const configurationRegistry = ( Registry.as(Extensions.Configuration));
-    configurationRegistry.registerConfiguration(configuration);
-}
-function registerCommand(command) {
-    command.register();
-    return command;
-}
-const AccessibilityHelpAction = registerCommand(( new MultiCommand({
-    id: 'editor.action.accessibilityHelp',
-    precondition: undefined,
-    kbOpts: {
-        primary: 512  | 59 ,
-        weight: 200 ,
-        linux: {
-            primary: 512  | 1024  | 59 ,
-            secondary: [512  | 59 ]
-        }
-    },
-    menuOpts: [{
-            menuId: MenuId.CommandPalette,
-            group: '',
-            title: ( localize('editor.action.accessibilityHelp', "Open Accessibility Help")),
-            order: 1
-        }],
-})));
-const AccessibleViewAction = registerCommand(( new MultiCommand({
-    id: 'editor.action.accessibleView',
-    precondition: undefined,
-    kbOpts: {
-        primary: 512  | 60 ,
-        weight: 200 ,
-        linux: {
-            primary: 512  | 1024  | 60 ,
-            secondary: [512  | 60 ]
+    const registry = ( Registry.as(Extensions.Configuration));
+    registry.registerConfiguration(configuration);
+    registry.registerConfiguration({
+        ...workbenchConfigurationNodeBase,
+        properties: {
+            ["accessibility.dimUnfocused.enabled" ]: {
+                description: ( localize(
+                    'dimUnfocusedEnabled',
+                    'Whether to dim unfocused editors and terminals, which makes it more clear where typed input will go to. This works with the majority of editors with the notable exceptions of those that utilize iframes like notebooks and extension webview editors.'
+                )),
+                type: 'boolean',
+                default: false,
+                tags: ['accessibility'],
+                scope: 1 ,
+            },
+            ["accessibility.dimUnfocused.opacity" ]: {
+                markdownDescription: ( localize(
+                    'dimUnfocusedOpacity',
+                    'The opacity fraction (0.2 to 1.0) to use for unfocused editors and terminals. This will only take effect when {0} is enabled.',
+                    `\`#${"accessibility.dimUnfocused.enabled" }#\``
+                )),
+                type: 'number',
+                minimum: 0.2 ,
+                maximum: 1 ,
+                default: 0.75 ,
+                tags: ['accessibility'],
+                scope: 1 ,
+            }
         }
-    },
-    menuOpts: [{
-            menuId: MenuId.CommandPalette,
-            group: '',
-            title: ( localize('editor.action.accessibleView', "Open Accessible View")),
-            order: 1
-        }],
-})));
-const AccessibleViewNextAction = registerCommand(( new MultiCommand({
-    id: 'editor.action.accessibleViewNext',
-    precondition: accessibleViewIsShown,
-    kbOpts: {
-        primary: 512  | 94 ,
-        weight: 200
-    },
-    menuOpts: [{
-            menuId: MenuId.CommandPalette,
-            group: '',
-            title: ( localize('editor.action.accessibleViewNext', "Show Next in Accessible View")),
-            order: 1
-        }],
-})));
-const AccessibleViewPreviousAction = registerCommand(( new MultiCommand({
-    id: 'editor.action.accessibleViewPrevious',
-    precondition: accessibleViewIsShown,
-    kbOpts: {
-        primary: 512  | 92 ,
-        weight: 200
-    },
-    menuOpts: [{
-            menuId: MenuId.CommandPalette,
-            group: '',
-            title: ( localize('editor.action.accessibleViewPrevious', "Show Previous in Accessible View")),
-            order: 1
-        }],
-})));
-export { AccessibilityHelpAction, AccessibleViewAction, AccessibleViewNextAction, AccessibleViewPreviousAction, accessibilityHelpIsShown, accessibleViewIsShown, registerAccessibilityConfiguration };
+    });
+}
+export { accessibilityHelpIsShown, accessibleViewCurrentProviderId, accessibleViewGoToSymbolSupported, accessibleViewIsShown, accessibleViewSupportsNavigation, accessibleViewVerbosityEnabled, registerAccessibilityConfiguration };