Configure syncing ui state

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

@@ -14,6 +14,7 @@ import { IFileService } from 'vs/platform/files/common/files';
 import { IStringDictionary } from 'vs/base/common/collections';
 import { edit } from 'vs/platform/userDataSync/common/content';
 import { merge } from 'vs/platform/userDataSync/common/globalStateMerge';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 
 const argvProperties: string[] = ['locale'];
 
@@ -36,6 +37,7 @@ export class GlobalStateSynchroniser extends Disposable implements ISynchroniser
 		@IUserDataSyncStoreService private readonly userDataSyncStoreService: IUserDataSyncStoreService,
 		@IUserDataSyncLogService private readonly logService: IUserDataSyncLogService,
 		@IEnvironmentService private readonly environmentService: IEnvironmentService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
 	) {
 		super();
 		this.lastSyncGlobalStateResource = joinPath(environmentService.userRoamingDataHome, '.lastSyncGlobalState');
@@ -51,24 +53,29 @@ export class GlobalStateSynchroniser extends Disposable implements ISynchroniser
 	}
 
 	async sync(): Promise<boolean> {
+		if (!this.configurationService.getValue<boolean>('sync.enableUIState')) {
+			this.logService.trace('UI State: Skipping synchronizing UI state as it is disabled.');
+			return false;
+		}
+
 		if (this.status !== SyncStatus.Idle) {
-			this.logService.trace('Global State: Skipping synchronizing global state as it is running already.');
+			this.logService.trace('UI State: Skipping synchronizing ui state as it is running already.');
 			return false;
 		}
 
-		this.logService.trace('Global State: Started synchronizing global state...');
+		this.logService.trace('UI State: Started synchronizing ui state...');
 		this.setStatus(SyncStatus.Syncing);
 
 		try {
 			await this.doSync();
-			this.logService.trace('Global State: Finised synchronizing global state.');
+			this.logService.trace('UI State: Finised synchronizing ui state.');
 			this.setStatus(SyncStatus.Idle);
 			return true;
 		} catch (e) {
 			this.setStatus(SyncStatus.Idle);
 			if (e instanceof UserDataSyncStoreError && e.code === UserDataSyncStoreErrorCode.Rejected) {
 				// Rejected as there is a new remote version. Syncing again,
-				this.logService.info('Global State: Failed to synchronise global state as there is a new remote version available. Synchronizing again...');
+				this.logService.info('UI State: Failed to synchronise ui state as there is a new remote version available. Synchronizing again...');
 				return this.sync();
 			}
 			throw e;
@@ -90,13 +97,13 @@ export class GlobalStateSynchroniser extends Disposable implements ISynchroniser
 
 		if (local) {
 			// update local
-			this.logService.info('Global State: Updating local global state...');
+			this.logService.info('UI State: Updating local ui state...');
 			await this.writeLocalGlobalState(local);
 		}
 
 		if (remote) {
 			// update remote
-			this.logService.info('Global State: Updating remote global state...');
+			this.logService.info('UI State: Updating remote ui state...');
 			remoteData = await this.writeToRemote(remote, remoteData.ref);
 		}
 
@@ -104,7 +111,7 @@ export class GlobalStateSynchroniser extends Disposable implements ISynchroniser
 			&& (!lastSyncData || lastSyncData.ref !== remoteData.ref)
 		) {
 			// update last sync
-			this.logService.info('Global State: Updating last synchronised global state...');
+			this.logService.info('UI State: Updating last synchronised ui state...');
 			await this.updateLastSyncValue(remoteData);
 		}
 	}

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

@@ -49,15 +49,21 @@ export function registerConfiguration(): IDisposable {
 				default: true,
 				scope: ConfigurationScope.APPLICATION,
 			},
-			'sync.enableExtensions': {
+			'sync.enableKeybindings': {
 				type: 'boolean',
-				description: localize('sync.enableExtensions', "Enable synchronizing extensions."),
+				description: localize('sync.enableKeybindings', "Enable synchronizing keybindings."),
 				default: true,
 				scope: ConfigurationScope.APPLICATION,
 			},
-			'sync.enableKeybindings': {
+			'sync.enableUIState': {
 				type: 'boolean',
-				description: localize('sync.enableKeybindings', "Enable synchronizing keybindings."),
+				description: localize('sync.enableUIState', "Enable synchronizing UI state."),
+				default: true,
+				scope: ConfigurationScope.APPLICATION,
+			},
+			'sync.enableExtensions': {
+				type: 'boolean',
+				description: localize('sync.enableExtensions', "Enable synchronizing extensions."),
 				default: true,
 				scope: ConfigurationScope.APPLICATION,
 			},

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

@@ -12,6 +12,7 @@ import { ExtensionsSynchroniser } from 'vs/platform/userDataSync/common/extensio
 import { IExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
 import { IAuthTokenService, AuthTokenStatus } from 'vs/platform/auth/common/auth';
 import { KeybindingsSynchroniser } from 'vs/platform/userDataSync/common/keybindingsSync';
+import { GlobalStateSynchroniser } from 'vs/platform/userDataSync/common/globalStateSync';
 
 export class UserDataSyncService extends Disposable implements IUserDataSyncService {
 
@@ -32,6 +33,7 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
 	private readonly settingsSynchroniser: SettingsSynchroniser;
 	private readonly keybindingsSynchroniser: KeybindingsSynchroniser;
 	private readonly extensionsSynchroniser: ExtensionsSynchroniser;
+	private readonly globalStateSynchroniser: GlobalStateSynchroniser;
 
 	constructor(
 		@IUserDataSyncStoreService private readonly userDataSyncStoreService: IUserDataSyncStoreService,
@@ -41,8 +43,9 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
 		super();
 		this.settingsSynchroniser = this._register(this.instantiationService.createInstance(SettingsSynchroniser));
 		this.keybindingsSynchroniser = this._register(this.instantiationService.createInstance(KeybindingsSynchroniser));
+		this.globalStateSynchroniser = this._register(this.instantiationService.createInstance(GlobalStateSynchroniser));
 		this.extensionsSynchroniser = this._register(this.instantiationService.createInstance(ExtensionsSynchroniser));
-		this.synchronisers = [this.settingsSynchroniser, this.keybindingsSynchroniser, this.extensionsSynchroniser];
+		this.synchronisers = [this.settingsSynchroniser, this.keybindingsSynchroniser, this.globalStateSynchroniser, this.extensionsSynchroniser];
 		this.updateStatus();
 
 		if (this.userDataSyncStoreService.userDataSyncStore) {

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

@@ -212,6 +212,9 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 			}, {
 				id: 'sync.enableKeybindings',
 				label: localize('user keybindings', "User Keybindings")
+			}, {
+				id: 'sync.enableUIState',
+				label: localize('ui state', "UI State")
 			}, {
 				id: 'sync.enableExtensions',
 				label: localize('extensions', "Extensions")