Edit Sessions -> Cloud Changes (microsoft#165877)

Author: joyceerhl

src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts

@@ -131,7 +131,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 		this.shouldShowViewsContext = EDIT_SESSIONS_SHOW_VIEW.bindTo(this.contextKeyService);
 
 		this._register(this.fileService.registerProvider(EditSessionsFileSystemProvider.SCHEMA, new EditSessionsFileSystemProvider(this.editSessionsStorageService)));
-		this.lifecycleService.onWillShutdown((e) => e.join(this.autoStoreEditSession(), { id: 'autoStoreEditSession', label: localize('autoStoreEditSession', 'Storing current edit session...') }));
+		this.lifecycleService.onWillShutdown((e) => e.join(this.autoStoreEditSession(), { id: 'autoStoreWorkingChanges', label: localize('autoStoreWorkingChanges', 'Storing current working changes...') }));
 		this._register(this.editSessionsStorageService.onDidSignIn(() => this.updateAccountsMenuBadge()));
 		this._register(this.editSessionsStorageService.onDidSignOut(() => this.updateAccountsMenuBadge()));
 	}
@@ -149,10 +149,10 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 			const shouldAutoResumeOnReload = this.configurationService.getValue('workbench.editSessions.autoResume') === 'onReload';
 
 			if (this.environmentService.editSessionId !== undefined) {
-				this.logService.info(`Resuming edit session, reason: found editSessionId ${this.environmentService.editSessionId} in environment service...`);
+				this.logService.info(`Resuming cloud changes, reason: found editSessionId ${this.environmentService.editSessionId} in environment service...`);
 				await this.resumeEditSession(this.environmentService.editSessionId).finally(() => this.environmentService.editSessionId = undefined);
 			} else if (shouldAutoResumeOnReload && this.editSessionsStorageService.isSignedIn) {
-				this.logService.info('Resuming edit session, reason: edit sessions enabled...');
+				this.logService.info('Resuming cloud changes, reason: cloud changes enabled...');
 				// Attempt to resume edit session based on edit workspace identifier
 				// Note: at this point if the user is not signed into edit sessions,
 				// we don't want them to be prompted to sign in and should just return early
@@ -203,7 +203,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 			return this.accountsMenuBadgeDisposable.clear();
 		}
 
-		const badge = new NumberBadge(1, () => localize('check for pending edit sessions', 'Check for pending edit sessions'));
+		const badge = new NumberBadge(1, () => localize('check for pending cloud changes', 'Check for pending cloud changes'));
 		this.accountsMenuBadgeDisposable.value = this.activityService.showAccountsActivity({ badge, priority: 1 });
 	}
 
@@ -212,7 +212,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 			await this.progressService.withProgress({
 				location: ProgressLocation.Window,
 				type: 'syncing',
-				title: localize('store edit session', 'Storing edit session...')
+				title: localize('store working changes', 'Storing working changes...')
 			}, async () => this.storeEditSession(false));
 		}
 	}
@@ -264,7 +264,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 			constructor() {
 				super({
 					id: 'workbench.editSessions.actions.showEditSessions',
-					title: { value: localize('show edit session', "Show Edit Sessions"), original: 'Show Edit Sessions' },
+					title: { value: localize('show cloud changes', "Show Cloud Changes"), original: 'Show Cloud Changes' },
 					category: EDIT_SESSION_SYNC_CATEGORY,
 					f1: true
 				});
@@ -311,7 +311,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 					ref = await that.progressService.withProgress({
 						location: ProgressLocation.Notification,
 						type: 'syncing',
-						title: localize('store your edit session', 'Storing your edit session...')
+						title: localize('store your working changes', 'Storing your working changes...')
 					}, async () => that.storeEditSession(false));
 				}
 
@@ -335,7 +335,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 					that.logService.info(`Opening ${uri.toString()}`);
 					await that.openerService.open(uri, { openExternal: true });
 				} else if (ref === undefined && shouldStoreEditSession) {
-					that.logService.warn(`Failed to store edit session when invoking ${continueWorkingOnCommand.id}.`);
+					that.logService.warn(`Failed to store working changes when invoking ${continueWorkingOnCommand.id}.`);
 				}
 			}
 		}));
@@ -347,7 +347,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 			constructor() {
 				super({
 					id: 'workbench.editSessions.actions.resumeLatest',
-					title: { value: localize('resume latest.v2', "Resume Latest Edit Session"), original: 'Resume Latest Edit Session' },
+					title: { value: localize('resume latest cloud changes', "Resume Latest Changes from Cloud"), original: 'Resume Latest Changes from Cloud' },
 					category: EDIT_SESSION_SYNC_CATEGORY,
 					f1: true,
 				});
@@ -373,7 +373,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 			constructor() {
 				super({
 					id: 'workbench.editSessions.actions.storeCurrent',
-					title: { value: localize('store current.v2', "Store Current Edit Session"), original: 'Store Current Edit Session' },
+					title: { value: localize('store working changes in cloud', "Store Working Changes in Cloud"), original: 'Store Working Changes in Cloud' },
 					category: EDIT_SESSION_SYNC_CATEGORY,
 					f1: true,
 				});
@@ -382,7 +382,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 			async run(accessor: ServicesAccessor): Promise<void> {
 				await that.progressService.withProgress({
 					location: ProgressLocation.Notification,
-					title: localize('storing edit session', 'Storing edit session...')
+					title: localize('storing working changes', 'Storing working changes...')
 				}, async () => {
 					type StoreEvent = {};
 					type StoreClassification = {
@@ -403,7 +403,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 			return;
 		}
 
-		this.logService.info(ref !== undefined ? `Resuming edit session with ref ${ref}...` : 'Resuming edit session...');
+		this.logService.info(ref !== undefined ? `Resuming changes from cloud with ref ${ref}...` : 'Resuming changes from cloud...');
 
 		if (silent && !(await this.editSessionsStorageService.initialize(false, true))) {
 			return;
@@ -412,18 +412,18 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 		const data = await this.editSessionsStorageService.read(ref);
 		if (!data) {
 			if (ref === undefined && !silent) {
-				this.notificationService.info(localize('no edit session', 'There are no edit sessions to resume.'));
+				this.notificationService.info(localize('no cloud changes', 'There are no changes to resume from the cloud.'));
 			} else if (ref !== undefined) {
-				this.notificationService.warn(localize('no edit session content for ref', 'Could not resume edit session contents for ID {0}.', ref));
+				this.notificationService.warn(localize('no cloud changes for ref', 'Could not resume changes from the cloud for ID {0}.', ref));
 			}
-			this.logService.info(ref !== undefined ? `Aborting resuming edit session as no edit session content is available to be applied from ref ${ref}.` : `Aborting resuming edit session as no edit session content is available to be applied`);
+			this.logService.info(ref !== undefined ? `Aborting resuming changes from cloud as no edit session content is available to be applied from ref ${ref}.` : `Aborting resuming edit session as no edit session content is available to be applied`);
 			return;
 		}
 		const editSession = data.editSession;
 		ref = data.ref;
 
 		if (editSession.version > EditSessionSchemaVersion) {
-			this.notificationService.error(localize('client too old', "Please upgrade to a newer version of {0} to resume this edit session.", this.productService.nameLong));
+			this.notificationService.error(localize('client too old', "Please upgrade to a newer version of {0} to resume your working changes from the cloud.", this.productService.nameLong));
 			return;
 		}
 
@@ -442,8 +442,8 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 				const result = await this.dialogService.show(
 					Severity.Warning,
 					conflictingChanges.length > 1 ?
-						localize('resume edit session warning many', 'Resuming your edit session will overwrite the following {0} files. Do you want to proceed?', conflictingChanges.length) :
-						localize('resume edit session warning 1', 'Resuming your edit session will overwrite {0}. Do you want to proceed?', basename(conflictingChanges[0].uri)),
+						localize('resume edit session warning many', 'Resuming your working changes from the cloud will overwrite the following {0} files. Do you want to proceed?', conflictingChanges.length) :
+						localize('resume edit session warning 1', 'Resuming your working changes from the cloud will overwrite {0}. Do you want to proceed?', basename(conflictingChanges[0].uri)),
 					[cancel, yes],
 					{
 						detail: conflictingChanges.length > 1 ? getFileNamesMessage(conflictingChanges.map((c) => c.uri)) : undefined,
@@ -468,7 +468,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 			this.logService.info(`Deleted edit session with ref ${ref}.`);
 		} catch (ex) {
 			this.logService.error('Failed to resume edit session, reason: ', (ex as Error).toString());
-			this.notificationService.error(localize('resume failed', "Failed to resume your edit session."));
+			this.notificationService.error(localize('resume failed', "Failed to resume your working changes from the cloud."));
 		}
 	}
 
@@ -504,7 +504,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 								// Surface partially matching edit session
 								this.notificationService.prompt(
 									Severity.Info,
-									localize('editSessionPartialMatch', 'You have a pending edit session for this workspace. Would you like to resume it?'),
+									localize('editSessionPartialMatch', 'You have pending working changes in the cloud for this workspace. Would you like to resume them?'),
 									[{ label: localize('resume', 'Resume'), run: () => this.resumeEditSession(ref, false, true) }]
 								);
 							} else {
@@ -618,9 +618,9 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 		}
 
 		if (!hasEdits) {
-			this.logService.info('Skipping storing edit session as there are no edits to store.');
+			this.logService.info('Skipped storing working changes in the cloud as there are no edits to store.');
 			if (fromStoreCommand) {
-				this.notificationService.info(localize('no edits to store', 'Skipped storing edit session as there are no edits to store.'));
+				this.notificationService.info(localize('no working changes to store', 'Skipped storing working changes in the cloud as there are no edits to store.'));
 			}
 			return undefined;
 		}
@@ -646,11 +646,11 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 					case UserDataSyncErrorCode.TooLarge:
 						// Uploading a payload can fail due to server size limits
 						this.telemetryService.publicLog2<UploadFailedEvent, UploadFailedClassification>('editSessions.upload.failed', { reason: 'TooLarge' });
-						this.notificationService.error(localize('payload too large', 'Your edit session exceeds the size limit and cannot be stored.'));
+						this.notificationService.error(localize('payload too large', 'Your working changes exceed the size limit and cannot be stored.'));
 						break;
 					default:
 						this.telemetryService.publicLog2<UploadFailedEvent, UploadFailedClassification>('editSessions.upload.failed', { reason: 'unknown' });
-						this.notificationService.error(localize('payload failed', 'Your edit session cannot be stored.'));
+						this.notificationService.error(localize('payload failed', 'Your working changes cannot be stored.'));
 						break;
 				}
 			}

src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts

@@ -295,7 +295,7 @@ export class EditSessionsWorkbenchService extends Disposable implements IEditSes
 	private async getAccountPreference(fromContinueOn: boolean): Promise<AuthenticationSession & { providerId: string } | undefined> {
 		const quickpick = this.quickInputService.createQuickPick<ExistingSession | AuthenticationProviderOption | IQuickPickItem>();
 		quickpick.ok = false;
-		quickpick.placeholder = localize('choose account placeholder', "Select an account to turn on Edit Sessions");
+		quickpick.placeholder = localize('choose account placeholder', "Select an account to store your working changes in the cloud");
 		quickpick.ignoreFocusOut = true;
 		quickpick.items = await this.createQuickpickItems(fromContinueOn);
 
@@ -459,7 +459,7 @@ export class EditSessionsWorkbenchService extends Disposable implements IEditSes
 			constructor() {
 				super({
 					id: 'workbench.editSessions.actions.signIn',
-					title: localize('sign in', 'Turn on Edit Sessions...'),
+					title: localize('sign in', 'Turn on Cloud Changes...'),
 					category: EDIT_SESSION_SYNC_CATEGORY,
 					precondition: ContextKeyExpr.equals(EDIT_SESSIONS_SIGNED_IN_KEY, false),
 					menu: [{
@@ -485,7 +485,7 @@ export class EditSessionsWorkbenchService extends Disposable implements IEditSes
 			constructor() {
 				super({
 					id: 'workbench.editSessions.actions.resetAuth',
-					title: localize('reset auth.v3', 'Turn off Edit Sessions...'),
+					title: localize('reset auth.v3', 'Turn off Cloud Changes...'),
 					category: EDIT_SESSION_SYNC_CATEGORY,
 					precondition: ContextKeyExpr.equals(EDIT_SESSIONS_SIGNED_IN_KEY, true),
 					menu: [{
@@ -502,8 +502,8 @@ export class EditSessionsWorkbenchService extends Disposable implements IEditSes
 			async run() {
 				const result = await that.dialogService.confirm({
 					type: 'info',
-					message: localize('sign out of edit sessions clear data prompt.v2', 'Do you want to turn off Edit Sessions?'),
-					checkbox: { label: localize('delete all edit sessions.v2', 'Delete all stored data from the cloud.') },
+					message: localize('sign out of cloud changes clear data prompt', 'Do you want to disable storing working changes in the cloud?'),
+					checkbox: { label: localize('delete all cloud changes', 'Delete all stored data from the cloud.') },
 					primaryButton: localize('clear data confirm', 'Yes'),
 				});
 				if (result.confirmed) {

src/vs/workbench/contrib/editSessions/browser/editSessionsViews.ts

@@ -140,7 +140,7 @@ export class EditSessionsDataViews extends Disposable {
 			constructor() {
 				super({
 					id: 'workbench.editSessions.actions.deleteAll',
-					title: localize('workbench.editSessions.actions.deleteAll', "Delete All Edit Sessions"),
+					title: localize('workbench.editSessions.actions.deleteAll', "Delete All Working Changes from Cloud"),
 					icon: Codicon.trash,
 					menu: {
 						id: MenuId.ViewTitle,
@@ -153,7 +153,7 @@ export class EditSessionsDataViews extends Disposable {
 				const dialogService = accessor.get(IDialogService);
 				const editSessionStorageService = accessor.get(IEditSessionsStorageService);
 				const result = await dialogService.confirm({
-					message: localize('confirm delete all', 'Are you sure you want to permanently delete all edit sessions? You cannot undo this action.'),
+					message: localize('confirm delete all', 'Are you sure you want to permanently delete all stored changes from the cloud? You cannot undo this action.'),
 					type: 'warning',
 					title: EDIT_SESSIONS_TITLE
 				});

src/vs/workbench/contrib/editSessions/common/editSessions.ts

@@ -15,8 +15,8 @@ import { IResourceRefHandle } from 'vs/platform/userDataSync/common/userDataSync
 import { Event } from 'vs/base/common/event';
 
 export const EDIT_SESSION_SYNC_CATEGORY: ILocalizedString = {
-	original: 'Edit Sessions',
-	value: localize('session sync', 'Edit Sessions')
+	original: 'Cloud Changes',
+	value: localize('cloud changes', 'Cloud Changes')
 };
 
 export const IEditSessionsStorageService = createDecorator<IEditSessionsStorageService>('IEditSessionsStorageService');
@@ -82,9 +82,9 @@ export const EDIT_SESSIONS_SIGNED_IN = new RawContextKey<boolean>(EDIT_SESSIONS_
 
 export const EDIT_SESSIONS_CONTAINER_ID = 'workbench.view.editSessions';
 export const EDIT_SESSIONS_DATA_VIEW_ID = 'workbench.views.editSessions.data';
-export const EDIT_SESSIONS_TITLE = localize('edit sessions', 'Edit Sessions');
+export const EDIT_SESSIONS_TITLE = localize('cloud changes', 'Cloud Changes');
 
-export const EDIT_SESSIONS_VIEW_ICON = registerIcon('edit-sessions-view-icon', Codicon.cloudDownload, localize('editSessionViewIcon', 'View icon of the edit sessions view.'));
+export const EDIT_SESSIONS_VIEW_ICON = registerIcon('edit-sessions-view-icon', Codicon.cloudDownload, localize('editSessionViewIcon', 'View icon of the cloud changes view.'));
 
 export const EDIT_SESSIONS_SHOW_VIEW = new RawContextKey<boolean>('editSessionsShowView', false);