Skip to content

Commit b19cdc4

Browse files
sandy081sandy081
committed
1 parent fdc2735 commit b19cdc4

9 files changed

Lines changed: 28 additions & 32 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ export class ExtensionsSynchroniser extends AbstractSynchroniser implements IUse
243243
}
244244
}
245245

246-
async getAssociatedResources({ uri }: ISyncResourceHandle): Promise<{ resource: URI, comparableResource?: URI }[]> {
246+
async getAssociatedResources({ uri }: ISyncResourceHandle): Promise<{ resource: URI, comparableResource: URI }[]> {
247247
return [{ resource: joinPath(uri, 'extensions.json'), comparableResource: ExtensionsSynchroniser.EXTENSIONS_DATA_URI }];
248248
}
249249

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ export class GlobalStateSynchroniser extends AbstractSynchroniser implements IUs
204204
}
205205
}
206206

207-
async getAssociatedResources({ uri }: ISyncResourceHandle): Promise<{ resource: URI, comparableResource?: URI }[]> {
207+
async getAssociatedResources({ uri }: ISyncResourceHandle): Promise<{ resource: URI, comparableResource: URI }[]> {
208208
return [{ resource: joinPath(uri, 'globalState.json'), comparableResource: GlobalStateSynchroniser.GLOBAL_STATE_DATA_URI }];
209209
}
210210

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@ export class KeybindingsSynchroniser extends AbstractJsonFileSynchroniser implem
235235
return false;
236236
}
237237

238-
async getAssociatedResources({ uri }: ISyncResourceHandle): Promise<{ resource: URI, comparableResource?: URI }[]> {
239-
const comparableResource = (await this.fileService.exists(this.file)) ? this.file : undefined;
238+
async getAssociatedResources({ uri }: ISyncResourceHandle): Promise<{ resource: URI, comparableResource: URI }[]> {
239+
const comparableResource = (await this.fileService.exists(this.file)) ? this.file : this.localResource;
240240
return [{ resource: joinPath(uri, 'keybindings.json'), comparableResource }];
241241
}
242242

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@ export class SettingsSynchroniser extends AbstractJsonFileSynchroniser implement
235235
return false;
236236
}
237237

238-
async getAssociatedResources({ uri }: ISyncResourceHandle): Promise<{ resource: URI, comparableResource?: URI }[]> {
239-
const comparableResource = (await this.fileService.exists(this.file)) ? this.file : undefined;
238+
async getAssociatedResources({ uri }: ISyncResourceHandle): Promise<{ resource: URI, comparableResource: URI }[]> {
239+
const comparableResource = (await this.fileService.exists(this.file)) ? this.file : this.localResource;
240240
return [{ resource: joinPath(uri, 'settings.json'), comparableResource }];
241241
}
242242

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ export class SnippetsSynchroniser extends AbstractSynchroniser implements IUserD
343343
return [...resourcePreviews.values()];
344344
}
345345

346-
async getAssociatedResources({ uri }: ISyncResourceHandle): Promise<{ resource: URI, comparableResource?: URI }[]> {
346+
async getAssociatedResources({ uri }: ISyncResourceHandle): Promise<{ resource: URI, comparableResource: URI }[]> {
347347
let content = await super.resolveContent(uri);
348348
if (content) {
349349
const syncData = this.parseSyncData(content);
@@ -354,7 +354,7 @@ export class SnippetsSynchroniser extends AbstractSynchroniser implements IUserD
354354
const resource = joinPath(uri, snippet);
355355
const comparableResource = joinPath(this.snippetsFolder, snippet);
356356
const exists = await this.fileService.exists(comparableResource);
357-
result.push({ resource, comparableResource: exists ? comparableResource : undefined });
357+
result.push({ resource, comparableResource: exists ? comparableResource : joinPath(this.syncPreviewFolder, snippet).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'local' }) });
358358
}
359359
return result;
360360
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ export interface IUserDataSynchroniser {
376376
resolveContent(resource: URI): Promise<string | null>;
377377
getRemoteSyncResourceHandles(): Promise<ISyncResourceHandle[]>;
378378
getLocalSyncResourceHandles(): Promise<ISyncResourceHandle[]>;
379-
getAssociatedResources(syncResourceHandle: ISyncResourceHandle): Promise<{ resource: URI, comparableResource?: URI }[]>;
379+
getAssociatedResources(syncResourceHandle: ISyncResourceHandle): Promise<{ resource: URI, comparableResource: URI }[]>;
380380
getMachineId(syncResourceHandle: ISyncResourceHandle): Promise<string | undefined>;
381381
}
382382

@@ -449,7 +449,7 @@ export interface IUserDataSyncService {
449449

450450
getLocalSyncResourceHandles(resource: SyncResource): Promise<ISyncResourceHandle[]>;
451451
getRemoteSyncResourceHandles(resource: SyncResource): Promise<ISyncResourceHandle[]>;
452-
getAssociatedResources(resource: SyncResource, syncResourceHandle: ISyncResourceHandle): Promise<{ resource: URI, comparableResource?: URI }[]>;
452+
getAssociatedResources(resource: SyncResource, syncResourceHandle: ISyncResourceHandle): Promise<{ resource: URI, comparableResource: URI }[]>;
453453
getMachineId(resource: SyncResource, syncResourceHandle: ISyncResourceHandle): Promise<string | undefined>;
454454
}
455455

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
258258
return this.getSynchroniser(resource).getLocalSyncResourceHandles();
259259
}
260260

261-
getAssociatedResources(resource: SyncResource, syncResourceHandle: ISyncResourceHandle): Promise<{ resource: URI, comparableResource?: URI }[]> {
261+
getAssociatedResources(resource: SyncResource, syncResourceHandle: ISyncResourceHandle): Promise<{ resource: URI, comparableResource: URI }[]> {
262262
return this.getSynchroniser(resource).getAssociatedResources(syncResourceHandle);
263263
}
264264

‎src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -270,24 +270,20 @@ export class UserDataSyncDataViews extends Disposable {
270270
}
271271
async run(accessor: ServicesAccessor, handle: TreeViewItemHandleArg): Promise<void> {
272272
const editorService = accessor.get(IEditorService);
273-
const { resource, comparableResource } = <{ resource: string, comparableResource?: string }>JSON.parse(handle.$treeItemHandle);
274-
if (comparableResource) {
275-
const leftResource = URI.parse(resource);
276-
const leftResourceName = localize({ key: 'leftResourceName', comment: ['remote as in file in cloud'] }, "{0} (Remote)", basename(leftResource));
277-
const rightResource = URI.parse(comparableResource);
278-
const rightResourceName = localize({ key: 'rightResourceName', comment: ['local as in file in disk'] }, "{0} (Local)", basename(rightResource));
279-
await editorService.openEditor({
280-
leftResource,
281-
rightResource,
282-
label: localize('sideBySideLabels', "{0} ↔ {1}", leftResourceName, rightResourceName),
283-
options: {
284-
preserveFocus: true,
285-
revealIfVisible: true,
286-
},
287-
});
288-
} else {
289-
await editorService.openEditor({ resource: URI.parse(resource) });
290-
}
273+
const { resource, comparableResource } = <{ resource: string, comparableResource: string }>JSON.parse(handle.$treeItemHandle);
274+
const leftResource = URI.parse(resource);
275+
const leftResourceName = localize({ key: 'leftResourceName', comment: ['remote as in file in cloud'] }, "{0} (Remote)", basename(leftResource));
276+
const rightResource = URI.parse(comparableResource);
277+
const rightResourceName = localize({ key: 'rightResourceName', comment: ['local as in file in disk'] }, "{0} (Local)", basename(rightResource));
278+
await editorService.openEditor({
279+
leftResource,
280+
rightResource,
281+
label: localize('sideBySideLabels', "{0} ↔ {1}", leftResourceName, rightResourceName),
282+
options: {
283+
preserveFocus: true,
284+
revealIfVisible: true,
285+
},
286+
});
291287
}
292288
});
293289
}
@@ -365,7 +361,7 @@ abstract class UserDataSyncActivityViewDataProvider implements ITreeViewDataProv
365361
protected async getChildrenForSyncResourceTreeItem(element: SyncResourceHandleTreeItem): Promise<ITreeItem[]> {
366362
const associatedResources = await this.userDataSyncService.getAssociatedResources((<SyncResourceHandleTreeItem>element).syncResourceHandle.syncResource, (<SyncResourceHandleTreeItem>element).syncResourceHandle);
367363
return associatedResources.map(({ resource, comparableResource }) => {
368-
const handle = JSON.stringify({ resource: resource.toString(), comparableResource: comparableResource?.toString() });
364+
const handle = JSON.stringify({ resource: resource.toString(), comparableResource: comparableResource.toString() });
369365
return {
370366
handle,
371367
collapsibleState: TreeItemCollapsibleState.None,

‎src/vs/workbench/services/userDataSync/electron-browser/userDataSyncService.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
119119
return handles.map(({ created, uri }) => ({ created, uri: URI.revive(uri) }));
120120
}
121121

122-
async getAssociatedResources(resource: SyncResource, syncResourceHandle: ISyncResourceHandle): Promise<{ resource: URI, comparableResource?: URI }[]> {
123-
const result = await this.channel.call<{ resource: URI, comparableResource?: URI }[]>('getAssociatedResources', [resource, syncResourceHandle]);
122+
async getAssociatedResources(resource: SyncResource, syncResourceHandle: ISyncResourceHandle): Promise<{ resource: URI, comparableResource: URI }[]> {
123+
const result = await this.channel.call<{ resource: URI, comparableResource: URI }[]>('getAssociatedResources', [resource, syncResourceHandle]);
124124
return result.map(({ resource, comparableResource }) => ({ resource: URI.revive(resource), comparableResource: URI.revive(comparableResource) }));
125125
}
126126

0 commit comments

Comments
 (0)