move settings sync options into single interface

sandy081 · sandy081 · commit 4ad1655304fa · 2020-09-22T08:57:57.000+02:00
diff --git a/src/vs/workbench/services/userDataSync/browser/userDataAutoSyncService.ts b/src/vs/workbench/services/userDataSync/browser/userDataAutoSyncService.ts
@@ -14,7 +14,7 @@ export class WebUserDataAutoSyncService extends UserDataAutoSyncService implemen
 
 	isEnabled(): boolean {
 		if (this.enabled === undefined) {
-			this.enabled = this.workbenchEnvironmentService.options?.enableSettingsSync;
+			this.enabled = this.workbenchEnvironmentService.options?.settingsSyncOptions?.enabled;
 		}
 		if (this.enabled === undefined) {
 			this.enabled = super.isEnabled(this.workbenchEnvironmentService.options?.enableSyncByDefault);
@@ -25,8 +25,8 @@ export class WebUserDataAutoSyncService extends UserDataAutoSyncService implemen
 	protected setEnablement(enabled: boolean) {
 		if (this.enabled !== enabled) {
 			this.enabled = enabled;
-			if (this.workbenchEnvironmentService.options?.settingsSyncEnablementHandler) {
-				this.workbenchEnvironmentService.options.settingsSyncEnablementHandler(this.enabled);
+			if (this.workbenchEnvironmentService.options?.settingsSyncOptions?.enablementHandler) {
+				this.workbenchEnvironmentService.options.settingsSyncOptions.enablementHandler(this.enabled);
 			}
 		}
 	}
diff --git a/src/vs/workbench/workbench.web.api.ts b/src/vs/workbench/workbench.web.api.ts
@@ -235,12 +235,19 @@ interface IProductQualityChangeHandler {
 	(newQuality: 'insider' | 'stable'): void;
 }
 
-interface ISettingsSyncEnablementHandler {
+/**
+ * Settings sync options
+ */
+interface ISettingsSyncOptions {
+	/**
+	 * Is settings sync enabled
+	 */
+	readonly enabled: boolean;
 
 	/**
 	 * Handler is being called when the user changes Settings Sync enablement.
 	 */
-	(enablement: boolean): void;
+	enablementHandler(enablement: boolean): void;
 }
 
 interface IWorkbenchConstructionOptions {
@@ -318,19 +325,14 @@ interface IWorkbenchConstructionOptions {
 	 *
 	 * Syncs with the current authenticated user account (provided in [credentialsProvider](#credentialsProvider)) by default.
 	 *
-	 * @deprecated Instead use [enableSettingsSync](#enableSettingsSync) to enable/disable settings sync in the workbench.
+	 * @deprecated Instead use [settingsSyncOptions](#settingsSyncOptions) to enable/disable settings sync in the workbench.
 	 */
 	readonly enableSyncByDefault?: boolean;
 
 	/**
-	 * Enable or disable the Settings Sync
-	 */
-	readonly enableSettingsSync?: boolean;
-
-	/**
-	 * Support for Settings Sync enablement change
+	 * Settings sync options
 	 */
-	readonly settingsSyncEnablementHandler?: ISettingsSyncEnablementHandler;
+	readonly settingsSyncOptions?: ISettingsSyncOptions;
 
 	/**
 	 * The credentials provider to store and retrieve secrets.

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ export class WebUserDataAutoSyncService extends UserDataAutoSyncService implemen`
`14`	`14`
`15`	`15`	`isEnabled(): boolean {`
`16`	`16`	`if (this.enabled === undefined) {`
`17`		`- this.enabled = this.workbenchEnvironmentService.options?.enableSettingsSync;`
	`17`	`+ this.enabled = this.workbenchEnvironmentService.options?.settingsSyncOptions?.enabled;`
`18`	`18`	`}`
`19`	`19`	`if (this.enabled === undefined) {`
`20`	`20`	`this.enabled = super.isEnabled(this.workbenchEnvironmentService.options?.enableSyncByDefault);`
`@@ -25,8 +25,8 @@ export class WebUserDataAutoSyncService extends UserDataAutoSyncService implemen`
`25`	`25`	`protected setEnablement(enabled: boolean) {`
`26`	`26`	`if (this.enabled !== enabled) {`
`27`	`27`	`this.enabled = enabled;`
`28`		`- if (this.workbenchEnvironmentService.options?.settingsSyncEnablementHandler) {`
`29`		`- this.workbenchEnvironmentService.options.settingsSyncEnablementHandler(this.enabled);`
	`28`	`+ if (this.workbenchEnvironmentService.options?.settingsSyncOptions?.enablementHandler) {`
	`29`	`+ this.workbenchEnvironmentService.options.settingsSyncOptions.enablementHandler(this.enabled);`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`	`}`