90
91
protected async generateSyncPreview(remoteUserData: IRemoteUserData, lastSyncUserData: ILastSyncUserData | null, isRemoteDataFromCurrentMachine: boolean, userDataSyncConfiguration: IUserDataSyncConfiguration): Promise<IKeybindingsResourcePreview[]> {
92
>
const remoteContent = remoteUserData.syncData ? getKeybindingsContentFromSyncContent(remoteUserData.syncData.content, userDataSyncConfiguration.keybindingsPerPlatform ?? this.syncKeybindingsPerPlatform(), this.logService) : null;
keybindingsSync.ts
93
>
94
>
// Use remote data as last sync data if last sync data does not exist and remote data is from same machine
95
>
lastSyncUserData = lastSyncUserData === null && isRemoteDataFromCurrentMachine ? remoteUserData : lastSyncUserData;
96
>
const lastSyncContent: string | null = lastSyncUserData ? this.getKeybindingsContentFromLastSyncUserData(lastSyncUserData) : null;
97
>
98
>
// Get file content last to get the latest
99
>
const fileContent = await this.getLocalFileContent();
100
>
const formattingOptions = await this.getFormattingOptions();
101
>
102
>
let mergedContent: string | null = null;
103
>
let hasLocalChanged: boolean = false;
104
>
let hasRemoteChanged: boolean = false;
105
>
let hasConflicts: boolean = false;
106
>
107
>
if (remoteContent) {
108
let localContent: string = fileContent ? fileContent.value.toString() : '[]';
109
localContent = localContent || '[]';