fix keybindings remote content

sandy081 · sandy081 · commit ddfccd4de91c · 2020-01-21T14:48:28.000+01:00
diff --git a/src/vs/platform/userDataSync/common/keybindingsSync.ts b/src/vs/platform/userDataSync/common/keybindingsSync.ts
@@ -240,8 +240,15 @@ export class KeybindingsSynchroniser extends AbstractSynchroniser implements IUs
 	}
 
 	async getRemoteContent(): Promise<string | null> {
-		const remoteUserData = await this.getRemoteUserData();
-		return remoteUserData.content;
+		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;
 	}
 
 	async resetLocal(): Promise<void> {
diff --git a/src/vs/platform/userDataSync/common/settingsSync.ts b/src/vs/platform/userDataSync/common/settingsSync.ts
@@ -240,8 +240,15 @@ export class SettingsSynchroniser extends AbstractSynchroniser implements ISetti
 	}
 
 	async getRemoteContent(): Promise<string | null> {
-		const remoteUserData = await this.getRemoteUserData();
-		return remoteUserData.content;
+		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 !== undefined ? content : null;
 	}
 
 	async resolveConflicts(resolvedConflicts: { key: string, value: any | undefined }[]): Promise<void> {
