Fix microsoft#104077

sandy081 · sandy081 · commit 6abedab252df · 2020-08-05T17:37:16.000+02:00
diff --git a/src/vs/platform/userDataSync/common/keybindingsSync.ts b/src/vs/platform/userDataSync/common/keybindingsSync.ts
@@ -236,7 +236,8 @@ export class KeybindingsSynchroniser extends AbstractJsonFileSynchroniser implem
 	}
 
 	async getAssociatedResources({ uri }: ISyncResourceHandle): Promise<{ resource: URI, comparableResource?: URI }[]> {
-		return [{ resource: joinPath(uri, 'keybindings.json'), comparableResource: this.file }];
+		const comparableResource = (await this.fileService.exists(this.file)) ? this.file : undefined;
+		return [{ resource: joinPath(uri, 'keybindings.json'), comparableResource }];
 	}
 
 	async resolveContent(uri: URI): Promise<string | null> {
diff --git a/src/vs/platform/userDataSync/common/settingsSync.ts b/src/vs/platform/userDataSync/common/settingsSync.ts
@@ -236,7 +236,8 @@ export class SettingsSynchroniser extends AbstractJsonFileSynchroniser implement
 	}
 
 	async getAssociatedResources({ uri }: ISyncResourceHandle): Promise<{ resource: URI, comparableResource?: URI }[]> {
-		return [{ resource: joinPath(uri, 'settings.json'), comparableResource: this.file }];
+		const comparableResource = (await this.fileService.exists(this.file)) ? this.file : undefined;
+		return [{ resource: joinPath(uri, 'settings.json'), comparableResource }];
 	}
 
 	async resolveContent(uri: URI): Promise<string | null> {
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts
@@ -37,6 +37,7 @@ import { INotificationService, Severity } from 'vs/platform/notification/common/
 import { TreeView } from 'vs/workbench/contrib/views/browser/treeView';
 import { flatten } from 'vs/base/common/arrays';
 import { UserDataSyncMergesViewPane } from 'vs/workbench/contrib/userDataSync/browser/userDataSyncMergesView';
+import { basename } from 'vs/base/common/resources';
 
 export class UserDataSyncViewPaneContainer extends ViewPaneContainer {
 
@@ -271,9 +272,14 @@ export class UserDataSyncDataViews extends Disposable {
 				const editorService = accessor.get(IEditorService);
 				const { resource, comparableResource } = <{ resource: string, comparableResource?: string }>JSON.parse(handle.$treeItemHandle);
 				if (comparableResource) {
+					const leftResource = URI.parse(resource);
+					const leftResourceName = localize({ key: 'leftResourceName', comment: ['remote as in file in cloud'] }, "{0} (Remote)", basename(leftResource));
+					const rightResource = URI.parse(comparableResource);
+					const rightResourceName = localize({ key: 'rightResourceName', comment: ['local as in file in disk'] }, "{0} (Local)", basename(rightResource));
 					await editorService.openEditor({
-						leftResource: URI.parse(resource),
-						rightResource: URI.parse(comparableResource),
+						leftResource,
+						rightResource,
+						label: localize('sideBySideLabels', "{0} ↔ {1}", leftResourceName, rightResourceName),
 						options: {
 							preserveFocus: true,
 							revealIfVisible: true,

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,8 @@ export class KeybindingsSynchroniser extends AbstractJsonFileSynchroniser implem`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`async getAssociatedResources({ uri }: ISyncResourceHandle): Promise<{ resource: URI, comparableResource?: URI }[]> {`
`239`		`- return [{ resource: joinPath(uri, 'keybindings.json'), comparableResource: this.file }];`
	`239`	`+ const comparableResource = (await this.fileService.exists(this.file)) ? this.file : undefined;`
	`240`	`+ return [{ resource: joinPath(uri, 'keybindings.json'), comparableResource }];`
`240`	`241`	`}`
`241`	`242`
`242`	`243`	`async resolveContent(uri: URI): Promise<string \| null> {`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,8 @@ export class SettingsSynchroniser extends AbstractJsonFileSynchroniser implement`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`async getAssociatedResources({ uri }: ISyncResourceHandle): Promise<{ resource: URI, comparableResource?: URI }[]> {`
`239`		`- return [{ resource: joinPath(uri, 'settings.json'), comparableResource: this.file }];`
	`239`	`+ const comparableResource = (await this.fileService.exists(this.file)) ? this.file : undefined;`
	`240`	`+ return [{ resource: joinPath(uri, 'settings.json'), comparableResource }];`
`240`	`241`	`}`
`241`	`242`
`242`	`243`	`async resolveContent(uri: URI): Promise<string \| null> {`