Fix microsoft#89046

sandy081 · sandy081 · commit 79f83f0033fc · 2020-01-23T17:02:12.000+01:00
diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts
@@ -128,6 +128,7 @@ export interface IEnvironmentService extends IUserHomeProvider {
 
 	// sync resources
 	userDataSyncLogResource: URI;
+	userDataSyncHome: URI;
 	settingsSyncPreviewResource: URI;
 	keybindingsSyncPreviewResource: URI;
 
diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts
@@ -112,10 +112,13 @@ export class EnvironmentService implements IEnvironmentService {
 	get settingsResource(): URI { return resources.joinPath(this.userRoamingDataHome, 'settings.json'); }
 
 	@memoize
-	get settingsSyncPreviewResource(): URI { return resources.joinPath(this.userRoamingDataHome, '.settings.json'); }
+	get userDataSyncHome(): URI { return resources.joinPath(this.userRoamingDataHome, '.sync'); }
 
 	@memoize
-	get keybindingsSyncPreviewResource(): URI { return resources.joinPath(this.userRoamingDataHome, '.keybindings.json'); }
+	get settingsSyncPreviewResource(): URI { return resources.joinPath(this.userDataSyncHome, 'settings.json'); }
+
+	@memoize
+	get keybindingsSyncPreviewResource(): URI { return resources.joinPath(this.userDataSyncHome, 'keybindings.json'); }
 
 	@memoize
 	get userDataSyncLogResource(): URI { return URI.file(path.join(this.logsPath, 'userDataSync.log')); }
diff --git a/src/vs/platform/userDataSync/common/abstractSynchronizer.ts b/src/vs/platform/userDataSync/common/abstractSynchronizer.ts
@@ -24,7 +24,7 @@ export abstract class AbstractSynchroniser extends Disposable {
 		@IEnvironmentService environmentService: IEnvironmentService
 	) {
 		super();
-		this.syncFolder = joinPath(environmentService.userRoamingDataHome, '.sync', source);
+		this.syncFolder = joinPath(environmentService.userDataSyncHome, source);
 		this.cleanUpDelayer = new ThrottledDelayer(50);
 	}
 
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
@@ -469,7 +469,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 			previewResource = this.workbenchEnvironmentService.settingsSyncPreviewResource;
 			label = localize('settings conflicts preview', "Settings Conflicts (Remote ↔ Local)");
 		} else if (this.userDataSyncService.conflictsSource === SyncSource.Keybindings) {
-			previewResource = this.workbenchEnvironmentService.keybindingsResource;
+			previewResource = this.workbenchEnvironmentService.keybindingsSyncPreviewResource;
 			label = localize('keybindings conflicts preview', "Keybindings Conflicts (Remote ↔ Local)");
 		}
 		if (previewResource) {
diff --git a/src/vs/workbench/services/environment/browser/environmentService.ts b/src/vs/workbench/services/environment/browser/environmentService.ts
@@ -137,10 +137,13 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment
 	get argvResource(): URI { return joinPath(this.userRoamingDataHome, 'argv.json'); }
 
 	@memoize
-	get settingsSyncPreviewResource(): URI { return joinPath(this.userRoamingDataHome, '.settings.json'); }
+	get userDataSyncHome(): URI { return joinPath(this.userRoamingDataHome, '.sync'); }
 
 	@memoize
-	get keybindingsSyncPreviewResource(): URI { return joinPath(this.userRoamingDataHome, '.keybindings.json'); }
+	get settingsSyncPreviewResource(): URI { return joinPath(this.userDataSyncHome, 'settings.json'); }
+
+	@memoize
+	get keybindingsSyncPreviewResource(): URI { return joinPath(this.userDataSyncHome, 'keybindings.json'); }
 
 	@memoize
 	get userDataSyncLogResource(): URI { return joinPath(this.options.logsPath, 'userDataSync.log'); }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ export abstract class AbstractSynchroniser extends Disposable {`
`24`	`24`	`@IEnvironmentService environmentService: IEnvironmentService`
`25`	`25`	`) {`
`26`	`26`	`super();`
`27`		`- this.syncFolder = joinPath(environmentService.userRoamingDataHome, '.sync', source);`
	`27`	`+ this.syncFolder = joinPath(environmentService.userDataSyncHome, source);`
`28`	`28`	`this.cleanUpDelayer = new ThrottledDelayer(50);`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -469,7 +469,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo`
`469`	`469`	`previewResource = this.workbenchEnvironmentService.settingsSyncPreviewResource;`
`470`	`470`	`label = localize('settings conflicts preview', "Settings Conflicts (Remote ↔ Local)");`
`471`	`471`	`} else if (this.userDataSyncService.conflictsSource === SyncSource.Keybindings) {`
`472`		`- previewResource = this.workbenchEnvironmentService.keybindingsResource;`
	`472`	`+ previewResource = this.workbenchEnvironmentService.keybindingsSyncPreviewResource;`
`473`	`473`	`label = localize('keybindings conflicts preview', "Keybindings Conflicts (Remote ↔ Local)");`
`474`	`474`	`}`
`475`	`475`	`if (previewResource) {`