Fix microsoft#97082

sandy081 · sandy081 · commit beb2a42acd38 · 2020-06-03T18:32:06.000+02:00
diff --git a/src/vs/platform/userDataSync/common/keybindingsSync.ts b/src/vs/platform/userDataSync/common/keybindingsSync.ts
@@ -311,7 +311,7 @@ export class KeybindingsSynchroniser extends AbstractJsonFileSynchroniser implem
 
 		if (remoteContent) {
 			const localContent: string = fileContent ? fileContent.value.toString() : '[]';
-			if (this.hasErrors(localContent)) {
+			if (!localContent.trim() || this.hasErrors(localContent)) {
 				throw new UserDataSyncError(localize('errorInvalidSettings', "Unable to sync keybindings as there are errors/warning in keybindings file."), UserDataSyncErrorCode.LocalInvalidContent, this.resource);
 			}
 
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
@@ -342,7 +342,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 		const errorArea = getSyncAreaLabel(source);
 		const handle = this.notificationService.notify({
 			severity: Severity.Error,
-			message: localize('errorInvalidConfiguration', "Unable to sync {0} because there are some errors/warnings in the file. Please open the file to correct errors/warnings in it.", errorArea.toLowerCase()),
+			message: localize('errorInvalidConfiguration', "Unable to sync {0} because the content in the file is not valid. Please open the file and correct it.", errorArea.toLowerCase()),
 			actions: {
 				primary: [new Action('open sync file', localize('open file', "Open {0} File", errorArea), undefined, true,
 					() => source === SyncResource.Settings ? this.preferencesService.openGlobalSettings(true) : this.preferencesService.openGlobalKeybindingSettings(true))]

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ export class KeybindingsSynchroniser extends AbstractJsonFileSynchroniser implem`
`311`	`311`
`312`	`312`	`if (remoteContent) {`
`313`	`313`	`const localContent: string = fileContent ? fileContent.value.toString() : '[]';`
`314`		`- if (this.hasErrors(localContent)) {`
	`314`	`+ if (!localContent.trim() \|\| this.hasErrors(localContent)) {`
`315`	`315`	`throw new UserDataSyncError(localize('errorInvalidSettings', "Unable to sync keybindings as there are errors/warning in keybindings file."), UserDataSyncErrorCode.LocalInvalidContent, this.resource);`
`316`	`316`	`}`
`317`	`317`