Skip to content

Commit 8440dcd

Browse files
sandy081sandy081
committed
rename to UserDataSyncResourceEnablementService
1 parent 5a98658 commit 8440dcd

17 files changed

Lines changed: 65 additions & 65 deletions

‎src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ import { IFileService } from 'vs/platform/files/common/files';
4949
import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
5050
import { Schemas } from 'vs/base/common/network';
5151
import { IProductService } from 'vs/platform/product/common/productService';
52-
import { IUserDataSyncService, IUserDataSyncStoreService, registerConfiguration, IUserDataSyncLogService, IUserDataSyncUtilService, IUserDataSyncEnablementService, IUserDataSyncBackupStoreService } from 'vs/platform/userDataSync/common/userDataSync';
52+
import { IUserDataSyncService, IUserDataSyncStoreService, registerConfiguration, IUserDataSyncLogService, IUserDataSyncUtilService, IUserDataSyncResourceEnablementService, IUserDataSyncBackupStoreService } from 'vs/platform/userDataSync/common/userDataSync';
5353
import { UserDataSyncService } from 'vs/platform/userDataSync/common/userDataSyncService';
5454
import { UserDataSyncStoreService } from 'vs/platform/userDataSync/common/userDataSyncStoreService';
5555
import { UserDataSyncChannel, UserDataSyncUtilServiceClient, UserDataAutoSyncChannel, StorageKeysSyncRegistryChannelClient, UserDataSyncMachinesServiceChannel, UserDataSyncAccountServiceChannel } from 'vs/platform/userDataSync/common/userDataSyncIpc';
@@ -63,7 +63,7 @@ import { NativeStorageService } from 'vs/platform/storage/node/storageService';
6363
import { GlobalStorageDatabaseChannelClient } from 'vs/platform/storage/node/storageIpc';
6464
import { IStorageService } from 'vs/platform/storage/common/storage';
6565
import { GlobalExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionEnablementService';
66-
import { UserDataSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSyncEnablementService';
66+
import { UserDataSyncResourceEnablementService } from 'vs/platform/userDataSync/common/userDataSyncResourceEnablementService';
6767
import { IUserDataSyncAccountService, UserDataSyncAccountService } from 'vs/platform/userDataSync/common/userDataSyncAccount';
6868
import { UserDataSyncBackupStoreService } from 'vs/platform/userDataSync/common/userDataSyncBackupStoreService';
6969
import { IStorageKeysSyncRegistryService } from 'vs/platform/userDataSync/common/storageKeys';
@@ -205,7 +205,7 @@ async function main(server: Server, initData: ISharedProcessInitData, configurat
205205
services.set(IUserDataSyncStoreService, new SyncDescriptor(UserDataSyncStoreService));
206206
services.set(IUserDataSyncMachinesService, new SyncDescriptor(UserDataSyncMachinesService));
207207
services.set(IUserDataSyncBackupStoreService, new SyncDescriptor(UserDataSyncBackupStoreService));
208-
services.set(IUserDataSyncEnablementService, new SyncDescriptor(UserDataSyncEnablementService));
208+
services.set(IUserDataSyncResourceEnablementService, new SyncDescriptor(UserDataSyncResourceEnablementService));
209209
services.set(IUserDataSyncService, new SyncDescriptor(UserDataSyncService));
210210
registerConfiguration();
211211

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { VSBuffer } from 'vs/base/common/buffer';
99
import { URI } from 'vs/base/common/uri';
1010
import {
1111
SyncResource, SyncStatus, IUserData, IUserDataSyncStoreService, UserDataSyncErrorCode, UserDataSyncError, IUserDataSyncLogService, IUserDataSyncUtilService,
12-
IUserDataSyncEnablementService, IUserDataSyncBackupStoreService, Conflict, ISyncResourceHandle, USER_DATA_SYNC_SCHEME, ISyncPreview, IUserDataManifest, ISyncData, IRemoteUserData
12+
IUserDataSyncResourceEnablementService, IUserDataSyncBackupStoreService, Conflict, ISyncResourceHandle, USER_DATA_SYNC_SCHEME, ISyncPreview, IUserDataManifest, ISyncData, IRemoteUserData
1313
} from 'vs/platform/userDataSync/common/userDataSync';
1414
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
1515
import { joinPath, dirname, isEqual, basename } from 'vs/base/common/resources';
@@ -85,7 +85,7 @@ export abstract class AbstractSynchroniser extends Disposable {
8585
@IStorageService storageService: IStorageService,
8686
@IUserDataSyncStoreService protected readonly userDataSyncStoreService: IUserDataSyncStoreService,
8787
@IUserDataSyncBackupStoreService protected readonly userDataSyncBackupStoreService: IUserDataSyncBackupStoreService,
88-
@IUserDataSyncEnablementService protected readonly userDataSyncEnablementService: IUserDataSyncEnablementService,
88+
@IUserDataSyncResourceEnablementService protected readonly userDataSyncResourceEnablementService: IUserDataSyncResourceEnablementService,
8989
@ITelemetryService protected readonly telemetryService: ITelemetryService,
9090
@IUserDataSyncLogService protected readonly logService: IUserDataSyncLogService,
9191
@IConfigurationService protected readonly configurationService: IConfigurationService,
@@ -97,7 +97,7 @@ export abstract class AbstractSynchroniser extends Disposable {
9797
this.currentMachineIdPromise = getServiceMachineId(environmentService, fileService, storageService);
9898
}
9999

100-
protected isEnabled(): boolean { return this.userDataSyncEnablementService.isResourceEnabled(this.resource); }
100+
protected isEnabled(): boolean { return this.userDataSyncResourceEnablementService.isResourceEnabled(this.resource); }
101101

102102
protected async triggerLocalChange(): Promise<void> {
103103
if (this.isEnabled()) {
@@ -551,12 +551,12 @@ export abstract class AbstractFileSynchroniser extends AbstractSynchroniser {
551551
@IStorageService storageService: IStorageService,
552552
@IUserDataSyncStoreService userDataSyncStoreService: IUserDataSyncStoreService,
553553
@IUserDataSyncBackupStoreService userDataSyncBackupStoreService: IUserDataSyncBackupStoreService,
554-
@IUserDataSyncEnablementService userDataSyncEnablementService: IUserDataSyncEnablementService,
554+
@IUserDataSyncResourceEnablementService userDataSyncResourceEnablementService: IUserDataSyncResourceEnablementService,
555555
@ITelemetryService telemetryService: ITelemetryService,
556556
@IUserDataSyncLogService logService: IUserDataSyncLogService,
557557
@IConfigurationService configurationService: IConfigurationService,
558558
) {
559-
super(resource, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncBackupStoreService, userDataSyncEnablementService, telemetryService, logService, configurationService);
559+
super(resource, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncBackupStoreService, userDataSyncResourceEnablementService, telemetryService, logService, configurationService);
560560
this._register(this.fileService.watch(dirname(file)));
561561
this._register(this.fileService.onDidFilesChange(e => this.onFileChanges(e)));
562562
}
@@ -631,13 +631,13 @@ export abstract class AbstractJsonFileSynchroniser extends AbstractFileSynchroni
631631
@IStorageService storageService: IStorageService,
632632
@IUserDataSyncStoreService userDataSyncStoreService: IUserDataSyncStoreService,
633633
@IUserDataSyncBackupStoreService userDataSyncBackupStoreService: IUserDataSyncBackupStoreService,
634-
@IUserDataSyncEnablementService userDataSyncEnablementService: IUserDataSyncEnablementService,
634+
@IUserDataSyncResourceEnablementService userDataSyncResourceEnablementService: IUserDataSyncResourceEnablementService,
635635
@ITelemetryService telemetryService: ITelemetryService,
636636
@IUserDataSyncLogService logService: IUserDataSyncLogService,
637637
@IUserDataSyncUtilService protected readonly userDataSyncUtilService: IUserDataSyncUtilService,
638638
@IConfigurationService configurationService: IConfigurationService,
639639
) {
640-
super(file, resource, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncBackupStoreService, userDataSyncEnablementService, telemetryService, logService, configurationService);
640+
super(file, resource, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncBackupStoreService, userDataSyncResourceEnablementService, telemetryService, logService, configurationService);
641641
}
642642

643643
protected hasErrors(content: string): boolean {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import {
7-
IUserDataSyncStoreService, ISyncExtension, IUserDataSyncLogService, IUserDataSynchroniser, SyncResource, IUserDataSyncEnablementService,
7+
IUserDataSyncStoreService, ISyncExtension, IUserDataSyncLogService, IUserDataSynchroniser, SyncResource, IUserDataSyncResourceEnablementService,
88
IUserDataSyncBackupStoreService, ISyncResourceHandle, ISyncPreview, USER_DATA_SYNC_SCHEME, IRemoteUserData, ISyncData
99
} from 'vs/platform/userDataSync/common/userDataSync';
1010
import { Event } from 'vs/base/common/event';
@@ -60,10 +60,10 @@ export class ExtensionsSynchroniser extends AbstractSynchroniser implements IUse
6060
@IUserDataSyncLogService logService: IUserDataSyncLogService,
6161
@IExtensionGalleryService private readonly extensionGalleryService: IExtensionGalleryService,
6262
@IConfigurationService configurationService: IConfigurationService,
63-
@IUserDataSyncEnablementService userDataSyncEnablementService: IUserDataSyncEnablementService,
63+
@IUserDataSyncResourceEnablementService userDataSyncResourceEnablementService: IUserDataSyncResourceEnablementService,
6464
@ITelemetryService telemetryService: ITelemetryService,
6565
) {
66-
super(SyncResource.Extensions, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncBackupStoreService, userDataSyncEnablementService, telemetryService, logService, configurationService);
66+
super(SyncResource.Extensions, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncBackupStoreService, userDataSyncResourceEnablementService, telemetryService, logService, configurationService);
6767
this._register(
6868
Event.debounce(
6969
Event.any<any>(

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import {
7-
IUserDataSyncStoreService, IUserDataSyncLogService, IGlobalState, SyncResource, IUserDataSynchroniser, IUserDataSyncEnablementService,
7+
IUserDataSyncStoreService, IUserDataSyncLogService, IGlobalState, SyncResource, IUserDataSynchroniser, IUserDataSyncResourceEnablementService,
88
IUserDataSyncBackupStoreService, ISyncResourceHandle, IStorageValue, ISyncPreview, USER_DATA_SYNC_SCHEME, IRemoteUserData, ISyncData
99
} from 'vs/platform/userDataSync/common/userDataSync';
1010
import { VSBuffer } from 'vs/base/common/buffer';
@@ -54,13 +54,13 @@ export class GlobalStateSynchroniser extends AbstractSynchroniser implements IUs
5454
@IUserDataSyncBackupStoreService userDataSyncBackupStoreService: IUserDataSyncBackupStoreService,
5555
@IUserDataSyncLogService logService: IUserDataSyncLogService,
5656
@IEnvironmentService private readonly environmentService: IEnvironmentService,
57-
@IUserDataSyncEnablementService userDataSyncEnablementService: IUserDataSyncEnablementService,
57+
@IUserDataSyncResourceEnablementService userDataSyncResourceEnablementService: IUserDataSyncResourceEnablementService,
5858
@ITelemetryService telemetryService: ITelemetryService,
5959
@IConfigurationService configurationService: IConfigurationService,
6060
@IStorageService private readonly storageService: IStorageService,
6161
@IStorageKeysSyncRegistryService private readonly storageKeysSyncRegistryService: IStorageKeysSyncRegistryService,
6262
) {
63-
super(SyncResource.GlobalState, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncBackupStoreService, userDataSyncEnablementService, telemetryService, logService, configurationService);
63+
super(SyncResource.GlobalState, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncBackupStoreService, userDataSyncResourceEnablementService, telemetryService, logService, configurationService);
6464
this._register(this.fileService.watch(dirname(this.environmentService.argvResource)));
6565
this._register(
6666
Event.any(

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { IFileService, FileOperationError, FileOperationResult } from 'vs/platform/files/common/files';
77
import {
88
UserDataSyncError, UserDataSyncErrorCode, IUserDataSyncStoreService, IUserDataSyncLogService, IUserDataSyncUtilService, SyncResource,
9-
IUserDataSynchroniser, IUserDataSyncEnablementService, IUserDataSyncBackupStoreService, USER_DATA_SYNC_SCHEME, PREVIEW_DIR_NAME, ISyncResourceHandle,
9+
IUserDataSynchroniser, IUserDataSyncResourceEnablementService, IUserDataSyncBackupStoreService, USER_DATA_SYNC_SCHEME, PREVIEW_DIR_NAME, ISyncResourceHandle,
1010
IRemoteUserData, ISyncData
1111
} from 'vs/platform/userDataSync/common/userDataSync';
1212
import { merge } from 'vs/platform/userDataSync/common/keybindingsMerge';
@@ -43,14 +43,14 @@ export class KeybindingsSynchroniser extends AbstractJsonFileSynchroniser implem
4343
@IUserDataSyncBackupStoreService userDataSyncBackupStoreService: IUserDataSyncBackupStoreService,
4444
@IUserDataSyncLogService logService: IUserDataSyncLogService,
4545
@IConfigurationService configurationService: IConfigurationService,
46-
@IUserDataSyncEnablementService userDataSyncEnablementService: IUserDataSyncEnablementService,
46+
@IUserDataSyncResourceEnablementService userDataSyncResourceEnablementService: IUserDataSyncResourceEnablementService,
4747
@IFileService fileService: IFileService,
4848
@IEnvironmentService environmentService: IEnvironmentService,
4949
@IStorageService storageService: IStorageService,
5050
@IUserDataSyncUtilService userDataSyncUtilService: IUserDataSyncUtilService,
5151
@ITelemetryService telemetryService: ITelemetryService,
5252
) {
53-
super(environmentService.keybindingsResource, SyncResource.Keybindings, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncBackupStoreService, userDataSyncEnablementService, telemetryService, logService, userDataSyncUtilService, configurationService);
53+
super(environmentService.keybindingsResource, SyncResource.Keybindings, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncBackupStoreService, userDataSyncResourceEnablementService, telemetryService, logService, userDataSyncUtilService, configurationService);
5454
}
5555

5656
protected async generatePullPreview(remoteUserData: IRemoteUserData, lastSyncUserData: IRemoteUserData | null, token: CancellationToken): Promise<IFileSyncPreview> {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { IFileService, FileOperationError, FileOperationResult } from 'vs/platform/files/common/files';
77
import {
88
UserDataSyncError, UserDataSyncErrorCode, IUserDataSyncStoreService, IUserDataSyncLogService, IUserDataSyncUtilService, CONFIGURATION_SYNC_STORE_KEY,
9-
SyncResource, IUserDataSyncEnablementService, IUserDataSyncBackupStoreService, USER_DATA_SYNC_SCHEME, PREVIEW_DIR_NAME, ISyncResourceHandle, IUserDataSynchroniser,
9+
SyncResource, IUserDataSyncResourceEnablementService, IUserDataSyncBackupStoreService, USER_DATA_SYNC_SCHEME, PREVIEW_DIR_NAME, ISyncResourceHandle, IUserDataSynchroniser,
1010
IRemoteUserData, ISyncData
1111
} from 'vs/platform/userDataSync/common/userDataSync';
1212
import { VSBuffer } from 'vs/base/common/buffer';
@@ -51,11 +51,11 @@ export class SettingsSynchroniser extends AbstractJsonFileSynchroniser implement
5151
@IUserDataSyncLogService logService: IUserDataSyncLogService,
5252
@IUserDataSyncUtilService userDataSyncUtilService: IUserDataSyncUtilService,
5353
@IConfigurationService configurationService: IConfigurationService,
54-
@IUserDataSyncEnablementService userDataSyncEnablementService: IUserDataSyncEnablementService,
54+
@IUserDataSyncResourceEnablementService userDataSyncResourceEnablementService: IUserDataSyncResourceEnablementService,
5555
@ITelemetryService telemetryService: ITelemetryService,
5656
@IExtensionManagementService private readonly extensionManagementService: IExtensionManagementService,
5757
) {
58-
super(environmentService.settingsResource, SyncResource.Settings, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncBackupStoreService, userDataSyncEnablementService, telemetryService, logService, userDataSyncUtilService, configurationService);
58+
super(environmentService.settingsResource, SyncResource.Settings, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncBackupStoreService, userDataSyncResourceEnablementService, telemetryService, logService, userDataSyncUtilService, configurationService);
5959
}
6060

6161
protected async generatePullPreview(remoteUserData: IRemoteUserData, lastSyncUserData: IRemoteUserData | null, token: CancellationToken): Promise<IFileSyncPreview> {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import {
7-
IUserDataSyncStoreService, IUserDataSyncLogService, IUserDataSynchroniser, SyncResource, IUserDataSyncEnablementService, IUserDataSyncBackupStoreService,
7+
IUserDataSyncStoreService, IUserDataSyncLogService, IUserDataSynchroniser, SyncResource, IUserDataSyncResourceEnablementService, IUserDataSyncBackupStoreService,
88
Conflict, USER_DATA_SYNC_SCHEME, PREVIEW_DIR_NAME, ISyncResourceHandle, IRemoteUserData, ISyncData, ISyncPreview
99
} from 'vs/platform/userDataSync/common/userDataSync';
1010
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
@@ -44,10 +44,10 @@ export class SnippetsSynchroniser extends AbstractSynchroniser implements IUserD
4444
@IUserDataSyncBackupStoreService userDataSyncBackupStoreService: IUserDataSyncBackupStoreService,
4545
@IUserDataSyncLogService logService: IUserDataSyncLogService,
4646
@IConfigurationService configurationService: IConfigurationService,
47-
@IUserDataSyncEnablementService userDataSyncEnablementService: IUserDataSyncEnablementService,
47+
@IUserDataSyncResourceEnablementService userDataSyncResourceEnablementService: IUserDataSyncResourceEnablementService,
4848
@ITelemetryService telemetryService: ITelemetryService,
4949
) {
50-
super(SyncResource.Snippets, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncBackupStoreService, userDataSyncEnablementService, telemetryService, logService, configurationService);
50+
super(SyncResource.Snippets, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncBackupStoreService, userDataSyncResourceEnablementService, telemetryService, logService, configurationService);
5151
this.snippetsFolder = environmentService.snippetsHome;
5252
this.snippetsPreviewFolder = joinPath(this.syncFolder, PREVIEW_DIR_NAME);
5353
this._register(this.fileService.watch(environmentService.userRoamingDataHome));

0 commit comments

Comments
 (0)