@codingame/monaco-vscode-accessibility-service-override 2.2.1 → 3.0.0

package/accessibility.js

@@ -1,11 +1,17 @@
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { IAccessibleViewService, AccessibleViewService } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibleView';
+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/accessibilitySignals/browser/accessibilitySignal.contribution';
 
+registerAssets(audioAssets);
 function getServiceOverride() {
     return {
-        [( IAccessibleViewService.toString())]: new SyncDescriptor(AccessibleViewService, [], true)
+        [( IAccessibleViewService.toString())]: new SyncDescriptor(AccessibleViewService, [], true),
+        [( IAccessibilitySignalService.toString())]: new SyncDescriptor(AccessibilitySignalService, [], true)
     };
 }
 

package/package.json

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

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

@@ -0,0 +1,24 @@
+var audioAssets = {
+  'vs/platform/accessibilitySignal/browser/media/break.mp3': new URL('../../../../../../../assets/break.mp3', import.meta.url).href,
+  'vs/platform/accessibilitySignal/browser/media/chatRequestSent.mp3': new URL('../../../../../../../assets/chatRequestSent.mp3', import.meta.url).href,
+  'vs/platform/accessibilitySignal/browser/media/chatResponsePending.mp3': new URL('../../../../../../../assets/chatResponsePending.mp3', import.meta.url).href,
+  'vs/platform/accessibilitySignal/browser/media/chatResponseReceived1.mp3': new URL('../../../../../../../assets/chatResponseReceived1.mp3', import.meta.url).href,
+  'vs/platform/accessibilitySignal/browser/media/chatResponseReceived2.mp3': new URL('../../../../../../../assets/chatResponseReceived2.mp3', import.meta.url).href,
+  'vs/platform/accessibilitySignal/browser/media/chatResponseReceived3.mp3': new URL('../../../../../../../assets/chatResponseReceived3.mp3', import.meta.url).href,
+  'vs/platform/accessibilitySignal/browser/media/chatResponseReceived4.mp3': new URL('../../../../../../../assets/chatResponseReceived4.mp3', import.meta.url).href,
+  'vs/platform/accessibilitySignal/browser/media/clear.mp3': new URL('../../../../../../../assets/clear.mp3', import.meta.url).href,
+  'vs/platform/accessibilitySignal/browser/media/diffLineDeleted.mp3': new URL('../../../../../../../assets/diffLineDeleted.mp3', import.meta.url).href,
+  'vs/platform/accessibilitySignal/browser/media/diffLineInserted.mp3': new URL('../../../../../../../assets/diffLineInserted.mp3', import.meta.url).href,
+  'vs/platform/accessibilitySignal/browser/media/diffLineModified.mp3': new URL('../../../../../../../assets/diffLineModified.mp3', import.meta.url).href,
+  'vs/platform/accessibilitySignal/browser/media/error.mp3': new URL('../../../../../../../assets/error.mp3', import.meta.url).href,
+  'vs/platform/accessibilitySignal/browser/media/foldedAreas.mp3': new URL('../../../../../../../assets/foldedAreas.mp3', import.meta.url).href,
+  'vs/platform/accessibilitySignal/browser/media/format.mp3': new URL('../../../../../../../assets/format.mp3', import.meta.url).href,
+  'vs/platform/accessibilitySignal/browser/media/quickFixes.mp3': new URL('../../../../../../../assets/quickFixes.mp3', import.meta.url).href,
+  'vs/platform/accessibilitySignal/browser/media/save.mp3': new URL('../../../../../../../assets/save.mp3', import.meta.url).href,
+  '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/warning.mp3': new URL('../../../../../../../assets/warning.mp3', import.meta.url).href
+};
+
+export { audioAssets as default };

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

@@ -1,5 +1,5 @@
 import { registerAccessibilityConfiguration, DynamicSpeechAccessibilityConfiguration } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { UnfocusedViewDimmingContribution } from './unfocusedViewDimmingContribution.js';
 import { HoverAccessibleViewContribution, NotificationAccessibleViewContribution, InlineCompletionsAccessibleViewContribution } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityContributions';
@@ -13,10 +13,9 @@ const workbenchRegistry = ( Registry.as(Extensions.Workbench));
 workbenchRegistry.registerWorkbenchContribution(EditorAccessibilityHelpContribution, 4 );
 workbenchRegistry.registerWorkbenchContribution(CommentsAccessibilityHelpContribution, 4 );
 workbenchRegistry.registerWorkbenchContribution(UnfocusedViewDimmingContribution, 3 );
-const workbenchContributionsRegistry = ( Registry.as(Extensions.Workbench));
-workbenchContributionsRegistry.registerWorkbenchContribution(HoverAccessibleViewContribution, 4 );
-workbenchContributionsRegistry.registerWorkbenchContribution(NotificationAccessibleViewContribution, 4 );
-workbenchContributionsRegistry.registerWorkbenchContribution(InlineCompletionsAccessibleViewContribution, 4 );
-workbenchContributionsRegistry.registerWorkbenchContribution(AccessibilityStatus, 2 );
-workbenchContributionsRegistry.registerWorkbenchContribution(SaveAudioCueContribution, 2 );
-workbenchContributionsRegistry.registerWorkbenchContribution(DynamicSpeechAccessibilityConfiguration, 2 );
+workbenchRegistry.registerWorkbenchContribution(HoverAccessibleViewContribution, 4 );
+workbenchRegistry.registerWorkbenchContribution(NotificationAccessibleViewContribution, 4 );
+workbenchRegistry.registerWorkbenchContribution(InlineCompletionsAccessibleViewContribution, 4 );
+registerWorkbenchContribution2(AccessibilityStatus.ID, AccessibilityStatus, 2 );
+registerWorkbenchContribution2(SaveAudioCueContribution.ID, SaveAudioCueContribution, 3 );
+registerWorkbenchContribution2(DynamicSpeechAccessibilityConfiguration.ID, DynamicSpeechAccessibilityConfiguration, 3 );

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

@@ -47,6 +47,7 @@ ScreenReaderModeStatusEntry = ( __decorate([
     ( __param(0, IStatusbarService))
 ], ScreenReaderModeStatusEntry));
 let AccessibilityStatus = class AccessibilityStatus extends Disposable {
+    static { this.ID = 'workbench.contrib.accessibilityStatus'; }
     constructor(configurationService, notificationService, accessibilityService, instantiationService, editorGroupService) {
         super();
         this.configurationService = configurationService;

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

@@ -1,20 +1,21 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { AudioCue, IAudioCueService } from 'vscode/vscode/vs/platform/audioCues/browser/audioCueService';
+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 {
-    constructor(_audioCueService, _workingCopyService) {
+    static { this.ID = 'workbench.contrib.saveAudioCues'; }
+    constructor(_accessibilitySignalService, _workingCopyService) {
         super();
-        this._audioCueService = _audioCueService;
+        this._accessibilitySignalService = _accessibilitySignalService;
         this._workingCopyService = _workingCopyService;
         this._register(this._workingCopyService.onDidSave((e) => {
-            this._audioCueService.playAudioCue(AudioCue.save, { userGesture: e.reason === 1  });
+            this._accessibilitySignalService.playSignal(AccessibilitySignal.save, { userGesture: e.reason === 1  });
         }));
     }
 };
 SaveAudioCueContribution = ( __decorate([
-    ( __param(0, IAudioCueService)),
+    ( __param(0, IAccessibilitySignalService)),
     ( __param(1, IWorkingCopyService))
 ], SaveAudioCueContribution));
 

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

@@ -1,5 +1,5 @@
 import './accessibility.css.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+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';
@@ -11,11 +11,11 @@ class ToggleScreenReaderMode extends Action2 {
     constructor() {
         super({
             id: 'editor.action.toggleScreenReaderAccessibilityMode',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/codeEditor/browser/accessibility/accessibility',
                 'toggleScreenReaderMode',
                 "Toggle Screen Reader Accessibility Mode"
-            )), original: 'Toggle Screen Reader Accessibility Mode' },
+            )),
             f1: true,
             keybinding: [{
                     primary: 2048  | 35 ,