From 7818968defdefc611e2edbbfdfcfa445fa4851cc Mon Sep 17 00:00:00 2001 From: meganrogge Date: Mon, 16 Oct 2023 08:56:54 -0700 Subject: [PATCH] fix #195612 --- src/vs/platform/accessibility/common/accessibility.ts | 1 - .../workbench/browser/parts/editor/editorAutoSave.ts | 5 +---- .../browser/accessibility.contribution.ts | 2 +- .../browser/accessibleNotificationService.ts | 9 ++++++--- .../contrib/files/test/browser/editorAutoSave.test.ts | 2 +- .../test/browser/bufferContentTracker.test.ts | 2 +- .../workbench/services/editor/browser/editorService.ts | 10 ++-------- src/vs/workbench/test/browser/workbenchTestServices.ts | 2 +- 8 files changed, 13 insertions(+), 20 deletions(-) rename src/vs/{platform => workbench/contrib}/accessibility/browser/accessibleNotificationService.ts (87%) diff --git a/src/vs/platform/accessibility/common/accessibility.ts b/src/vs/platform/accessibility/common/accessibility.ts index 78b0ff84ee5..db150f594fe 100644 --- a/src/vs/platform/accessibility/common/accessibility.ts +++ b/src/vs/platform/accessibility/common/accessibility.ts @@ -56,7 +56,6 @@ export const IAccessibleNotificationService = createDecorator this._notifySaved(e.reason === SaveReason.EXPLICIT))); } notify(event: AccessibleNotificationEvent): void { @@ -31,7 +35,7 @@ export class AccessibleNotificationService extends Disposable implements IAccess } } - notifySaved(userGesture: boolean): void { + private _notifySaved(userGesture: boolean): void { const { audioCue, alertMessage } = this._events.get(AccessibleNotificationEvent.Save)!; const alertSetting: NotificationSetting = this._configurationService.getValue('accessibility.alert.save'); if (this._shouldNotify(alertSetting, userGesture)) { @@ -55,5 +59,4 @@ export class TestAccessibleNotificationService extends Disposable implements IAc declare readonly _serviceBrand: undefined; notify(event: AccessibleNotificationEvent): void { } - notifySaved(userGesture: boolean): void { } } diff --git a/src/vs/workbench/contrib/files/test/browser/editorAutoSave.test.ts b/src/vs/workbench/contrib/files/test/browser/editorAutoSave.test.ts index 185bab56c8e..1c157e3c74d 100644 --- a/src/vs/workbench/contrib/files/test/browser/editorAutoSave.test.ts +++ b/src/vs/workbench/contrib/files/test/browser/editorAutoSave.test.ts @@ -24,7 +24,7 @@ import { TestWorkspace } from 'vs/platform/workspace/test/common/testWorkspace'; import { TestContextService } from 'vs/workbench/test/common/workbenchTestServices'; import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService'; import { IAccessibleNotificationService } from 'vs/platform/accessibility/common/accessibility'; -import { TestAccessibleNotificationService } from 'vs/platform/accessibility/browser/accessibleNotificationService'; +import { TestAccessibleNotificationService } from 'vs/workbench/contrib/accessibility/browser/accessibleNotificationService'; suite('EditorAutoSave', () => { diff --git a/src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts b/src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts index cfe91ea6d7d..bc717d3d81a 100644 --- a/src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts +++ b/src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts @@ -7,7 +7,6 @@ import * as assert from 'assert'; import { importAMDNodeModule } from 'vs/amdX'; import { isWindows } from 'vs/base/common/platform'; import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; -import { TestAccessibleNotificationService } from 'vs/platform/accessibility/browser/accessibleNotificationService'; import { IAccessibleNotificationService } from 'vs/platform/accessibility/common/accessibility'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; @@ -22,6 +21,7 @@ import { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilitie import { ITerminalLogService } from 'vs/platform/terminal/common/terminal'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService'; +import { TestAccessibleNotificationService } from 'vs/workbench/contrib/accessibility/browser/accessibleNotificationService'; import { TerminalConfigHelper } from 'vs/workbench/contrib/terminal/browser/terminalConfigHelper'; import { writeP } from 'vs/workbench/contrib/terminal/browser/terminalTestHelpers'; import { XtermTerminal } from 'vs/workbench/contrib/terminal/browser/xterm/xtermTerminal'; diff --git a/src/vs/workbench/services/editor/browser/editorService.ts b/src/vs/workbench/services/editor/browser/editorService.ts index 3f8e21a8300..f3e96358a17 100644 --- a/src/vs/workbench/services/editor/browser/editorService.ts +++ b/src/vs/workbench/services/editor/browser/editorService.ts @@ -33,7 +33,6 @@ import { IWorkspaceTrustRequestService, WorkspaceTrustUriResponse } from 'vs/pla import { IHostService } from 'vs/workbench/services/host/browser/host'; import { findGroup } from 'vs/workbench/services/editor/common/editorGroupFinder'; import { ITextEditorService } from 'vs/workbench/services/textfile/common/textEditorService'; -import { IAccessibleNotificationService } from 'vs/platform/accessibility/common/accessibility'; export class EditorService extends Disposable implements EditorServiceImpl { @@ -71,8 +70,7 @@ export class EditorService extends Disposable implements EditorServiceImpl { @IEditorResolverService private readonly editorResolverService: IEditorResolverService, @IWorkspaceTrustRequestService private readonly workspaceTrustRequestService: IWorkspaceTrustRequestService, @IHostService private readonly hostService: IHostService, - @ITextEditorService private readonly textEditorService: ITextEditorService, - @IAccessibleNotificationService private readonly accessibleNotificationService: IAccessibleNotificationService + @ITextEditorService private readonly textEditorService: ITextEditorService ) { super(); @@ -974,12 +972,8 @@ export class EditorService extends Disposable implements EditorServiceImpl { } } } - const success = saveResults.every(result => !!result); - if (success) { - this.accessibleNotificationService.notifySaved(options?.reason === SaveReason.EXPLICIT); - } return { - success, + success: saveResults.every(result => !!result), editors: coalesce(saveResults) }; } diff --git a/src/vs/workbench/test/browser/workbenchTestServices.ts b/src/vs/workbench/test/browser/workbenchTestServices.ts index ba78acae038..c7b26d65a40 100644 --- a/src/vs/workbench/test/browser/workbenchTestServices.ts +++ b/src/vs/workbench/test/browser/workbenchTestServices.ts @@ -166,7 +166,7 @@ import { IHoverOptions, IHoverService, IHoverWidget } from 'vs/workbench/service import { IRemoteExtensionsScannerService } from 'vs/platform/remote/common/remoteExtensionsScanner'; import { IRemoteSocketFactoryService, RemoteSocketFactoryService } from 'vs/platform/remote/common/remoteSocketFactoryService'; import { EditorParts } from 'vs/workbench/browser/parts/editor/editorParts'; -import { TestAccessibleNotificationService } from 'vs/platform/accessibility/browser/accessibleNotificationService'; +import { TestAccessibleNotificationService } from 'vs/workbench/contrib/accessibility/browser/accessibleNotificationService'; export function createFileEditorInput(instantiationService: IInstantiationService, resource: URI): FileEditorInput { return instantiationService.createInstance(FileEditorInput, resource, undefined, undefined, undefined, undefined, undefined, undefined);