326
/* Snippets with conflicts */
327
for (const key of snippetsMergeResult.conflicts) {
329
>
content: baseSnippets[key] ?? null,
330
>
hasConflicts: true,
331
>
localChange: localFileContent[key] ? Change.Modified : Change.Added,
332
>
remoteChange: remoteSnippets[key] ? Change.Modified : Change.Added
333
>
};
334
>
const localContent = localFileContent[key] ? localFileContent[key].value.toString() : null;
335
>
resourcePreviews.set(key, {
336
>
baseResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'base' }),
337
>
baseContent: baseSnippets[key] ?? null,
338
>
localResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'local' }),
339
>
fileContent: localFileContent[key] || null,
340
>
localContent,
341
>
remoteResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'remote' }),
342
>
remoteContent: remoteSnippets[key] || null,
343
>
previewResource: this.extUri.joinPath(this.syncPreviewFolder, key),
344
>
previewResult,
345
>
localChange: previewResult.localChange,
346
>
remoteChange: previewResult.remoteChange,
347
>
acceptedResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'accepted' })
348
>
});
349
>
}
350
351
/* Unmodified Snippets */