Skip to content

Commit 75aba9d

Browse files
sandy081sandy081
committed
microsoft#102581 Rename the view to merges
1 parent e4f2a0f commit 75aba9d

4 files changed

Lines changed: 29 additions & 29 deletions

File tree

src/vs/workbench/contrib/userDataSync/browser/userDataManualSyncView.ts renamed to src/vs/workbench/contrib/userDataSync/browser/userDataSyncMergesView.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
1616
import { Emitter, Event } from 'vs/base/common/event';
1717
import { Disposable, dispose } from 'vs/base/common/lifecycle';
1818
import { Codicon } from 'vs/base/common/codicons';
19-
import { IUserDataSyncWorkbenchService, getSyncAreaLabel, IUserDataSyncPreview, IUserDataSyncResource, MANUAL_SYNC_VIEW_ID } from 'vs/workbench/services/userDataSync/common/userDataSync';
19+
import { IUserDataSyncWorkbenchService, getSyncAreaLabel, IUserDataSyncPreview, IUserDataSyncResource, SYNC_MERGES_VIEW_ID } from 'vs/workbench/services/userDataSync/common/userDataSync';
2020
import { isEqual, basename } from 'vs/base/common/resources';
2121
import { IDecorationsProvider, IDecorationData, IDecorationsService } from 'vs/workbench/services/decorations/browser/decorations';
2222
import { IProgressService } from 'vs/platform/progress/common/progress';
@@ -39,7 +39,7 @@ import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
3939
import { Severity } from 'vs/platform/notification/common/notification';
4040
import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
4141

42-
export class UserDataManualSyncViewPane extends TreeViewPane {
42+
export class UserDataSyncMergesViewPane extends TreeViewPane {
4343

4444
private userDataSyncPreview: IUserDataSyncPreview;
4545

@@ -83,7 +83,7 @@ export class UserDataManualSyncViewPane extends TreeViewPane {
8383
this.createButtons(container);
8484

8585
const that = this;
86-
this.treeView.message = localize('explanation', "Please go through each entry and accept the change to enable sync.");
86+
this.treeView.message = localize('explanation', "Please go through each entry and merge to enable sync.");
8787
this.treeView.dataProvider = { getChildren() { return that.getTreeItems(); } };
8888
}
8989

@@ -164,7 +164,7 @@ export class UserDataManualSyncViewPane extends TreeViewPane {
164164
icon: Codicon.cloudDownload,
165165
menu: {
166166
id: MenuId.ViewItemContext,
167-
when: ContextKeyExpr.and(ContextKeyEqualsExpr.create('view', MANUAL_SYNC_VIEW_ID), ContextKeyExpr.equals('viewItem', 'sync-resource-preview')),
167+
when: ContextKeyExpr.and(ContextKeyEqualsExpr.create('view', SYNC_MERGES_VIEW_ID), ContextKeyExpr.equals('viewItem', 'sync-resource-preview')),
168168
group: 'inline',
169169
order: 1,
170170
},
@@ -184,7 +184,7 @@ export class UserDataManualSyncViewPane extends TreeViewPane {
184184
icon: Codicon.cloudUpload,
185185
menu: {
186186
id: MenuId.ViewItemContext,
187-
when: ContextKeyExpr.and(ContextKeyEqualsExpr.create('view', MANUAL_SYNC_VIEW_ID), ContextKeyExpr.equals('viewItem', 'sync-resource-preview')),
187+
when: ContextKeyExpr.and(ContextKeyEqualsExpr.create('view', SYNC_MERGES_VIEW_ID), ContextKeyExpr.equals('viewItem', 'sync-resource-preview')),
188188
group: 'inline',
189189
order: 2,
190190
},
@@ -204,7 +204,7 @@ export class UserDataManualSyncViewPane extends TreeViewPane {
204204
icon: Codicon.merge,
205205
menu: {
206206
id: MenuId.ViewItemContext,
207-
when: ContextKeyExpr.and(ContextKeyEqualsExpr.create('view', MANUAL_SYNC_VIEW_ID), ContextKeyExpr.equals('viewItem', 'sync-resource-preview')),
207+
when: ContextKeyExpr.and(ContextKeyEqualsExpr.create('view', SYNC_MERGES_VIEW_ID), ContextKeyExpr.equals('viewItem', 'sync-resource-preview')),
208208
group: 'inline',
209209
order: 3,
210210
},
@@ -224,7 +224,7 @@ export class UserDataManualSyncViewPane extends TreeViewPane {
224224
icon: Codicon.discard,
225225
menu: {
226226
id: MenuId.ViewItemContext,
227-
when: ContextKeyExpr.and(ContextKeyEqualsExpr.create('view', MANUAL_SYNC_VIEW_ID), ContextKeyExpr.or(ContextKeyExpr.equals('viewItem', 'sync-resource-accepted'), ContextKeyExpr.equals('viewItem', 'sync-resource-conflict'))),
227+
when: ContextKeyExpr.and(ContextKeyEqualsExpr.create('view', SYNC_MERGES_VIEW_ID), ContextKeyExpr.or(ContextKeyExpr.equals('viewItem', 'sync-resource-accepted'), ContextKeyExpr.equals('viewItem', 'sync-resource-conflict'))),
228228
group: 'inline',
229229
order: 3,
230230
},
@@ -373,7 +373,7 @@ export class UserDataManualSyncViewPane extends TreeViewPane {
373373
}
374374

375375
private withProgress(task: () => Promise<void>): Promise<void> {
376-
return this.progressService.withProgress({ location: MANUAL_SYNC_VIEW_ID, delay: 500 }, task);
376+
return this.progressService.withProgress({ location: SYNC_MERGES_VIEW_ID, delay: 500 }, task);
377377
}
378378

379379
}

‎src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ import { IStorageService } from 'vs/platform/storage/common/storage';
3030
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
3131
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
3232
import { IAction, Action } from 'vs/base/common/actions';
33-
import { IUserDataSyncWorkbenchService, CONTEXT_SYNC_STATE, getSyncAreaLabel, CONTEXT_ACCOUNT_STATE, AccountStatus, CONTEXT_ENABLE_ACTIVITY_VIEWS, SHOW_SYNC_LOG_COMMAND_ID, CONFIGURE_SYNC_COMMAND_ID, MANUAL_SYNC_VIEW_ID, CONTEXT_ENABLE_MANUAL_SYNC_VIEW } from 'vs/workbench/services/userDataSync/common/userDataSync';
33+
import { IUserDataSyncWorkbenchService, CONTEXT_SYNC_STATE, getSyncAreaLabel, CONTEXT_ACCOUNT_STATE, AccountStatus, CONTEXT_ENABLE_ACTIVITY_VIEWS, SHOW_SYNC_LOG_COMMAND_ID, CONFIGURE_SYNC_COMMAND_ID, SYNC_MERGES_VIEW_ID, CONTEXT_ENABLE_SYNC_MERGES_VIEW } from 'vs/workbench/services/userDataSync/common/userDataSync';
3434
import { IUserDataSyncMachinesService, IUserDataSyncMachine } from 'vs/platform/userDataSync/common/userDataSyncMachines';
3535
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
3636
import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
3737
import { TreeView } from 'vs/workbench/contrib/views/browser/treeView';
3838
import { flatten } from 'vs/base/common/arrays';
39-
import { UserDataManualSyncViewPane } from 'vs/workbench/contrib/userDataSync/browser/userDataManualSyncView';
39+
import { UserDataSyncMergesViewPane } from 'vs/workbench/contrib/userDataSync/browser/userDataSyncMergesView';
4040

4141
export class UserDataSyncViewPaneContainer extends ViewPaneContainer {
4242

@@ -86,25 +86,25 @@ export class UserDataSyncDataViews extends Disposable {
8686
}
8787

8888
private registerViews(container: ViewContainer): void {
89-
this.registerManualSyncView(container);
89+
this.registerMergesView(container);
9090

9191
this.registerActivityView(container, true);
9292
this.registerMachinesView(container);
9393

9494
this.registerActivityView(container, false);
9595
}
9696

97-
private registerManualSyncView(container: ViewContainer): void {
97+
private registerMergesView(container: ViewContainer): void {
9898
const viewsRegistry = Registry.as<IViewsRegistry>(Extensions.ViewsRegistry);
99-
const viewName = localize('manual sync', "Manual Sync");
99+
const viewName = localize('merges', "Merges");
100100
viewsRegistry.registerViews([<ITreeViewDescriptor>{
101-
id: MANUAL_SYNC_VIEW_ID,
101+
id: SYNC_MERGES_VIEW_ID,
102102
name: viewName,
103-
ctorDescriptor: new SyncDescriptor(UserDataManualSyncViewPane),
104-
when: CONTEXT_ENABLE_MANUAL_SYNC_VIEW,
103+
ctorDescriptor: new SyncDescriptor(UserDataSyncMergesViewPane),
104+
when: CONTEXT_ENABLE_SYNC_MERGES_VIEW,
105105
canToggleVisibility: false,
106106
canMoveView: false,
107-
treeView: this.instantiationService.createInstance(TreeView, MANUAL_SYNC_VIEW_ID, viewName),
107+
treeView: this.instantiationService.createInstance(TreeView, SYNC_MERGES_VIEW_ID, viewName),
108108
collapsed: false,
109109
order: 100,
110110
}], container);

‎src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { IUserDataSyncService, IAuthenticationProvider, getUserDataSyncStore, isAuthenticationProvider, IUserDataAutoSyncService, SyncResource, IResourcePreview, ISyncResourcePreview, Change, IManualSyncTask } from 'vs/platform/userDataSync/common/userDataSync';
77
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
88
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
9-
import { IUserDataSyncWorkbenchService, IUserDataSyncAccount, AccountStatus, CONTEXT_SYNC_ENABLEMENT, CONTEXT_SYNC_STATE, CONTEXT_ACCOUNT_STATE, SHOW_SYNC_LOG_COMMAND_ID, getSyncAreaLabel, IUserDataSyncPreview, IUserDataSyncResource, CONTEXT_ENABLE_MANUAL_SYNC_VIEW, MANUAL_SYNC_VIEW_ID, CONTEXT_ENABLE_ACTIVITY_VIEWS, SYNC_VIEW_CONTAINER_ID } from 'vs/workbench/services/userDataSync/common/userDataSync';
9+
import { IUserDataSyncWorkbenchService, IUserDataSyncAccount, AccountStatus, CONTEXT_SYNC_ENABLEMENT, CONTEXT_SYNC_STATE, CONTEXT_ACCOUNT_STATE, SHOW_SYNC_LOG_COMMAND_ID, getSyncAreaLabel, IUserDataSyncPreview, IUserDataSyncResource, CONTEXT_ENABLE_SYNC_MERGES_VIEW, SYNC_MERGES_VIEW_ID, CONTEXT_ENABLE_ACTIVITY_VIEWS, SYNC_VIEW_CONTAINER_ID } from 'vs/workbench/services/userDataSync/common/userDataSync';
1010
import { AuthenticationSession, AuthenticationSessionsChangeEvent } from 'vs/editor/common/modes';
1111
import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
1212
import { Emitter, Event } from 'vs/base/common/event';
@@ -79,7 +79,7 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
7979
private readonly syncEnablementContext: IContextKey<boolean>;
8080
private readonly syncStatusContext: IContextKey<string>;
8181
private readonly accountStatusContext: IContextKey<string>;
82-
private readonly manualSyncViewEnablementContext: IContextKey<boolean>;
82+
private readonly mergesViewEnablementContext: IContextKey<boolean>;
8383
private readonly activityViewsEnablementContext: IContextKey<boolean>;
8484

8585
readonly userDataSyncPreview: UserDataSyncPreview = this._register(new UserDataSyncPreview(this.userDataSyncService));
@@ -110,7 +110,7 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
110110
this.syncStatusContext = CONTEXT_SYNC_STATE.bindTo(contextKeyService);
111111
this.accountStatusContext = CONTEXT_ACCOUNT_STATE.bindTo(contextKeyService);
112112
this.activityViewsEnablementContext = CONTEXT_ENABLE_ACTIVITY_VIEWS.bindTo(contextKeyService);
113-
this.manualSyncViewEnablementContext = CONTEXT_ENABLE_MANUAL_SYNC_VIEW.bindTo(contextKeyService);
113+
this.mergesViewEnablementContext = CONTEXT_ENABLE_SYNC_MERGES_VIEW.bindTo(contextKeyService);
114114

115115
if (this.authenticationProviders.length) {
116116

@@ -302,16 +302,16 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
302302

303303
const result = await this.dialogService.show(
304304
Severity.Info,
305-
localize('preferences sync', "Preferences Sync"),
305+
localize('merge or replace', "Merge or Replace"),
306306
[
307307
localize('merge', "Merge"),
308308
localize('replace local', "Replace Local"),
309-
localize('sync manually', "Sync Manually..."),
309+
localize('merge Manually', "Merge Manually..."),
310310
localize('cancel', "Cancel"),
311311
],
312312
{
313313
cancelId: 3,
314-
detail: localize('first time sync detail', "It looks like you last synced from another machine.\nWould you like to replace or merge with your data in the cloud or sync manually?"),
314+
detail: localize('first time sync detail', "It looks like you last synced from another machine.\nWould you like to merge or replace with your data in the cloud?"),
315315
}
316316
);
317317
switch (result.choice) {
@@ -333,18 +333,18 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
333333
const visibleViewContainer = this.viewsService.getVisibleViewContainer(ViewContainerLocation.Sidebar);
334334
this.userDataSyncPreview.setManualSyncPreview(task, preview);
335335

336-
this.manualSyncViewEnablementContext.set(true);
336+
this.mergesViewEnablementContext.set(true);
337337
await this.waitForActiveSyncViews();
338-
await this.viewsService.openView(MANUAL_SYNC_VIEW_ID);
338+
await this.viewsService.openView(SYNC_MERGES_VIEW_ID);
339339

340340
const error = await Event.toPromise(this.userDataSyncPreview.onDidCompleteManualSync);
341341
this.userDataSyncPreview.unsetManualSyncPreview();
342342

343-
this.manualSyncViewEnablementContext.set(false);
343+
this.mergesViewEnablementContext.set(false);
344344
if (visibleViewContainer) {
345345
this.viewsService.openViewContainer(visibleViewContainer.id);
346346
} else {
347-
const viewContainer = this.viewDescriptorService.getViewContainerByViewId(MANUAL_SYNC_VIEW_ID);
347+
const viewContainer = this.viewDescriptorService.getViewContainerByViewId(SYNC_MERGES_VIEW_ID);
348348
this.viewsService.closeViewContainer(viewContainer!.id);
349349
}
350350

‎src/vs/workbench/services/userDataSync/common/userDataSync.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@ export const CONTEXT_SYNC_STATE = new RawContextKey<string>('syncStatus', SyncSt
8282
export const CONTEXT_SYNC_ENABLEMENT = new RawContextKey<boolean>('syncEnabled', false);
8383
export const CONTEXT_ACCOUNT_STATE = new RawContextKey<string>('userDataSyncAccountStatus', AccountStatus.Uninitialized);
8484
export const CONTEXT_ENABLE_ACTIVITY_VIEWS = new RawContextKey<boolean>(`enableSyncActivityViews`, false);
85-
export const CONTEXT_ENABLE_MANUAL_SYNC_VIEW = new RawContextKey<boolean>(`enableManualSyncView`, false);
85+
export const CONTEXT_ENABLE_SYNC_MERGES_VIEW = new RawContextKey<boolean>(`enableSyncMergesView`, false);
8686

8787
// Commands
8888
export const CONFIGURE_SYNC_COMMAND_ID = 'workbench.userDataSync.actions.configure';
8989
export const SHOW_SYNC_LOG_COMMAND_ID = 'workbench.userDataSync.actions.showLog';
9090

9191
// VIEWS
9292
export const SYNC_VIEW_CONTAINER_ID = 'workbench.view.sync';
93-
export const MANUAL_SYNC_VIEW_ID = 'workbench.views.manualSyncView';
93+
export const SYNC_MERGES_VIEW_ID = 'workbench.views.sync.merges';

0 commit comments

Comments
 (0)