set turning on context using enablement and sync status

sandy081 · sandy081 · commit f6ec272bbd26 · 2020-07-24T12:35:22.000+02:00
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
@@ -149,9 +149,20 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 
 			textModelResolverService.registerTextModelContentProvider(USER_DATA_SYNC_SCHEME, instantiationService.createInstance(UserDataRemoteContentProvider));
 			registerEditorContribution(AcceptChangesContribution.ID, AcceptChangesContribution);
+
+			this._register(Event.any(userDataSyncService.onDidChangeStatus, userDataAutoSyncService.onDidChangeEnablement)(() => this.turningOnSync = !userDataAutoSyncService.isEnabled() && userDataSyncService.status !== SyncStatus.Idle));
 		}
 	}
 
+	private get turningOnSync(): boolean {
+		return !!this.turningOnSyncContext.get();
+	}
+
+	private set turningOnSync(turningOn: boolean) {
+		this.turningOnSyncContext.set(turningOn);
+		this.updateGlobalActivityBadge();
+	}
+
 	private readonly conflictsDisposables = new Map<SyncResource, IDisposable>();
 	private onDidChangeConflicts(conflicts: [SyncResource, IResourcePreview[]][]) {
 		if (!this.userDataAutoSyncService.isEnabled()) {
@@ -417,17 +428,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 		}
 	}
 
-	private get turningOnSync(): boolean {
-		return !!this.turningOnSyncContext.get();
-	}
-
-	private set turningOnSync(turningOn: boolean) {
-		this.turningOnSyncContext.set(turningOn);
-		this.updateGlobalActivityBadge();
-	}
-
 	private async turnOn(): Promise<void> {
-		this.turningOnSync = true;
 		try {
 			if (!this.storageService.getBoolean('sync.donotAskPreviewConfirmation', StorageScope.GLOBAL, false)) {
 				if (!await this.askForConfirmation()) {
@@ -477,8 +478,6 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 				}
 			}
 			this.notificationService.error(localize('turn on failed', "Error while starting Sync: {0}", toErrorMessage(e)));
-		} finally {
-			this.turningOnSync = false;
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -149,9 +149,20 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo`
`149`	`149`
`150`	`150`	`textModelResolverService.registerTextModelContentProvider(USER_DATA_SYNC_SCHEME, instantiationService.createInstance(UserDataRemoteContentProvider));`
`151`	`151`	`registerEditorContribution(AcceptChangesContribution.ID, AcceptChangesContribution);`
	`152`	`+`
	`153`	`+ this._register(Event.any(userDataSyncService.onDidChangeStatus, userDataAutoSyncService.onDidChangeEnablement)(() => this.turningOnSync = !userDataAutoSyncService.isEnabled() && userDataSyncService.status !== SyncStatus.Idle));`
`152`	`154`	`}`
`153`	`155`	`}`
`154`	`156`
	`157`	`+ private get turningOnSync(): boolean {`
	`158`	`+ return !!this.turningOnSyncContext.get();`
	`159`	`+ }`
	`160`	`+`
	`161`	`+ private set turningOnSync(turningOn: boolean) {`
	`162`	`+ this.turningOnSyncContext.set(turningOn);`
	`163`	`+ this.updateGlobalActivityBadge();`
	`164`	`+ }`
	`165`	`+`
`155`	`166`	`private readonly conflictsDisposables = new Map<SyncResource, IDisposable>();`
`156`	`167`	`private onDidChangeConflicts(conflicts: [SyncResource, IResourcePreview[]][]) {`
`157`	`168`	`if (!this.userDataAutoSyncService.isEnabled()) {`
`@@ -417,17 +428,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo`
`417`	`428`	`}`
`418`	`429`	`}`
`419`	`430`
`420`		`- private get turningOnSync(): boolean {`
`421`		`- return !!this.turningOnSyncContext.get();`
`422`		`- }`
`423`		`-`
`424`		`- private set turningOnSync(turningOn: boolean) {`
`425`		`- this.turningOnSyncContext.set(turningOn);`
`426`		`- this.updateGlobalActivityBadge();`
`427`		`- }`
`428`		`-`
`429`	`431`	`private async turnOn(): Promise<void> {`
`430`		`- this.turningOnSync = true;`
`431`	`432`	`try {`
`432`	`433`	`if (!this.storageService.getBoolean('sync.donotAskPreviewConfirmation', StorageScope.GLOBAL, false)) {`
`433`	`434`	`if (!await this.askForConfirmation()) {`
`@@ -477,8 +478,6 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo`
`477`	`478`	`}`
`478`	`479`	`}`
`479`	`480`	`this.notificationService.error(localize('turn on failed', "Error while starting Sync: {0}", toErrorMessage(e)));`
`480`		`- } finally {`
`481`		`- this.turningOnSync = false;`
`482`	`481`	`}`
`483`	`482`	`}`
`484`	`483`