252
/* Prompts removed remotely -> remove locally */
253
for (const key of mergeResult.local.removed) {
255
>
content: null,
256
>
hasConflicts: false,
257
>
localChange: Change.Deleted,
258
>
remoteChange: Change.None,
259
>
};
260
>
const localContent = localFileContent[key] ? localFileContent[key].value.toString() : null;
261
>
resourcePreviews.set(key, {
262
>
baseResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'base' }),
263
>
baseContent: base[key] ?? null,
264
>
localResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'local' }),
265
>
fileContent: localFileContent[key],
266
>
localContent,
267
>
remoteResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'remote' }),
268
>
remoteContent: null,
269
>
previewResource: this.extUri.joinPath(this.syncPreviewFolder, key),
270
>
previewResult,
271
>
localChange: previewResult.localChange,
272
>
remoteChange: previewResult.remoteChange,
273
>
acceptedResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'accepted' })
274
>
});
275
>
}
276
277
/* Prompts added locally -> add remotely */