get accepted resource from synchronizers

sandy081 · sandy081 · commit 811e4ae35e72 · 2020-07-27T15:39:34.000+02:00
diff --git a/src/vs/platform/userDataSync/common/abstractSynchronizer.ts b/src/vs/platform/userDataSync/common/abstractSynchronizer.ts
@@ -64,6 +64,7 @@ export interface IResourcePreview {
 	readonly localChange: Change;
 
 	readonly previewResource: URI;
+	readonly acceptedResource: URI;
 }
 
 export interface IAcceptResult {
@@ -590,7 +591,6 @@ export abstract class AbstractSynchroniser extends Disposable {
 
 				resourcePreviews.push({
 					...resourcePreviewResult,
-					acceptedResource: resourcePreviewResult.previewResource.with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'accepted' }),
 					acceptResult,
 					mergeState: mergeResult?.hasConflicts ? MergeState.Conflict : acceptResult ? MergeState.Accepted : MergeState.Preview,
 					localChange: acceptResult ? acceptResult.localChange : mergeResult ? mergeResult.localChange : resourcePreviewResult.localChange,
diff --git a/src/vs/platform/userDataSync/common/extensionsSync.ts b/src/vs/platform/userDataSync/common/extensionsSync.ts
@@ -115,7 +115,8 @@ export class ExtensionsSynchroniser extends AbstractSynchroniser implements IUse
 			previewResource: this.previewResource,
 			previewResult,
 			localChange: previewResult.localChange,
-			remoteChange: previewResult.remoteChange
+			remoteChange: previewResult.remoteChange,
+			acceptedResource: this.acceptedResource,
 		}];
 	}
 
diff --git a/src/vs/platform/userDataSync/common/globalStateSync.ts b/src/vs/platform/userDataSync/common/globalStateSync.ts
@@ -111,7 +111,8 @@ export class GlobalStateSynchroniser extends AbstractSynchroniser implements IUs
 			previewResource: this.previewResource,
 			previewResult,
 			localChange: previewResult.localChange,
-			remoteChange: previewResult.remoteChange
+			remoteChange: previewResult.remoteChange,
+			acceptedResource: this.acceptedResource,
 		}];
 	}
 
diff --git a/src/vs/platform/userDataSync/common/keybindingsSync.ts b/src/vs/platform/userDataSync/common/keybindingsSync.ts
@@ -118,7 +118,8 @@ export class KeybindingsSynchroniser extends AbstractJsonFileSynchroniser implem
 			remoteChange: previewResult.remoteChange,
 
 			previewResource: this.previewResource,
-			previewResult
+			previewResult,
+			acceptedResource: this.acceptedResource,
 		}];
 
 	}
diff --git a/src/vs/platform/userDataSync/common/settingsSync.ts b/src/vs/platform/userDataSync/common/settingsSync.ts
@@ -112,7 +112,8 @@ export class SettingsSynchroniser extends AbstractJsonFileSynchroniser implement
 			remoteChange: previewResult.remoteChange,
 
 			previewResource: this.previewResource,
-			previewResult
+			previewResult,
+			acceptedResource: this.acceptedResource,
 		}];
 	}
 
diff --git a/src/vs/platform/userDataSync/common/snippetsSync.ts b/src/vs/platform/userDataSync/common/snippetsSync.ts
@@ -179,7 +179,8 @@ export class SnippetsSynchroniser extends AbstractSynchroniser implements IUserD
 				previewResource: joinPath(this.syncPreviewFolder, key),
 				previewResult,
 				localChange: previewResult.localChange,
-				remoteChange: previewResult.remoteChange
+				remoteChange: previewResult.remoteChange,
+				acceptedResource: joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'accepted' })
 			});
 		}
 
@@ -200,7 +201,8 @@ export class SnippetsSynchroniser extends AbstractSynchroniser implements IUserD
 				previewResource: joinPath(this.syncPreviewFolder, key),
 				previewResult,
 				localChange: previewResult.localChange,
-				remoteChange: previewResult.remoteChange
+				remoteChange: previewResult.remoteChange,
+				acceptedResource: joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'accepted' })
 			});
 		}
 
@@ -221,7 +223,8 @@ export class SnippetsSynchroniser extends AbstractSynchroniser implements IUserD
 				previewResource: joinPath(this.syncPreviewFolder, key),
 				previewResult,
 				localChange: previewResult.localChange,
-				remoteChange: previewResult.remoteChange
+				remoteChange: previewResult.remoteChange,
+				acceptedResource: joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'accepted' })
 			});
 		}
 
@@ -242,7 +245,8 @@ export class SnippetsSynchroniser extends AbstractSynchroniser implements IUserD
 				previewResource: joinPath(this.syncPreviewFolder, key),
 				previewResult,
 				localChange: previewResult.localChange,
-				remoteChange: previewResult.remoteChange
+				remoteChange: previewResult.remoteChange,
+				acceptedResource: joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'accepted' })
 			});
 		}
 
@@ -263,7 +267,8 @@ export class SnippetsSynchroniser extends AbstractSynchroniser implements IUserD
 				previewResource: joinPath(this.syncPreviewFolder, key),
 				previewResult,
 				localChange: previewResult.localChange,
-				remoteChange: previewResult.remoteChange
+				remoteChange: previewResult.remoteChange,
+				acceptedResource: joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'accepted' })
 			});
 		}
 
@@ -284,7 +289,8 @@ export class SnippetsSynchroniser extends AbstractSynchroniser implements IUserD
 				previewResource: joinPath(this.syncPreviewFolder, key),
 				previewResult,
 				localChange: previewResult.localChange,
-				remoteChange: previewResult.remoteChange
+				remoteChange: previewResult.remoteChange,
+				acceptedResource: joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'accepted' })
 			});
 		}
 
@@ -305,7 +311,8 @@ export class SnippetsSynchroniser extends AbstractSynchroniser implements IUserD
 				previewResource: joinPath(this.syncPreviewFolder, key),
 				previewResult,
 				localChange: previewResult.localChange,
-				remoteChange: previewResult.remoteChange
+				remoteChange: previewResult.remoteChange,
+				acceptedResource: joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'accepted' })
 			});
 		}
 
@@ -327,7 +334,8 @@ export class SnippetsSynchroniser extends AbstractSynchroniser implements IUserD
 					previewResource: joinPath(this.syncPreviewFolder, key),
 					previewResult,
 					localChange: previewResult.localChange,
-					remoteChange: previewResult.remoteChange
+					remoteChange: previewResult.remoteChange,
+					acceptedResource: joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'accepted' })
 				});
 			}
 		}
diff --git a/src/vs/platform/userDataSync/test/common/synchronizer.test.ts b/src/vs/platform/userDataSync/test/common/synchronizer.test.ts
@@ -72,6 +72,7 @@ class TestSynchroniser extends AbstractSynchroniser {
 			ref: remoteUserData.ref,
 			localChange: Change.Modified,
 			remoteChange: Change.Modified,
+			acceptedResource: this.localResource.with(({ scheme: USER_DATA_SYNC_SCHEME, authority: 'accepted' })),
 		}];
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,8 @@ export class ExtensionsSynchroniser extends AbstractSynchroniser implements IUse`
`115`	`115`	`previewResource: this.previewResource,`
`116`	`116`	`previewResult,`
`117`	`117`	`localChange: previewResult.localChange,`
`118`		`- remoteChange: previewResult.remoteChange`
	`118`	`+ remoteChange: previewResult.remoteChange,`
	`119`	`+ acceptedResource: this.acceptedResource,`
`119`	`120`	`}];`
`120`	`121`	`}`
`121`	`122`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,8 @@ export class GlobalStateSynchroniser extends AbstractSynchroniser implements IUs`
`111`	`111`	`previewResource: this.previewResource,`
`112`	`112`	`previewResult,`
`113`	`113`	`localChange: previewResult.localChange,`
`114`		`- remoteChange: previewResult.remoteChange`
	`114`	`+ remoteChange: previewResult.remoteChange,`
	`115`	`+ acceptedResource: this.acceptedResource,`
`115`	`116`	`}];`
`116`	`117`	`}`
`117`	`118`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,8 @@ export class KeybindingsSynchroniser extends AbstractJsonFileSynchroniser implem`
`118`	`118`	`remoteChange: previewResult.remoteChange,`
`119`	`119`
`120`	`120`	`previewResource: this.previewResource,`
`121`		`- previewResult`
	`121`	`+ previewResult,`
	`122`	`+ acceptedResource: this.acceptedResource,`
`122`	`123`	`}];`
`123`	`124`
`124`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,8 @@ export class SettingsSynchroniser extends AbstractJsonFileSynchroniser implement`
`112`	`112`	`remoteChange: previewResult.remoteChange,`
`113`	`113`
`114`	`114`	`previewResource: this.previewResource,`
`115`		`- previewResult`
	`115`	`+ previewResult,`
	`116`	`+ acceptedResource: this.acceptedResource,`
`116`	`117`	`}];`
`117`	`118`	`}`
`118`	`119`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ class TestSynchroniser extends AbstractSynchroniser {`
`72`	`72`	`ref: remoteUserData.ref,`
`73`	`73`	`localChange: Change.Modified,`
`74`	`74`	`remoteChange: Change.Modified,`
	`75`	`+ acceptedResource: this.localResource.with(({ scheme: USER_DATA_SYNC_SCHEME, authority: 'accepted' })),`
`75`	`76`	`}];`
`76`	`77`	`}`
`77`	`78`