do not show the merged remote content

sandy081 · sandy081 · commit 2832fc3c234d · 2020-01-21T12:02:50.000+01:00
diff --git a/src/vs/platform/userDataSync/common/keybindingsSync.ts b/src/vs/platform/userDataSync/common/keybindingsSync.ts
@@ -240,15 +240,8 @@ export class KeybindingsSynchroniser extends AbstractSynchroniser implements IUs
 	}
 
 	async getRemoteContent(): Promise<string | null> {
-		let content: string | null | undefined = null;
-		if (this.syncPreviewResultPromise) {
-			const preview = await this.syncPreviewResultPromise;
-			content = preview.remoteUserData?.content;
-		} else {
-			const remoteUserData = await this.getRemoteUserData();
-			content = remoteUserData.content;
-		}
-		return content ? this.getKeybindingsContentFromSyncContent(content) : null;
+		const remoteUserData = await this.getRemoteUserData();
+		return remoteUserData.content;
 	}
 
 	async resetLocal(): Promise<void> {
diff --git a/src/vs/platform/userDataSync/common/settingsSync.ts b/src/vs/platform/userDataSync/common/settingsSync.ts
@@ -240,12 +240,8 @@ export class SettingsSynchroniser extends AbstractSynchroniser implements ISetti
 	}
 
 	async getRemoteContent(): Promise<string | null> {
-		if (this.syncPreviewResultPromise) {
-			const preview = await this.syncPreviewResultPromise;
-			return preview.remoteContent;
-		}
-		const remoteUserData = this.getRemoteUserData();
-		return (await remoteUserData).content;
+		const remoteUserData = await this.getRemoteUserData();
+		return remoteUserData.content;
 	}
 
 	async resolveConflicts(resolvedConflicts: { key: string, value: any | undefined }[]): Promise<void> {

Original file line number	Diff line number	Diff line change
`@@ -240,12 +240,8 @@ export class SettingsSynchroniser extends AbstractSynchroniser implements ISetti`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`async getRemoteContent(): Promise<string \| null> {`
`243`		`- if (this.syncPreviewResultPromise) {`
`244`		`- const preview = await this.syncPreviewResultPromise;`
`245`		`- return preview.remoteContent;`
`246`		`- }`
`247`		`- const remoteUserData = this.getRemoteUserData();`
`248`		`- return (await remoteUserData).content;`
	`243`	`+ const remoteUserData = await this.getRemoteUserData();`
	`244`	`+ return remoteUserData.content;`
`249`	`245`	`}`
`250`	`246`
`251`	`247`	`async resolveConflicts(resolvedConflicts: { key: string, value: any \| undefined }[]): Promise<void> {`