remove resourcePreviews from IUserDataSynchronizer

sandy081 · sandy081 · commit b79adfeb8ac2 · 2020-07-12T14:37:04.000+02:00
diff --git a/src/vs/platform/userDataSync/common/abstractSynchronizer.ts b/src/vs/platform/userDataSync/common/abstractSynchronizer.ts
@@ -80,7 +80,6 @@ export abstract class AbstractSynchroniser extends Disposable {
 	readonly onDidChangeStatus: Event<SyncStatus> = this._onDidChangStatus.event;
 
 	private _resourcePreviews: IResourcePreview[] = [];
-	get resourcePreviews(): IResourcePreview[] { return this._resourcePreviews; }
 
 	private _conflicts: IResourcePreview[] = [];
 	get conflicts(): IResourcePreview[] { return this._conflicts; }
diff --git a/src/vs/platform/userDataSync/common/userDataSync.ts b/src/vs/platform/userDataSync/common/userDataSync.ts
@@ -317,9 +317,10 @@ export interface IUserDataSynchroniser {
 	readonly resource: SyncResource;
 	readonly status: SyncStatus;
 	readonly onDidChangeStatus: Event<SyncStatus>;
-	readonly resourcePreviews: IResourcePreview[];
+
 	readonly conflicts: IResourcePreview[];
 	readonly onDidChangeConflicts: Event<IResourcePreview[]>;
+
 	readonly onDidChangeLocal: Event<void>;
 
 	pull(): Promise<void>;
diff --git a/src/vs/platform/userDataSync/test/common/snippetsSync.test.ts b/src/vs/platform/userDataSync/test/common/snippetsSync.test.ts
@@ -696,7 +696,6 @@ suite('SnippetsSync', () => {
 		let conflicts = testObject.conflicts;
 		await testObject.acceptPreviewContent(conflicts[0].previewResource, htmlSnippet2, false);
 
-		assert.deepEqual(testObject.resourcePreviews, []);
 		const fileService = testClient.instantiationService.get(IFileService);
 		assert.ok(fileService.exists(conflicts[0].previewResource));
 	});
diff --git a/src/vs/platform/userDataSync/test/common/synchronizer.test.ts b/src/vs/platform/userDataSync/test/common/synchronizer.test.ts
@@ -164,7 +164,7 @@ suite('TestSynchronizer', () => {
 		await testObject.sync(await client.manifest());
 
 		assert.deepEqual(testObject.status, SyncStatus.HasConflicts);
-		assertConflicts(testObject.conflicts, [testObject.resourcePreviews[0].previewResource]);
+		assertConflicts(testObject.conflicts, [resource]);
 	});
 
 	test('sync should not run if syncing already', async () => {
