#100346 add merged prop to resource preview

src/vs/platform/userDataSync/common/abstractSynchronizer.ts

@@ -53,17 +53,16 @@ function isSyncData(thing: any): thing is ISyncData {
 	return false;
 }
 
-export interface IResourcePreview extends IBaseResourcePreview {
+export interface IMergableResourcePreview extends IBaseResourcePreview {
 	readonly remoteContent: string | null;
 	readonly localContent: string | null;
 	readonly previewContent: string | null;
 	readonly hasConflicts: boolean;
-}
-
-interface IMergableResourcePreview extends IResourcePreview {
 	merged: boolean;
 }
 
+export type IResourcePreview = Omit<IMergableResourcePreview, 'merged'>;
+
 export interface ISyncResourcePreview extends IBaseSyncResourcePreview {
 	readonly remoteUserData: IRemoteUserData;
 	readonly lastSyncUserData: IRemoteUserData | null;

src/vs/platform/userDataSync/common/userDataSync.ts

@@ -304,6 +304,7 @@ export interface IResourcePreview {
 	readonly previewResource: URI;
 	readonly localChange: Change;
 	readonly remoteChange: Change;
+	readonly merged: boolean;
 }
 
 export interface ISyncResourcePreview {

src/vs/platform/userDataSync/common/userDataSyncService.ts

@@ -632,5 +632,6 @@ function toStrictResourcePreview(resourcePreview: IResourcePreview): IResourcePr
 		remoteResource: resourcePreview.remoteResource,
 		localChange: resourcePreview.localChange,
 		remoteChange: resourcePreview.remoteChange,
+		merged: resourcePreview.merged,
 	};
 }