From a82ba5f0a4d5ebf9019f7981d87a213c4c910a79 Mon Sep 17 00:00:00 2001 From: meganrogge Date: Fri, 13 Oct 2023 09:27:29 -0700 Subject: [PATCH] fix issue --- .../accessibility/browser/accessibleNotificationService.ts | 2 +- src/vs/platform/accessibility/common/accessibility.ts | 2 +- .../accessibility/browser/accessibility.contribution.ts | 3 +++ .../contrib/audioCues/browser/audioCues.contribution.ts | 2 +- src/vs/workbench/contrib/terminal/browser/terminalInstance.ts | 2 +- src/vs/workbench/workbench.web.main.ts | 4 +--- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/vs/platform/accessibility/browser/accessibleNotificationService.ts b/src/vs/platform/accessibility/browser/accessibleNotificationService.ts index 836cf2e09ad8d..28986f441880c 100644 --- a/src/vs/platform/accessibility/browser/accessibleNotificationService.ts +++ b/src/vs/platform/accessibility/browser/accessibleNotificationService.ts @@ -29,7 +29,7 @@ export class AccessibleNotificationService extends Disposable implements IAccess } } -export class TestAccessibleNotificationService implements IAccessibleNotificationService { +export class TestAccessibleNotificationService extends Disposable implements IAccessibleNotificationService { declare readonly _serviceBrand: undefined; diff --git a/src/vs/platform/accessibility/common/accessibility.ts b/src/vs/platform/accessibility/common/accessibility.ts index 7119216984506..d8b0df4eb0c8a 100644 --- a/src/vs/platform/accessibility/common/accessibility.ts +++ b/src/vs/platform/accessibility/common/accessibility.ts @@ -47,6 +47,7 @@ export function isAccessibilityInformation(obj: any): obj is IAccessibilityInfor && (typeof obj.role === 'undefined' || typeof obj.role === 'string'); } +export const IAccessibleNotificationService = createDecorator('accessibleNotificationService'); /** * Manages whether an audio cue or an aria alert will be used * in response to actions taken around the workbench. @@ -57,4 +58,3 @@ export interface IAccessibleNotificationService { notifyCleared(): void; } -export const IAccessibleNotificationService = createDecorator('accessibleNotificationService'); diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibility.contribution.ts b/src/vs/workbench/contrib/accessibility/browser/accessibility.contribution.ts index efc4a052f460a..5d513a9be9abf 100644 --- a/src/vs/workbench/contrib/accessibility/browser/accessibility.contribution.ts +++ b/src/vs/workbench/contrib/accessibility/browser/accessibility.contribution.ts @@ -13,9 +13,12 @@ import { UnfocusedViewDimmingContribution } from 'vs/workbench/contrib/accessibi import { EditorAccessibilityHelpContribution, HoverAccessibleViewContribution, InlineCompletionsAccessibleViewContribution, NotificationAccessibleViewContribution } from 'vs/workbench/contrib/accessibility/browser/accessibilityContributions'; import { AccessibilityStatus } from 'vs/workbench/contrib/accessibility/browser/accessibilityStatus'; import { CommentsAccessibilityHelpContribution } from 'vs/workbench/contrib/comments/browser/comments.contribution'; +import { IAccessibleNotificationService } from 'vs/platform/accessibility/common/accessibility'; +import { AccessibleNotificationService } from 'vs/platform/accessibility/browser/accessibleNotificationService'; registerAccessibilityConfiguration(); registerSingleton(IAccessibleViewService, AccessibleViewService, InstantiationType.Delayed); +registerSingleton(IAccessibleNotificationService, AccessibleNotificationService, InstantiationType.Delayed); const workbenchRegistry = Registry.as(WorkbenchExtensions.Workbench); workbenchRegistry.registerWorkbenchContribution(EditorAccessibilityHelpContribution, LifecyclePhase.Eventually); diff --git a/src/vs/workbench/contrib/audioCues/browser/audioCues.contribution.ts b/src/vs/workbench/contrib/audioCues/browser/audioCues.contribution.ts index 22a4a7e390bf2..369a1668f97f1 100644 --- a/src/vs/workbench/contrib/audioCues/browser/audioCues.contribution.ts +++ b/src/vs/workbench/contrib/audioCues/browser/audioCues.contribution.ts @@ -133,7 +133,7 @@ Registry.as(ConfigurationExtensions.Configuration).regis default: 'off' }, 'audioCues.clear': { - 'description': localize('audioCues.clear', "Plays a sound when a feature is cleared (for example, the terminal, debug console, or output channel)."), + 'description': localize('audioCues.clear', "Plays a sound when a feature is cleared (for example, the terminal, debug console, or output channel). When this is disabled, an aria alert will announce 'Cleared'."), ...audioCueFeatureBase, default: 'off' }, diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts index 467a5190c3015..a7c08bc63d83d 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts @@ -355,7 +355,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance { @IOpenerService private readonly _openerService: IOpenerService, @ICommandService private readonly _commandService: ICommandService, @IAudioCueService private readonly _audioCueService: IAudioCueService, - @IViewDescriptorService private readonly _viewDescriptorService: IViewDescriptorService, + @IViewDescriptorService private readonly _viewDescriptorService: IViewDescriptorService ) { super(); diff --git a/src/vs/workbench/workbench.web.main.ts b/src/vs/workbench/workbench.web.main.ts index dbc49cb9dd708..c61a78d6fc121 100644 --- a/src/vs/workbench/workbench.web.main.ts +++ b/src/vs/workbench/workbench.web.main.ts @@ -66,7 +66,7 @@ import 'vs/platform/extensionResourceLoader/browser/extensionResourceLoaderServi import 'vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService'; import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions'; -import { IAccessibilityService, IAccessibleNotificationService } from 'vs/platform/accessibility/common/accessibility'; +import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { ContextMenuService } from 'vs/platform/contextview/browser/contextMenuService'; import { IExtensionTipsService } from 'vs/platform/extensionManagement/common/extensionManagement'; @@ -93,7 +93,6 @@ import { WebLanguagePacksService } from 'vs/platform/languagePacks/browser/langu registerSingleton(IWorkbenchExtensionManagementService, ExtensionManagementService, InstantiationType.Delayed); registerSingleton(IAccessibilityService, AccessibilityService, InstantiationType.Delayed); -registerSingleton(IAccessibleNotificationService, AccessibleNotificationService, InstantiationType.Delayed); registerSingleton(IContextMenuService, ContextMenuService, InstantiationType.Delayed); registerSingleton(IUserDataSyncStoreService, UserDataSyncStoreService, InstantiationType.Delayed); registerSingleton(IUserDataSyncMachinesService, UserDataSyncMachinesService, InstantiationType.Delayed); @@ -182,7 +181,6 @@ import { Disposable } from 'vs/base/common/lifecycle'; import { GroupOrientation } from 'vs/workbench/services/editor/common/editorGroupsService'; import { UserDataSyncResourceProviderService } from 'vs/platform/userDataSync/common/userDataSyncResourceProvider'; import { RemoteAuthorityResolverError, RemoteAuthorityResolverErrorCode } from 'vs/platform/remote/common/remoteAuthorityResolver'; -import { AccessibleNotificationService } from 'vs/platform/accessibility/browser/accessibleNotificationService'; export {