Fix microsoft#99764

sandy081 · sandy081 · commit 4d21831e50b0 · 2020-07-20T12:40:32.000+02:00
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataManualSyncView.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataManualSyncView.ts
@@ -282,10 +282,16 @@ export class UserDataManualSyncViewPane extends TreeViewPane {
 	}
 
 	private async apply(): Promise<void> {
+		this.closeAll();
 		this.syncButton.label = localize('turning on', "Turning on...");
 		this.syncButton.enabled = false;
 		this.cancelButton.enabled = false;
-		return this.withProgress(async () => this.userDataSyncPreview.apply());
+		try {
+			await this.withProgress(async () => this.userDataSyncPreview.apply());
+		} catch (error) {
+			this.syncButton.enabled = false;
+			this.cancelButton.enabled = true;
+		}
 	}
 
 	private async cancel(): Promise<void> {
@@ -331,7 +337,7 @@ export class UserDataManualSyncViewPane extends TreeViewPane {
 		}
 	}
 
-	private close(previewResource: IUserDataSyncResource) {
+	private close(previewResource: IUserDataSyncResource): void {
 		for (const input of this.editorService.editors) {
 			if (input instanceof DiffEditorInput) {
 				// Close all diff editors
@@ -360,6 +366,12 @@ export class UserDataManualSyncViewPane extends TreeViewPane {
 		}
 	}
 
+	private closeAll() {
+		for (const previewResource of this.userDataSyncPreview.resources) {
+			this.close(previewResource);
+		}
+	}
+
 	private withProgress(task: () => Promise<void>): Promise<void> {
 		return this.progressService.withProgress({ location: MANUAL_SYNC_VIEW_ID, delay: 500 }, task);
 	}
diff --git a/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts b/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
@@ -337,7 +337,7 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
 		await this.waitForActiveSyncViews();
 		await this.viewsService.openView(MANUAL_SYNC_VIEW_ID);
 
-		const completed = await Event.toPromise(this.userDataSyncPreview.onDidCompleteManualSync);
+		const error = await Event.toPromise(this.userDataSyncPreview.onDidCompleteManualSync);
 		this.userDataSyncPreview.unsetManualSyncPreview();
 
 		this.manualSyncViewEnablementContext.set(false);
@@ -348,8 +348,8 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
 			this.viewsService.closeViewContainer(viewContainer!.id);
 		}
 
-		if (!completed) {
-			throw canceled();
+		if (error) {
+			throw error;
 		}
 	}
 
@@ -567,7 +567,7 @@ class UserDataSyncPreview extends Disposable implements IUserDataSyncPreview {
 	private _onDidChangeConflicts = this._register(new Emitter<ReadonlyArray<IUserDataSyncResource>>());
 	readonly onDidChangeConflicts = this._onDidChangeConflicts.event;
 
-	private _onDidCompleteManualSync = this._register(new Emitter<boolean>());
+	private _onDidCompleteManualSync = this._register(new Emitter<Error | undefined>());
 	readonly onDidCompleteManualSync = this._onDidCompleteManualSync.event;
 	private manualSync: { preview: [SyncResource, ISyncResourcePreview][], task: IManualSyncTask, disposables: DisposableStore } | undefined;
 
@@ -623,10 +623,16 @@ class UserDataSyncPreview extends Disposable implements IUserDataSyncPreview {
 			throw new Error('Can apply only while syncing manually');
 		}
 
-		const syncPreview = await this.manualSync.task.apply();
-		this.updatePreview(syncPreview);
-		if (!this._resources.length) {
-			this._onDidCompleteManualSync.fire(true);
+		try {
+			const syncPreview = await this.manualSync.task.apply();
+			this.updatePreview(syncPreview);
+			if (!this._resources.length) {
+				this._onDidCompleteManualSync.fire(undefined);
+			}
+		} catch (error) {
+			await this.manualSync.task.stop();
+			this.updatePreview([]);
+			this._onDidCompleteManualSync.fire(error);
 		}
 	}
 
@@ -636,7 +642,7 @@ class UserDataSyncPreview extends Disposable implements IUserDataSyncPreview {
 		}
 		await this.manualSync.task.stop();
 		this.updatePreview([]);
-		this._onDidCompleteManualSync.fire(false);
+		this._onDidCompleteManualSync.fire(canceled());
 	}
 
 	async pull(): Promise<void> {

Original file line number	Diff line number	Diff line change
`@@ -282,10 +282,16 @@ export class UserDataManualSyncViewPane extends TreeViewPane {`
`282`	`282`	`}`
`283`	`283`
`284`	`284`	`private async apply(): Promise<void> {`
	`285`	`+ this.closeAll();`
`285`	`286`	`this.syncButton.label = localize('turning on', "Turning on...");`
`286`	`287`	`this.syncButton.enabled = false;`
`287`	`288`	`this.cancelButton.enabled = false;`
`288`		`- return this.withProgress(async () => this.userDataSyncPreview.apply());`
	`289`	`+ try {`
	`290`	`+ await this.withProgress(async () => this.userDataSyncPreview.apply());`
	`291`	`+ } catch (error) {`
	`292`	`+ this.syncButton.enabled = false;`
	`293`	`+ this.cancelButton.enabled = true;`
	`294`	`+ }`
`289`	`295`	`}`
`290`	`296`
`291`	`297`	`private async cancel(): Promise<void> {`
`@@ -331,7 +337,7 @@ export class UserDataManualSyncViewPane extends TreeViewPane {`
`331`	`337`	`}`
`332`	`338`	`}`
`333`	`339`
`334`		`- private close(previewResource: IUserDataSyncResource) {`
	`340`	`+ private close(previewResource: IUserDataSyncResource): void {`
`335`	`341`	`for (const input of this.editorService.editors) {`
`336`	`342`	`if (input instanceof DiffEditorInput) {`
`337`	`343`	`// Close all diff editors`
`@@ -360,6 +366,12 @@ export class UserDataManualSyncViewPane extends TreeViewPane {`
`360`	`366`	`}`
`361`	`367`	`}`
`362`	`368`
	`369`	`+ private closeAll() {`
	`370`	`+ for (const previewResource of this.userDataSyncPreview.resources) {`
	`371`	`+ this.close(previewResource);`
	`372`	`+ }`
	`373`	`+ }`
	`374`	`+`
`363`	`375`	`private withProgress(task: () => Promise<void>): Promise<void> {`
`364`	`376`	`return this.progressService.withProgress({ location: MANUAL_SYNC_VIEW_ID, delay: 500 }, task);`
`365`	`377`	`}`