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

package/package.json

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

package/vscode/src/vs/platform/accessibilitySignal/browser/media/all.mp3.js

@@ -18,6 +18,8 @@ var audioAssets = {
   'vs/platform/accessibilitySignal/browser/media/taskCompleted.mp3': new URL('../../../../../../../assets/taskCompleted.mp3', import.meta.url).href,
   'vs/platform/accessibilitySignal/browser/media/taskFailed.mp3': new URL('../../../../../../../assets/taskFailed.mp3', import.meta.url).href,
   'vs/platform/accessibilitySignal/browser/media/terminalBell.mp3': new URL('../../../../../../../assets/terminalBell.mp3', import.meta.url).href,
+  'vs/platform/accessibilitySignal/browser/media/voiceRecordingStarted.mp3': new URL('../../../../../../../assets/voiceRecordingStarted.mp3', import.meta.url).href,
+  'vs/platform/accessibilitySignal/browser/media/voiceRecordingStopped.mp3': new URL('../../../../../../../assets/voiceRecordingStopped.mp3', import.meta.url).href,
   'vs/platform/accessibilitySignal/browser/media/warning.mp3': new URL('../../../../../../../assets/warning.mp3', import.meta.url).href
 };
 

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

@@ -1,12 +1,14 @@
 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 { SaveAudioCueContribution } from './saveAudioCue.js';
+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));
@@ -17,5 +19,6 @@ workbenchRegistry.registerWorkbenchContribution(HoverAccessibleViewContribution,
 workbenchRegistry.registerWorkbenchContribution(NotificationAccessibleViewContribution, 4 );
 workbenchRegistry.registerWorkbenchContribution(InlineCompletionsAccessibleViewContribution, 4 );
 registerWorkbenchContribution2(AccessibilityStatus.ID, AccessibilityStatus, 2 );
-registerWorkbenchContribution2(SaveAudioCueContribution.ID, SaveAudioCueContribution, 3 );
+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,78 +1,29 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Disposable, toDisposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Event } from 'vscode/vscode/vs/base/common/event';
-import Severity from 'vscode/vscode/vs/base/common/severity';
+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';
-import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
-import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 
-let ScreenReaderModeStatusEntry = class ScreenReaderModeStatusEntry extends Disposable {
-    constructor(statusbarService) {
-        super();
-        this.statusbarService = statusbarService;
-        this.screenReaderModeElement = this._register(( new MutableDisposable()));
-    }
-    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'
-                }, 'status.editor.screenReaderMode', 1 , 100.6);
-            }
-        }
-        else {
-            this.screenReaderModeElement.clear();
-        }
-    }
-};
-ScreenReaderModeStatusEntry = ( __decorate([
-    ( __param(0, IStatusbarService))
-], ScreenReaderModeStatusEntry));
 let AccessibilityStatus = class AccessibilityStatus extends Disposable {
     static { this.ID = 'workbench.contrib.accessibilityStatus'; }
-    constructor(configurationService, notificationService, accessibilityService, instantiationService, editorGroupService) {
+    constructor(configurationService, notificationService, accessibilityService, statusbarService) {
         super();
         this.configurationService = configurationService;
         this.notificationService = notificationService;
         this.accessibilityService = accessibilityService;
-        this.editorGroupService = editorGroupService;
+        this.statusbarService = statusbarService;
         this.screenReaderNotification = null;
         this.promptedScreenReader = false;
-        this.screenReaderModeElements = ( new Set());
-        this.createScreenReaderModeElement(instantiationService, this._store);
-        this.updateScreenReaderModeElements(accessibilityService.isScreenReaderOptimized());
-        CommandsRegistry.registerCommand({ id: 'showEditorScreenReaderNotification', handler: () => this.showScreenReaderNotification() });
+        this.screenReaderModeElement = this._register(( new MutableDisposable()));
+        this._register(CommandsRegistry.registerCommand({ id: 'showEditorScreenReaderNotification', handler: () => this.showScreenReaderNotification() }));
+        this.updateScreenReaderModeElement(this.accessibilityService.isScreenReaderOptimized());
         this.registerListeners();
     }
-    createScreenReaderModeElement(instantiationService, disposables) {
-        const entry = disposables.add(instantiationService.createInstance(ScreenReaderModeStatusEntry));
-        this.screenReaderModeElements.add(entry);
-        disposables.add(toDisposable(() => this.screenReaderModeElements.delete(entry)));
-        return entry;
-    }
-    updateScreenReaderModeElements(visible) {
-        for (const entry of this.screenReaderModeElements) {
-            entry.updateScreenReaderModeElement(visible);
-        }
-    }
     registerListeners() {
         this._register(this.accessibilityService.onDidChangeScreenReaderOptimized(() => this.onScreenReaderModeChange()));
         this._register(this.configurationService.onDidChangeConfiguration(c => {
@@ -80,13 +31,9 @@ let AccessibilityStatus = class AccessibilityStatus extends Disposable {
                 this.onScreenReaderModeChange();
             }
         }));
-        this._register(this.editorGroupService.onDidCreateAuxiliaryEditorPart(({ instantiationService, disposables }) => {
-            const entry = this.createScreenReaderModeElement(instantiationService, disposables);
-            entry.updateScreenReaderModeElement(this.accessibilityService.isScreenReaderOptimized());
-        }));
     }
     showScreenReaderNotification() {
-        this.screenReaderNotification = this.notificationService.prompt(Severity.Info, ( localizeWithPath(
+        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?"
@@ -114,6 +61,32 @@ let AccessibilityStatus = class AccessibilityStatus extends Disposable {
         });
         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) {
@@ -128,21 +101,14 @@ let AccessibilityStatus = class AccessibilityStatus extends Disposable {
         if (this.screenReaderNotification) {
             this.screenReaderNotification.close();
         }
-        this.updateScreenReaderModeElements(this.accessibilityService.isScreenReaderOptimized());
-    }
-    dispose() {
-        super.dispose();
-        for (const entry of this.screenReaderModeElements) {
-            entry.dispose();
-        }
+        this.updateScreenReaderModeElement(this.accessibilityService.isScreenReaderOptimized());
     }
 };
 AccessibilityStatus = ( __decorate([
     ( __param(0, IConfigurationService)),
     ( __param(1, INotificationService)),
     ( __param(2, IAccessibilityService)),
-    ( __param(3, IInstantiationService)),
-    ( __param(4, IEditorGroupsService))
+    ( __param(3, IStatusbarService))
 ], AccessibilityStatus));
 
 export { AccessibilityStatus };

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

@@ -0,0 +1,52 @@
+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/{saveAudioCue.js → saveAccessibilitySignal.js}

@@ -3,20 +3,18 @@ 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 SaveAudioCueContribution = class SaveAudioCueContribution extends Disposable {
-    static { this.ID = 'workbench.contrib.saveAudioCues'; }
+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  });
-        }));
+        this._register(this._workingCopyService.onDidSave(e => this._accessibilitySignalService.playSignal(AccessibilitySignal.save, { userGesture: e.reason === 1  })));
     }
 };
-SaveAudioCueContribution = ( __decorate([
+SaveAccessibilitySignalContribution = ( __decorate([
     ( __param(0, IAccessibilitySignalService)),
     ( __param(1, IWorkingCopyService))
-], SaveAudioCueContribution));
+], SaveAccessibilitySignalContribution));
 
-export { SaveAudioCueContribution };
+export { SaveAccessibilitySignalContribution };