@codingame/monaco-vscode-accessibility-service-override 4.0.0 → 4.1.0

package/accessibility.js

@@ -3,8 +3,8 @@ import { IAccessibleViewService, AccessibleViewService } from 'vscode/vscode/vs/
 import { IAccessibilitySignalService, AccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 import audioAssets from './vscode/src/vs/platform/accessibilitySignal/browser/media/all.mp3.js';
 import { registerAssets } from 'vscode/assets';
-import './vscode/src/vs/workbench/contrib/accessibility/browser/accessibility.contribution.js';
-import './vscode/src/vs/workbench/contrib/codeEditor/browser/accessibility/accessibility.js';
+import 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibility.contribution';
+import 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/accessibility/accessibility';
 import 'vscode/vscode/vs/workbench/contrib/accessibilitySignals/browser/accessibilitySignal.contribution';
 
 registerAssets(audioAssets);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-accessibility-service-override",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,6 +18,6 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@4.0.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@4.1.0"
   }
 }

package/external/rollup-plugin-styles/dist/runtime/inject-css.js

@@ -1,3 +0,0 @@
-var e=[],t=[];function n(n,r){if(n&&"undefined"!=typeof document){var a,s=!0===r.prepend?"prepend":"append",d=!0===r.singleTag,i="string"==typeof r.container?document.querySelector(r.container):document.getElementsByTagName("head")[0];if(d){var u=e.indexOf(i);-1===u&&(u=e.push(i)-1,t[u]={}),a=t[u]&&t[u][s]?t[u][s]:t[u][s]=c();}else a=c();65279===n.charCodeAt(0)&&(n=n.substring(1)),a.styleSheet?a.styleSheet.cssText+=n:a.appendChild(document.createTextNode(n));}function c(){var e=document.createElement("style");if(e.setAttribute("type","text/css"),r.attributes)for(var t=( Object.keys(r.attributes)),n=0;n<t.length;n++)e.setAttribute(t[n],r.attributes[t[n]]);var a="prepend"===s?"afterbegin":"beforeend";return i.insertAdjacentElement(a,e),e}}
-
-export { n as default };

package/external/tslib/tslib.es6.js

@@ -1,11 +0,0 @@
-function __decorate(decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-function __param(paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-}
-
-export { __decorate, __param };

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

@@ -1,24 +0,0 @@
-import { registerAccessibilityConfiguration, DynamicSpeechAccessibilityConfiguration } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { Extensions, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
-import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibleView';
-import { UnfocusedViewDimmingContribution } from './unfocusedViewDimmingContribution.js';
-import { HoverAccessibleViewContribution, NotificationAccessibleViewContribution, InlineCompletionsAccessibleViewContribution } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityContributions';
-import { AccessibilityStatus } from './accessibilityStatus.js';
-import { EditorAccessibilityHelpContribution } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp';
-import { SaveAccessibilitySignalContribution } from './saveAccessibilitySignal.js';
-import { CommentsAccessibilityHelpContribution } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentsAccessibility';
-import { DiffEditorActiveAnnouncementContribution } from './openDiffEditorAnnouncement.js';
-
-registerAccessibilityConfiguration();
-const workbenchRegistry = ( Registry.as(Extensions.Workbench));
-workbenchRegistry.registerWorkbenchContribution(EditorAccessibilityHelpContribution, 4 );
-workbenchRegistry.registerWorkbenchContribution(CommentsAccessibilityHelpContribution, 4 );
-workbenchRegistry.registerWorkbenchContribution(UnfocusedViewDimmingContribution, 3 );
-workbenchRegistry.registerWorkbenchContribution(HoverAccessibleViewContribution, 4 );
-workbenchRegistry.registerWorkbenchContribution(NotificationAccessibleViewContribution, 4 );
-workbenchRegistry.registerWorkbenchContribution(InlineCompletionsAccessibleViewContribution, 4 );
-registerWorkbenchContribution2(AccessibilityStatus.ID, AccessibilityStatus, 2 );
-registerWorkbenchContribution2(SaveAccessibilitySignalContribution.ID, SaveAccessibilitySignalContribution, 3 );
-registerWorkbenchContribution2(DiffEditorActiveAnnouncementContribution.ID, DiffEditorActiveAnnouncementContribution, 3 );
-registerWorkbenchContribution2(DynamicSpeechAccessibilityConfiguration.ID, DynamicSpeechAccessibilityConfiguration, 3 );

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

@@ -1,114 +0,0 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { Event } from 'vscode/vscode/vs/base/common/event';
-import Severity$1 from 'vscode/vscode/vs/base/common/severity';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
-import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { NotificationPriority, INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
-import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
-
-let AccessibilityStatus = class AccessibilityStatus extends Disposable {
-    static { this.ID = 'workbench.contrib.accessibilityStatus'; }
-    constructor(configurationService, notificationService, accessibilityService, statusbarService) {
-        super();
-        this.configurationService = configurationService;
-        this.notificationService = notificationService;
-        this.accessibilityService = accessibilityService;
-        this.statusbarService = statusbarService;
-        this.screenReaderNotification = null;
-        this.promptedScreenReader = false;
-        this.screenReaderModeElement = this._register(( new MutableDisposable()));
-        this._register(CommandsRegistry.registerCommand({ id: 'showEditorScreenReaderNotification', handler: () => this.showScreenReaderNotification() }));
-        this.updateScreenReaderModeElement(this.accessibilityService.isScreenReaderOptimized());
-        this.registerListeners();
-    }
-    registerListeners() {
-        this._register(this.accessibilityService.onDidChangeScreenReaderOptimized(() => this.onScreenReaderModeChange()));
-        this._register(this.configurationService.onDidChangeConfiguration(c => {
-            if (c.affectsConfiguration('editor.accessibilitySupport')) {
-                this.onScreenReaderModeChange();
-            }
-        }));
-    }
-    showScreenReaderNotification() {
-        this.screenReaderNotification = this.notificationService.prompt(Severity$1.Info, ( localizeWithPath(
-            'vs/workbench/contrib/accessibility/browser/accessibilityStatus',
-            'screenReaderDetectedExplanation.question',
-            "Are you using a screen reader to operate VS Code?"
-        )), [{
-                label: ( localizeWithPath(
-                    'vs/workbench/contrib/accessibility/browser/accessibilityStatus',
-                    'screenReaderDetectedExplanation.answerYes',
-                    "Yes"
-                )),
-                run: () => {
-                    this.configurationService.updateValue('editor.accessibilitySupport', 'on', 2 );
-                }
-            }, {
-                label: ( localizeWithPath(
-                    'vs/workbench/contrib/accessibility/browser/accessibilityStatus',
-                    'screenReaderDetectedExplanation.answerNo',
-                    "No"
-                )),
-                run: () => {
-                    this.configurationService.updateValue('editor.accessibilitySupport', 'off', 2 );
-                }
-            }], {
-            sticky: true,
-            priority: NotificationPriority.URGENT
-        });
-        Event.once(this.screenReaderNotification.onDidClose)(() => this.screenReaderNotification = null);
-    }
-    updateScreenReaderModeElement(visible) {
-        if (visible) {
-            if (!this.screenReaderModeElement.value) {
-                const text = ( localizeWithPath(
-                    'vs/workbench/contrib/accessibility/browser/accessibilityStatus',
-                    'screenReaderDetected',
-                    "Screen Reader Optimized"
-                ));
-                this.screenReaderModeElement.value = this.statusbarService.addEntry({
-                    name: ( localizeWithPath(
-                        'vs/workbench/contrib/accessibility/browser/accessibilityStatus',
-                        'status.editor.screenReaderMode',
-                        "Screen Reader Mode"
-                    )),
-                    text,
-                    ariaLabel: text,
-                    command: 'showEditorScreenReaderNotification',
-                    kind: 'prominent',
-                    showInAllWindows: true
-                }, 'status.editor.screenReaderMode', 1 , 100.6);
-            }
-        }
-        else {
-            this.screenReaderModeElement.clear();
-        }
-    }
-    onScreenReaderModeChange() {
-        const screenReaderDetected = this.accessibilityService.isScreenReaderOptimized();
-        if (screenReaderDetected) {
-            const screenReaderConfiguration = this.configurationService.getValue('editor.accessibilitySupport');
-            if (screenReaderConfiguration === 'auto') {
-                if (!this.promptedScreenReader) {
-                    this.promptedScreenReader = true;
-                    setTimeout(() => this.showScreenReaderNotification(), 100);
-                }
-            }
-        }
-        if (this.screenReaderNotification) {
-            this.screenReaderNotification.close();
-        }
-        this.updateScreenReaderModeElement(this.accessibilityService.isScreenReaderOptimized());
-    }
-};
-AccessibilityStatus = ( __decorate([
-    ( __param(0, IConfigurationService)),
-    ( __param(1, INotificationService)),
-    ( __param(2, IAccessibilityService)),
-    ( __param(3, IStatusbarService))
-], AccessibilityStatus));
-
-export { AccessibilityStatus };

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

@@ -1,52 +0,0 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { isDiffEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { Event } from 'vscode/vscode/vs/base/common/event';
-
-let DiffEditorActiveAnnouncementContribution = class DiffEditorActiveAnnouncementContribution extends Disposable {
-    static { this.ID = 'workbench.contrib.diffEditorActiveAnnouncement'; }
-    constructor(_editorService, _accessibilityService, _configurationService) {
-        super();
-        this._editorService = _editorService;
-        this._accessibilityService = _accessibilityService;
-        this._configurationService = _configurationService;
-        this._register(Event.runAndSubscribe(_accessibilityService.onDidChangeScreenReaderOptimized, () => this._updateListener()));
-        this._register(_configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration("accessibility.verbosity.diffEditorActive" )) {
-                this._updateListener();
-            }
-        }));
-    }
-    _updateListener() {
-        const announcementEnabled = this._configurationService.getValue("accessibility.verbosity.diffEditorActive" );
-        const screenReaderOptimized = this._accessibilityService.isScreenReaderOptimized();
-        if (!announcementEnabled || !screenReaderOptimized) {
-            this._onDidActiveEditorChangeListener?.dispose();
-            this._onDidActiveEditorChangeListener = undefined;
-            return;
-        }
-        if (this._onDidActiveEditorChangeListener) {
-            return;
-        }
-        this._onDidActiveEditorChangeListener = this._register(this._editorService.onDidActiveEditorChange(() => {
-            if (isDiffEditor(this._editorService.activeTextEditorControl)) {
-                this._accessibilityService.alert(( localizeWithPath(
-                    'vs/workbench/contrib/accessibility/browser/openDiffEditorAnnouncement',
-                    'openDiffEditorAnnouncement',
-                    "Diff editor"
-                )));
-            }
-        }));
-    }
-};
-DiffEditorActiveAnnouncementContribution = ( __decorate([
-    ( __param(0, IEditorService)),
-    ( __param(1, IAccessibilityService)),
-    ( __param(2, IConfigurationService))
-], DiffEditorActiveAnnouncementContribution));
-
-export { DiffEditorActiveAnnouncementContribution };

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

@@ -1,20 +0,0 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { AccessibilitySignal, IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService';
-
-let SaveAccessibilitySignalContribution = class SaveAccessibilitySignalContribution extends Disposable {
-    static { this.ID = 'workbench.contrib.saveAccessibilitySignal'; }
-    constructor(_accessibilitySignalService, _workingCopyService) {
-        super();
-        this._accessibilitySignalService = _accessibilitySignalService;
-        this._workingCopyService = _workingCopyService;
-        this._register(this._workingCopyService.onDidSave(e => this._accessibilitySignalService.playSignal(AccessibilitySignal.save, { userGesture: e.reason === 1  })));
-    }
-};
-SaveAccessibilitySignalContribution = ( __decorate([
-    ( __param(0, IAccessibilitySignalService)),
-    ( __param(1, IWorkingCopyService))
-], SaveAccessibilitySignalContribution));
-
-export { SaveAccessibilitySignalContribution };

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

@@ -1,68 +0,0 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { createStyleSheet } from 'vscode/vscode/vs/base/browser/dom';
-import { Event } from 'vscode/vscode/vs/base/common/event';
-import { Disposable, toDisposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
-import { clamp } from 'vscode/vscode/vs/base/common/numbers';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-
-let UnfocusedViewDimmingContribution = class UnfocusedViewDimmingContribution extends Disposable {
-    constructor(configurationService) {
-        super();
-        this._styleElementDisposables = undefined;
-        this._register(toDisposable(() => this._removeStyleElement()));
-        this._register(Event.runAndSubscribe(configurationService.onDidChangeConfiguration, e => {
-            if (e && !e.affectsConfiguration("accessibility.dimUnfocused.enabled" ) && !e.affectsConfiguration("accessibility.dimUnfocused.opacity" )) {
-                return;
-            }
-            let cssTextContent = '';
-            const enabled = ensureBoolean(configurationService.getValue("accessibility.dimUnfocused.enabled" ), false);
-            if (enabled) {
-                const opacity = clamp(ensureNumber(configurationService.getValue("accessibility.dimUnfocused.opacity" ), 0.75 ), 0.2 , 1 );
-                if (opacity !== 1) {
-                    const rules = ( new Set());
-                    const filterRule = `filter: opacity(${opacity});`;
-                    rules.add(`.monaco-workbench .pane-body.integrated-terminal:not(:focus-within) .tabs-container { ${filterRule} }`);
-                    rules.add(`.monaco-workbench .pane-body.integrated-terminal .terminal-wrapper:not(:focus-within) { ${filterRule} }`);
-                    rules.add(`.monaco-workbench .editor-instance:not(:focus-within) .monaco-editor { ${filterRule} }`);
-                    rules.add(`.monaco-workbench .editor-instance:not(:focus-within) .breadcrumbs-below-tabs { ${filterRule} }`);
-                    rules.add(`.monaco-workbench .editor-instance:not(:focus-within) .terminal-wrapper { ${filterRule} }`);
-                    rules.add(`.monaco-workbench .editor-instance:not(:focus-within) .settings-editor { ${filterRule} }`);
-                    rules.add(`.monaco-workbench .editor-instance:not(:focus-within) .keybindings-editor { ${filterRule} }`);
-                    rules.add(`.monaco-workbench .editor-instance:not(:focus-within) .monaco-editor-pane-placeholder { ${filterRule} }`);
-                    rules.add(`.monaco-workbench .editor-instance:not(:focus-within) .gettingStartedContainer { ${filterRule} }`);
-                    cssTextContent = [...rules].join('\n');
-                }
-            }
-            if (cssTextContent.length === 0) {
-                this._removeStyleElement();
-            }
-            else {
-                this._getStyleElement().textContent = cssTextContent;
-            }
-        }));
-    }
-    _getStyleElement() {
-        if (!this._styleElement) {
-            this._styleElementDisposables = ( new DisposableStore());
-            this._styleElement = createStyleSheet(undefined, undefined, this._styleElementDisposables);
-            this._styleElement.className = 'accessibilityUnfocusedViewOpacity';
-        }
-        return this._styleElement;
-    }
-    _removeStyleElement() {
-        this._styleElementDisposables?.dispose();
-        this._styleElementDisposables = undefined;
-        this._styleElement = undefined;
-    }
-};
-UnfocusedViewDimmingContribution = ( __decorate([
-    ( __param(0, IConfigurationService))
-], UnfocusedViewDimmingContribution));
-function ensureBoolean(value, defaultValue) {
-    return typeof value === 'boolean' ? value : defaultValue;
-}
-function ensureNumber(value, defaultValue) {
-    return typeof value === 'number' ? value : defaultValue;
-}
-
-export { UnfocusedViewDimmingContribution };

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

@@ -1,6 +0,0 @@
-import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-
-var css = ".accessible-view{background-color:var(--vscode-editorWidget-background);border:2px solid var(--vscode-focusBorder);border-radius:6px;box-shadow:0 2px 8px var(--vscode-widget-shadow);color:var(--vscode-editorWidget-foreground);margin-top:-1px;position:absolute;z-index:2550}.accessible-view-container .actions-container{display:flex;justify-content:flex-end;margin:0 auto;padding:0;width:100%}.accessible-view-title-bar{align-items:center;border-top-left-radius:5px;border-top-right-radius:5px;display:flex}.accessible-view-title{overflow:hidden;padding:3px 0;text-align:center;text-overflow:ellipsis;width:100%}.accessible-view-action-bar{flex:1;justify-content:flex-end;margin-right:4px}.accessible-view-action-bar>.actions-container{justify-content:flex-end}.accessible-view-title-bar .monaco-action-bar .action-label.codicon{background-position:50%;background-repeat:no-repeat;padding:2px}.accessible-view.hide{left:-2000px;pointer-events:none;position:fixed;top:-2000px}";
-n(css,{});
-
-export { css, css as default };

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

@@ -1,40 +0,0 @@
-import './accessibility.css.js';
-import { localize2WithPath } from 'vscode/vscode/vs/nls';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
-import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { accessibilityHelpIsShown } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { alert } from 'vscode/vscode/vs/base/browser/ui/aria/aria';
-import { AccessibilityHelpNLS } from 'vscode/vscode/vs/editor/common/standaloneStrings';
-
-class ToggleScreenReaderMode extends Action2 {
-    constructor() {
-        super({
-            id: 'editor.action.toggleScreenReaderAccessibilityMode',
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/codeEditor/browser/accessibility/accessibility',
-                'toggleScreenReaderMode',
-                "Toggle Screen Reader Accessibility Mode"
-            )),
-            f1: true,
-            keybinding: [{
-                    primary: 2048  | 35 ,
-                    weight: 200  + 10,
-                    when: accessibilityHelpIsShown
-                },
-                {
-                    primary: 512  | 59  | 1024 ,
-                    linux: { primary: 512  | 62  | 1024  },
-                    weight: 200  + 10,
-                }]
-        });
-    }
-    async run(accessor) {
-        const accessibiiltyService = accessor.get(IAccessibilityService);
-        const configurationService = accessor.get(IConfigurationService);
-        const isScreenReaderOptimized = accessibiiltyService.isScreenReaderOptimized();
-        configurationService.updateValue('editor.accessibilitySupport', isScreenReaderOptimized ? 'off' : 'on', 2 );
-        alert(isScreenReaderOptimized ? AccessibilityHelpNLS.screenReaderModeDisabled : AccessibilityHelpNLS.screenReaderModeEnabled);
-    }
-}
-registerAction2(ToggleScreenReaderMode);