@codingame/monaco-vscode-accessibility-service-override 5.3.0 → 6.0.0

package/accessibility.js

@@ -1,8 +1,8 @@
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { AccessibleViewService } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibleView';
+import { AccessibleViewService } from './vscode/src/vs/workbench/contrib/accessibility/browser/accessibleView.js';
 import { AccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 import audioAssets from './vscode/src/vs/platform/accessibilitySignal/browser/media/all.mp3.js';
-import { IAccessibleViewService } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibleView.service';
+import { IAccessibleViewService } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView.service';
 import { IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
 import { IAccessibleViewInformationService } from 'vscode/vscode/vs/workbench/services/accessibility/common/accessibleViewInformationService.service';
 import { AccessibleViewInformationService } from './vscode/src/vs/workbench/services/accessibility/common/accessibleViewInformationService.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-accessibility-service-override",
-  "version": "5.3.0",
+  "version": "6.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@5.3.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@6.0.0"
   }
 }

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

@@ -15,6 +15,7 @@ var audioAssets = {
   'vs/platform/accessibilitySignal/browser/media/progress.mp3': new URL('../../../../../../../assets/progress.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/success.mp3': new URL('../../../../../../../assets/success.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,

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

@@ -1,32 +1,29 @@
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { registerAccessibilityConfiguration, DynamicSpeechAccessibilityConfiguration } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { Extensions, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions, registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibleView';
-import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { UnfocusedViewDimmingContribution } from './unfocusedViewDimmingContribution.js';
-import { HoverAccessibleViewContribution, NotificationAccessibleViewContribution, CommentAccessibleViewContribution, InlineCompletionsAccessibleViewContribution, ExtensionAccessibilityHelpDialogContribution } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibleViewContributions';
 import { AccessibilityStatus } from './accessibilityStatus.js';
 import { EditorAccessibilityHelpContribution } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp';
 import { SaveAccessibilitySignalContribution } from '../../accessibilitySignals/browser/saveAccessibilitySignal.js';
-import { CommentsAccessibilityHelpContribution } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentsAccessibility';
 import { DiffEditorActiveAnnouncementContribution } from '../../accessibilitySignals/browser/openDiffEditorAnnouncement.js';
 import { SpeechAccessibilitySignalContribution } from '../../speech/browser/speechAccessibilitySignal.js';
-import { registerAudioCueConfiguration } from './audioCueConfiguration.js';
 import '../../../services/accessibility/common/accessibleViewInformationService.js';
+import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import './accessibleView.js';
+import { AccesibleViewHelpContribution, AccesibleViewContributions } from './accessibleViewContributions.js';
+import { ExtensionAccessibilityHelpDialogContribution } from './extensionAccesibilityHelp.contribution.js';
 
 registerAccessibilityConfiguration();
-registerAudioCueConfiguration();
 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(CommentAccessibleViewContribution, 4 );
-workbenchRegistry.registerWorkbenchContribution(InlineCompletionsAccessibleViewContribution, 4 );
-registerWorkbenchContribution2(AccessibilityStatus.ID, AccessibilityStatus, 2 );
-registerWorkbenchContribution2(ExtensionAccessibilityHelpDialogContribution.ID, ExtensionAccessibilityHelpDialogContribution, 2 );
-registerWorkbenchContribution2(SaveAccessibilitySignalContribution.ID, SaveAccessibilitySignalContribution, 3 );
-registerWorkbenchContribution2(SpeechAccessibilitySignalContribution.ID, SpeechAccessibilitySignalContribution, 3 );
-registerWorkbenchContribution2(DiffEditorActiveAnnouncementContribution.ID, DiffEditorActiveAnnouncementContribution, 3 );
-registerWorkbenchContribution2(DynamicSpeechAccessibilityConfiguration.ID, DynamicSpeechAccessibilityConfiguration, 3 );
+workbenchRegistry.registerWorkbenchContribution(EditorAccessibilityHelpContribution, LifecyclePhase.Eventually);
+workbenchRegistry.registerWorkbenchContribution(UnfocusedViewDimmingContribution, LifecyclePhase.Restored);
+workbenchRegistry.registerWorkbenchContribution(AccesibleViewHelpContribution, LifecyclePhase.Eventually);
+workbenchRegistry.registerWorkbenchContribution(AccesibleViewContributions, LifecyclePhase.Eventually);
+registerWorkbenchContribution2(AccessibilityStatus.ID, AccessibilityStatus, WorkbenchPhase.BlockRestore);
+registerWorkbenchContribution2(ExtensionAccessibilityHelpDialogContribution.ID, ExtensionAccessibilityHelpDialogContribution, WorkbenchPhase.BlockRestore);
+registerWorkbenchContribution2(SaveAccessibilitySignalContribution.ID, SaveAccessibilitySignalContribution, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(SpeechAccessibilitySignalContribution.ID, SpeechAccessibilitySignalContribution, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(DiffEditorActiveAnnouncementContribution.ID, DiffEditorActiveAnnouncementContribution, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(DynamicSpeechAccessibilityConfiguration.ID, DynamicSpeechAccessibilityConfiguration, WorkbenchPhase.AfterRestored);

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

@@ -5,9 +5,11 @@ 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.service';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { ConfigurationTarget } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { NotificationPriority } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
+import { StatusbarAlignment } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 
 const _moduleId = "vs/workbench/contrib/accessibility/browser/accessibilityStatus";
@@ -38,12 +40,12 @@ let AccessibilityStatus = class AccessibilityStatus extends Disposable {
         this.screenReaderNotification = this.notificationService.prompt(Severity$1.Info, ( localizeWithPath(_moduleId, 0, "Are you using a screen reader to operate VS Code?")), [{
                 label: ( localizeWithPath(_moduleId, 1, "Yes")),
                 run: () => {
-                    this.configurationService.updateValue('editor.accessibilitySupport', 'on', 2 );
+                    this.configurationService.updateValue('editor.accessibilitySupport', 'on', ConfigurationTarget.USER);
                 }
             }, {
                 label: ( localizeWithPath(_moduleId, 2, "No")),
                 run: () => {
-                    this.configurationService.updateValue('editor.accessibilitySupport', 'off', 2 );
+                    this.configurationService.updateValue('editor.accessibilitySupport', 'off', ConfigurationTarget.USER);
                 }
             }], {
             sticky: true,
@@ -62,7 +64,7 @@ let AccessibilityStatus = class AccessibilityStatus extends Disposable {
                     command: 'showEditorScreenReaderNotification',
                     kind: 'prominent',
                     showInAllWindows: true
-                }, 'status.editor.screenReaderMode', 1 , 100.6);
+                }, 'status.editor.screenReaderMode', StatusbarAlignment.RIGHT, 100.6);
             }
         }
         else {