From 1c671676bfe6042a1e87213abbf94881d2a0116d Mon Sep 17 00:00:00 2001 From: Charles Gagnon Date: Thu, 11 Mar 2021 17:28:01 -0800 Subject: [PATCH] Disable auto sync service (#14677) * Disable auto sync service * skip tests --- src/vs/platform/userDataSync/common/userDataAutoSyncService.ts | 3 +++ .../userDataSync/test/common/userDataAutoSyncService.test.ts | 2 +- .../userDataSync/browser/userDataAutoSyncEnablementService.ts | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts b/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts index c92ce7f281..ca88b89b26 100644 --- a/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts +++ b/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts @@ -59,6 +59,7 @@ export class UserDataAutoSyncEnablementService extends Disposable implements _IU } isEnabled(defaultEnablement?: boolean): boolean { + /* {{SQL CARBON EDIT}} Disable unused sync service switch (this.environmentService.sync) { case 'on': return true; @@ -66,6 +67,8 @@ export class UserDataAutoSyncEnablementService extends Disposable implements _IU return false; default: return this.storageService.getBoolean(enablementKey, StorageScope.GLOBAL, !!defaultEnablement); // {{SQL CARBON EDIT}} strict-null-checks move this to a default case } + */ + return false; } canToggleEnablement(): boolean { diff --git a/src/vs/platform/userDataSync/test/common/userDataAutoSyncService.test.ts b/src/vs/platform/userDataSync/test/common/userDataAutoSyncService.test.ts index e553dbd761..1b60685662 100644 --- a/src/vs/platform/userDataSync/test/common/userDataAutoSyncService.test.ts +++ b/src/vs/platform/userDataSync/test/common/userDataAutoSyncService.test.ts @@ -24,7 +24,7 @@ class TestUserDataAutoSyncService extends UserDataAutoSyncService { } } -suite('UserDataAutoSyncService', () => { +suite.skip('UserDataAutoSyncService', () => { // {{SQL CARBON EDIT}} Service is disabled so turn off tests const disposableStore = new DisposableStore(); diff --git a/src/vs/workbench/services/userDataSync/browser/userDataAutoSyncEnablementService.ts b/src/vs/workbench/services/userDataSync/browser/userDataAutoSyncEnablementService.ts index 454e15598d..79f3a1c2de 100644 --- a/src/vs/workbench/services/userDataSync/browser/userDataAutoSyncEnablementService.ts +++ b/src/vs/workbench/services/userDataSync/browser/userDataAutoSyncEnablementService.ts @@ -12,6 +12,7 @@ export class WebUserDataAutoSyncEnablementService extends UserDataAutoSyncEnable private enabled: boolean | undefined = undefined; isEnabled(): boolean { + /* {{SQL CARBON EDIT}} Disable unused sync service if (this.enabled === undefined) { this.enabled = this.workbenchEnvironmentService.options?.settingsSyncOptions?.enabled; } @@ -19,6 +20,8 @@ export class WebUserDataAutoSyncEnablementService extends UserDataAutoSyncEnable this.enabled = super.isEnabled(this.workbenchEnvironmentService.options?.enableSyncByDefault); } return this.enabled; + */ + return false; } setEnablement(enabled: boolean) {