development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-12 14:30:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update formatting for new TS version

Browse source
This commit is contained in:
Matt Bierner 2020-09-25 01:26:53 -07:00
parent c0ae73464a
commit d014eb1280
2 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
View file

@ -749,10 +749,10 @@ class UserDataSyncPreview extends Disposable implements IUserDataSyncPreview {
const newResources = this.toUserDataSyncResourceGroups(
(this.manualSync?.preview || [])
.map(([syncResource, syncResourcePreview]) =>
([
syncResource,
syncResourcePreview.resourcePreviews
]))
([
syncResource,
syncResourcePreview.resourcePreviews
]))
);
if (!equals(newResources, this._resources, (a, b) => isEqual(a.local, b.local) && a.mergeState === b.mergeState)) {
this._resources = newResources;

46
src/vs/workbench/services/userDataSync/electron-browser/userDataSyncService.ts
View file

@ -136,16 +136,16 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
private async updateConflicts(conflicts: [SyncResource, IResourcePreview[]][]): Promise<void> {
// Revive URIs
this._conflicts = conflicts.map(([syncResource, conflicts]) =>
([
syncResource,
conflicts.map(r =>
({
...r,
localResource: URI.revive(r.localResource),
remoteResource: URI.revive(r.remoteResource),
previewResource: URI.revive(r.previewResource),
}))
]));
([
syncResource,
conflicts.map(r =>
({
...r,
localResource: URI.revive(r.localResource),
remoteResource: URI.revive(r.remoteResource),
previewResource: URI.revive(r.previewResource),
}))
]));
this._onDidChangeConflicts.fire(this._conflicts);
}
@ -239,19 +239,19 @@ class ManualSyncTask implements IManualSyncTask {
private deserializePreviews(previews: [SyncResource, ISyncResourcePreview][]): [SyncResource, ISyncResourcePreview][] {
return previews.map(([syncResource, preview]) =>
([
syncResource,
{
isLastSyncFromCurrentMachine: preview.isLastSyncFromCurrentMachine,
resourcePreviews: preview.resourcePreviews.map(r => ({
...r,
localResource: URI.revive(r.localResource),
remoteResource: URI.revive(r.remoteResource),
previewResource: URI.revive(r.previewResource),
acceptedResource: URI.revive(r.acceptedResource),
}))
}
]));
([
syncResource,
{
isLastSyncFromCurrentMachine: preview.isLastSyncFromCurrentMachine,
resourcePreviews: preview.resourcePreviews.map(r => ({
...r,
localResource: URI.revive(r.localResource),
remoteResource: URI.revive(r.remoteResource),
previewResource: URI.revive(r.previewResource),
acceptedResource: URI.revive(r.acceptedResource),
}))
}
]));
}
}