149
150
protected async hasRemoteChanged(lastSyncUserData: IRemoteUserData): Promise<boolean> {
151
>
const lastSettingsSyncContent: ISettingsSyncContent | null = this.getSettingsSyncContent(lastSyncUserData);
settingsSync.ts
152
>
if (lastSettingsSyncContent === null) {
153
return true;
154
}
156
>
const fileContent = await this.getLocalFileContent();
157
>
const localContent: string = fileContent ? fileContent.value.toString().trim() : '';
158
>
const ignoredSettings = await this.getIgnoredSettings();
159
>
const formattingOptions = await this.getFormattingOptions();
160
>
const result = merge(localContent || '{}', lastSettingsSyncContent.settings, lastSettingsSyncContent.settings, ignoredSettings, [], formattingOptions);
161
>
return result.remoteContent !== null;
162
>
}
163
164
protected async getMergeResult(resourcePreview: ISettingsResourcePreview, token: CancellationToken): Promise<IMergeResult> {