Skip to content

Commit 9c28bf7

Browse files
authored
do not initialise remote extensions if settings sync is not enabled (microsoft#184521)
1 parent 2538cc4 commit 9c28bf7

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity'
1717
import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
1818
import { AbstractExtensionsInitializer } from 'vs/platform/userDataSync/common/extensionsSync';
1919
import { IIgnoredExtensionsManagementService } from 'vs/platform/userDataSync/common/ignoredExtensions';
20-
import { IRemoteUserData, IUserDataSyncStoreManagementService, SyncResource } from 'vs/platform/userDataSync/common/userDataSync';
20+
import { IRemoteUserData, IUserDataSyncEnablementService, IUserDataSyncStoreManagementService, SyncResource } from 'vs/platform/userDataSync/common/userDataSync';
2121
import { UserDataSyncStoreClient } from 'vs/platform/userDataSync/common/userDataSyncStoreService';
2222
import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
2323
import { IAuthenticationService } from 'vs/workbench/services/authentication/common/authentication';
@@ -35,6 +35,7 @@ export class RemoteExtensionsInitializerContribution implements IWorkbenchContri
3535
@ILogService private readonly logService: ILogService,
3636
@IAuthenticationService private readonly authenticationService: IAuthenticationService,
3737
@IRemoteAuthorityResolverService private readonly remoteAuthorityResolverService: IRemoteAuthorityResolverService,
38+
@IUserDataSyncEnablementService private readonly userDataSyncEnablementService: IUserDataSyncEnablementService,
3839
) {
3940
this.initializeRemoteExtensions();
4041
}
@@ -67,6 +68,10 @@ export class RemoteExtensionsInitializerContribution implements IWorkbenchContri
6768
this.logService.trace(`Skipping initializing remote extensions because this workspace was opened before.`);
6869
return;
6970
}
71+
// Skip: Settings Sync is disabled
72+
if (!this.userDataSyncEnablementService.isEnabled()) {
73+
return;
74+
}
7075
// Skip: No account is provided to initialize
7176
const resolvedAuthority = await this.remoteAuthorityResolverService.resolveAuthority(connection.remoteAuthority);
7277
if (!resolvedAuthority.options?.authenticationSession) {

0 commit comments

Comments
 (0)