microsoft#91545 skip global state synchroniser while checking for merging

sandy081 · sandy081 · commit 2e601022fd4e · 2020-03-30T18:15:12.000+02:00
diff --git a/src/vs/platform/userDataSync/common/userDataSyncService.ts b/src/vs/platform/userDataSync/common/userDataSyncService.ts
@@ -220,7 +220,7 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
 		if (!(await this.hasLocalData())) {
 			return false;
 		}
-		for (const synchroniser of this.synchronisers) {
+		for (const synchroniser of [this.settingsSynchroniser, this.keybindingsSynchroniser, this.snippetsSynchroniser, this.extensionsSynchroniser]) {
 			const preview = await synchroniser.getSyncPreview();
 			if (preview.hasLocalChanged || preview.hasRemoteChanged) {
 				return true;

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ`
`220`	`220`	`if (!(await this.hasLocalData())) {`
`221`	`221`	`return false;`
`222`	`222`	`}`
`223`		`- for (const synchroniser of this.synchronisers) {`
	`223`	`+ for (const synchroniser of [this.settingsSynchroniser, this.keybindingsSynchroniser, this.snippetsSynchroniser, this.extensionsSynchroniser]) {`
`224`	`224`	`const preview = await synchroniser.getSyncPreview();`
`225`	`225`	`if (preview.hasLocalChanged \|\| preview.hasRemoteChanged) {`
`226`	`226`	`return true;`