make sync is on command simple

sandy081 · sandy081 · commit 17a59977bc73 · 2020-02-23T13:10:30.000+01:00
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
@@ -235,7 +235,6 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 		}
 
 		this.updateBadge();
-		this.registerSyncStatusAction();
 	}
 
 	private async onDidChangeSessions(providerId: string): Promise<void> {
@@ -746,7 +745,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 
 	private registerSignInAction(): void {
 		const that = this;
-		registerAction2(class StopSyncAction extends Action2 {
+		this._register(registerAction2(class StopSyncAction extends Action2 {
 			constructor() {
 				super({
 					id: signInCommand.id,
@@ -766,7 +765,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 					that.notificationService.error(e);
 				}
 			}
-		});
+		}));
 	}
 
 	private registerShowSettingsConflictsAction(): void {
@@ -824,17 +823,14 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 
 	}
 
-	private readonly _syncStatusActionDisposable = this._register(new MutableDisposable());
 	private registerSyncStatusAction(): void {
 		const that = this;
 		const when = ContextKeyExpr.and(CONTEXT_SYNC_ENABLEMENT, CONTEXT_AUTH_TOKEN_STATE.isEqualTo(AuthStatus.SignedIn), CONTEXT_SYNC_STATE.notEqualsTo(SyncStatus.Uninitialized));
-		this._syncStatusActionDisposable.value = registerAction2(class SyncStatusAction extends Action2 {
+		this._register(registerAction2(class SyncStatusAction extends Action2 {
 			constructor() {
 				super({
 					id: 'workbench.userData.actions.syncStatus',
-					get title() {
-						return getIdentityTitle(localize('sync is on', "Sync is on"), that.activeAccount);
-					},
+					title: localize('sync is on', "Sync is on"),
 					menu: [
 						{
 							id: MenuId.GlobalActivity,
@@ -890,12 +886,12 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 					quickPick.show();
 				});
 			}
-		});
+		}));
 	}
 
 	private registerTurnOffSyncAction(): void {
 		const that = this;
-		registerAction2(class StopSyncAction extends Action2 {
+		this._register(registerAction2(class StopSyncAction extends Action2 {
 			constructor() {
 				super({
 					id: stopSyncCommand.id,
@@ -915,12 +911,12 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 					}
 				}
 			}
-		});
+		}));
 	}
 
 	private registerConfigureSyncAction(): void {
 		const that = this;
-		registerAction2(class ShowSyncActivityAction extends Action2 {
+		this._register(registerAction2(class ShowSyncActivityAction extends Action2 {
 			constructor() {
 				super({
 					id: configureSyncCommand.id,
@@ -932,12 +928,12 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 				});
 			}
 			run(): any { return that.configureSyncOptions(); }
-		});
+		}));
 	}
 
 	private registerShowActivityAction(): void {
 		const that = this;
-		registerAction2(class ShowSyncActivityAction extends Action2 {
+		this._register(registerAction2(class ShowSyncActivityAction extends Action2 {
 			constructor() {
 				super({
 					id: showSyncActivityCommand.id,
@@ -949,11 +945,11 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 				});
 			}
 			run(): any { return that.showSyncActivity(); }
-		});
+		}));
 	}
 
 	private registerShowSettingsAction(): void {
-		registerAction2(class ShowSyncSettingsAction extends Action2 {
+		this._register(registerAction2(class ShowSyncSettingsAction extends Action2 {
 			constructor() {
 				super({
 					id: showSyncSettingsCommand.id,
@@ -967,7 +963,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 			run(accessor: ServicesAccessor): any {
 				accessor.get(IPreferencesService).openGlobalSettings(false, { query: '@tag:sync' });
 			}
-		});
+		}));
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,6 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`this.updateBadge();`
`238`		`- this.registerSyncStatusAction();`
`239`	`238`	`}`
`240`	`239`
`241`	`240`	`private async onDidChangeSessions(providerId: string): Promise<void> {`
`@@ -746,7 +745,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo`
`746`	`745`
`747`	`746`	`private registerSignInAction(): void {`
`748`	`747`	`const that = this;`
`749`		`- registerAction2(class StopSyncAction extends Action2 {`
	`748`	`+ this._register(registerAction2(class StopSyncAction extends Action2 {`
`750`	`749`	`constructor() {`
`751`	`750`	`super({`
`752`	`751`	`id: signInCommand.id,`
`@@ -766,7 +765,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo`
`766`	`765`	`that.notificationService.error(e);`
`767`	`766`	`}`
`768`	`767`	`}`
`769`		`- });`
	`768`	`+ }));`
`770`	`769`	`}`
`771`	`770`
`772`	`771`	`private registerShowSettingsConflictsAction(): void {`
`@@ -824,17 +823,14 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo`
`824`	`823`
`825`	`824`	`}`
`826`	`825`
`827`		`- private readonly _syncStatusActionDisposable = this._register(new MutableDisposable());`
`828`	`826`	`private registerSyncStatusAction(): void {`
`829`	`827`	`const that = this;`
`830`	`828`	`const when = ContextKeyExpr.and(CONTEXT_SYNC_ENABLEMENT, CONTEXT_AUTH_TOKEN_STATE.isEqualTo(AuthStatus.SignedIn), CONTEXT_SYNC_STATE.notEqualsTo(SyncStatus.Uninitialized));`
`831`		`- this._syncStatusActionDisposable.value = registerAction2(class SyncStatusAction extends Action2 {`
	`829`	`+ this._register(registerAction2(class SyncStatusAction extends Action2 {`
`832`	`830`	`constructor() {`
`833`	`831`	`super({`
`834`	`832`	`id: 'workbench.userData.actions.syncStatus',`
`835`		`- get title() {`
`836`		`- return getIdentityTitle(localize('sync is on', "Sync is on"), that.activeAccount);`
`837`		`- },`
	`833`	`+ title: localize('sync is on', "Sync is on"),`
`838`	`834`	`menu: [`
`839`	`835`	`{`
`840`	`836`	`id: MenuId.GlobalActivity,`
`@@ -890,12 +886,12 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo`
`890`	`886`	`quickPick.show();`
`891`	`887`	`});`
`892`	`888`	`}`
`893`		`- });`
	`889`	`+ }));`
`894`	`890`	`}`
`895`	`891`
`896`	`892`	`private registerTurnOffSyncAction(): void {`
`897`	`893`	`const that = this;`
`898`		`- registerAction2(class StopSyncAction extends Action2 {`
	`894`	`+ this._register(registerAction2(class StopSyncAction extends Action2 {`
`899`	`895`	`constructor() {`
`900`	`896`	`super({`
`901`	`897`	`id: stopSyncCommand.id,`
`@@ -915,12 +911,12 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo`
`915`	`911`	`}`
`916`	`912`	`}`
`917`	`913`	`}`
`918`		`- });`
	`914`	`+ }));`
`919`	`915`	`}`
`920`	`916`
`921`	`917`	`private registerConfigureSyncAction(): void {`
`922`	`918`	`const that = this;`
`923`		`- registerAction2(class ShowSyncActivityAction extends Action2 {`
	`919`	`+ this._register(registerAction2(class ShowSyncActivityAction extends Action2 {`
`924`	`920`	`constructor() {`
`925`	`921`	`super({`
`926`	`922`	`id: configureSyncCommand.id,`
`@@ -932,12 +928,12 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo`
`932`	`928`	`});`
`933`	`929`	`}`
`934`	`930`	`run(): any { return that.configureSyncOptions(); }`
`935`		`- });`
	`931`	`+ }));`
`936`	`932`	`}`
`937`	`933`
`938`	`934`	`private registerShowActivityAction(): void {`
`939`	`935`	`const that = this;`
`940`		`- registerAction2(class ShowSyncActivityAction extends Action2 {`
	`936`	`+ this._register(registerAction2(class ShowSyncActivityAction extends Action2 {`
`941`	`937`	`constructor() {`
`942`	`938`	`super({`
`943`	`939`	`id: showSyncActivityCommand.id,`
`@@ -949,11 +945,11 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo`
`949`	`945`	`});`
`950`	`946`	`}`
`951`	`947`	`run(): any { return that.showSyncActivity(); }`
`952`		`- });`
	`948`	`+ }));`
`953`	`949`	`}`
`954`	`950`
`955`	`951`	`private registerShowSettingsAction(): void {`
`956`		`- registerAction2(class ShowSyncSettingsAction extends Action2 {`
	`952`	`+ this._register(registerAction2(class ShowSyncSettingsAction extends Action2 {`
`957`	`953`	`constructor() {`
`958`	`954`	`super({`
`959`	`955`	`id: showSyncSettingsCommand.id,`
`@@ -967,7 +963,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo`
`967`	`963`	`run(accessor: ServicesAccessor): any {`
`968`	`964`	`accessor.get(IPreferencesService).openGlobalSettings(false, { query: '@tag:sync' });`
`969`	`965`	`}`
`970`		`- });`
	`966`	`+ }));`
`971`	`967`	`}`
`972`	`968`
`973`	`969`	`}`