mirror of
https://github.com/microsoft/vscode.git
synced 2026-08-19 14:22:19 +01:00
refactor: rename userDataSyncProfilesStorageService to userDataProfileStorageService (#166397)
* refactor: rename userDataSyncProfilesStorageService to userDataProfileStorageService * rename * fix import
This commit is contained in:
@@ -80,8 +80,8 @@ import { UserDataSyncService } from 'vs/platform/userDataSync/common/userDataSyn
|
||||
import { UserDataSyncChannel } from 'vs/platform/userDataSync/common/userDataSyncServiceIpc';
|
||||
import { UserDataSyncStoreManagementService, UserDataSyncStoreService } from 'vs/platform/userDataSync/common/userDataSyncStoreService';
|
||||
import { UserDataAutoSyncService } from 'vs/platform/userDataSync/electron-sandbox/userDataAutoSyncService';
|
||||
import { UserDataSyncProfilesStorageService } from 'vs/platform/userDataSync/electron-sandbox/userDataSyncProfilesStorageService';
|
||||
import { IUserDataSyncProfilesStorageService } from 'vs/platform/userDataSync/common/userDataSyncProfilesStorageService';
|
||||
import { UserDataProfileStorageService } from 'vs/platform/userDataProfile/electron-sandbox/userDataProfileStorageService';
|
||||
import { IUserDataProfileStorageService } from 'vs/platform/userDataProfile/common/userDataProfileStorageService';
|
||||
import { ActiveWindowManager } from 'vs/platform/windows/node/windowTracker';
|
||||
import { ISignService } from 'vs/platform/sign/common/sign';
|
||||
import { SignService } from 'vs/platform/sign/node/signService';
|
||||
@@ -361,7 +361,7 @@ class SharedProcessMain extends Disposable {
|
||||
services.set(IUserDataSyncBackupStoreService, new SyncDescriptor(UserDataSyncBackupStoreService, undefined, false /* Eagerly cleans up old backups */));
|
||||
services.set(IUserDataSyncEnablementService, new SyncDescriptor(UserDataSyncEnablementService, undefined, true));
|
||||
services.set(IUserDataSyncService, new SyncDescriptor(UserDataSyncService, undefined, false /* Initializes the Sync State */));
|
||||
services.set(IUserDataSyncProfilesStorageService, new SyncDescriptor(UserDataSyncProfilesStorageService, undefined, true));
|
||||
services.set(IUserDataProfileStorageService, new SyncDescriptor(UserDataProfileStorageService, undefined, true));
|
||||
services.set(IUserDataSyncResourceProviderService, new SyncDescriptor(UserDataSyncResourceProviderService, undefined, true));
|
||||
|
||||
// Terminal
|
||||
|
||||
@@ -107,7 +107,7 @@ import { ExtensionsProfileScannerService, IExtensionsProfileScannerService } fro
|
||||
import { IExtensionsScannerService } from 'vs/platform/extensionManagement/common/extensionsScannerService';
|
||||
import { ExtensionsScannerService } from 'vs/platform/extensionManagement/node/extensionsScannerService';
|
||||
import { UserDataTransientProfilesHandler } from 'vs/platform/userDataProfile/electron-main/userDataTransientProfilesHandler';
|
||||
import { ProfileStorageChangesListenerChannel } from 'vs/platform/userDataSync/electron-main/userDataSyncProfilesStorageIpc';
|
||||
import { ProfileStorageChangesListenerChannel } from 'vs/platform/userDataProfile/electron-main/userDataProfileStorageIpc';
|
||||
import { Promises, RunOnceScheduler, runWhenIdle } from 'vs/base/common/async';
|
||||
|
||||
/**
|
||||
|
||||
+3
-3
@@ -25,8 +25,8 @@ export interface IStorageValue {
|
||||
readonly target: StorageTarget;
|
||||
}
|
||||
|
||||
export const IUserDataSyncProfilesStorageService = createDecorator<IUserDataSyncProfilesStorageService>('IUserDataSyncProfilesStorageService');
|
||||
export interface IUserDataSyncProfilesStorageService {
|
||||
export const IUserDataProfileStorageService = createDecorator<IUserDataProfileStorageService>('IUserDataProfileStorageService');
|
||||
export interface IUserDataProfileStorageService {
|
||||
readonly _serviceBrand: undefined;
|
||||
|
||||
/**
|
||||
@@ -54,7 +54,7 @@ export interface IUserDataSyncProfilesStorageService {
|
||||
withProfileScopedStorageService<T>(profile: IUserDataProfile, fn: (storageService: IStorageService) => Promise<T>): Promise<T>;
|
||||
}
|
||||
|
||||
export abstract class AbstractUserDataSyncProfilesStorageService extends Disposable implements IUserDataSyncProfilesStorageService {
|
||||
export abstract class AbstractUserDataProfileStorageService extends Disposable implements IUserDataProfileStorageService {
|
||||
|
||||
_serviceBrand: undefined;
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ import { Emitter, Event } from 'vs/base/common/event';
|
||||
import { Disposable, DisposableStore, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
|
||||
import { IServerChannel } from 'vs/base/parts/ipc/common/ipc';
|
||||
import { ILogService } from 'vs/platform/log/common/log';
|
||||
import { IProfileStorageChanges, IProfileStorageValueChanges } from 'vs/platform/userDataSync/common/userDataSyncProfilesStorageService';
|
||||
import { IProfileStorageChanges, IProfileStorageValueChanges } from 'vs/platform/userDataProfile/common/userDataProfileStorageService';
|
||||
import { loadKeyTargets, StorageScope, TARGET_KEY } from 'vs/platform/storage/common/storage';
|
||||
import { IBaseSerializableStorageRequest } from 'vs/platform/storage/common/storageIpc';
|
||||
import { IStorageMain } from 'vs/platform/storage/electron-main/storageMain';
|
||||
+2
-2
@@ -8,12 +8,12 @@ import { MutableDisposable } from 'vs/base/common/lifecycle';
|
||||
import { IStorageDatabase } from 'vs/base/parts/storage/common/storage';
|
||||
import { IMainProcessService } from 'vs/platform/ipc/electron-sandbox/services';
|
||||
import { ILogService } from 'vs/platform/log/common/log';
|
||||
import { AbstractUserDataSyncProfilesStorageService, IProfileStorageChanges, IUserDataSyncProfilesStorageService } from 'vs/platform/userDataSync/common/userDataSyncProfilesStorageService';
|
||||
import { AbstractUserDataProfileStorageService, IProfileStorageChanges, IUserDataProfileStorageService } from 'vs/platform/userDataProfile/common/userDataProfileStorageService';
|
||||
import { isProfileUsingDefaultStorage, IStorageService } from 'vs/platform/storage/common/storage';
|
||||
import { ApplicationStorageDatabaseClient, ProfileStorageDatabaseClient } from 'vs/platform/storage/common/storageIpc';
|
||||
import { IUserDataProfile, IUserDataProfilesService, reviveProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
|
||||
|
||||
export class UserDataSyncProfilesStorageService extends AbstractUserDataSyncProfilesStorageService implements IUserDataSyncProfilesStorageService {
|
||||
export class UserDataProfileStorageService extends AbstractUserDataProfileStorageService implements IUserDataProfileStorageService {
|
||||
|
||||
private readonly _onDidChange: Emitter<IProfileStorageChanges>;
|
||||
readonly onDidChange: Event<IProfileStorageChanges>;
|
||||
+4
-4
@@ -8,7 +8,7 @@ import { Emitter, Event } from 'vs/base/common/event';
|
||||
import { DisposableStore } from 'vs/base/common/lifecycle';
|
||||
import { URI } from 'vs/base/common/uri';
|
||||
import { InMemoryStorageDatabase, IStorageItemsChangeEvent, IUpdateRequest, Storage } from 'vs/base/parts/storage/common/storage';
|
||||
import { AbstractUserDataSyncProfilesStorageService, IUserDataSyncProfilesStorageService } from 'vs/platform/userDataSync/common/userDataSyncProfilesStorageService';
|
||||
import { AbstractUserDataProfileStorageService, IUserDataProfileStorageService } from 'vs/platform/userDataProfile/common/userDataProfileStorageService';
|
||||
import { InMemoryStorageService, loadKeyTargets, StorageTarget, TARGET_KEY } from 'vs/platform/storage/common/storage';
|
||||
import { IUserDataProfile, toUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
|
||||
import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
|
||||
@@ -26,7 +26,7 @@ class TestStorageDatabase extends InMemoryStorageDatabase {
|
||||
}
|
||||
}
|
||||
|
||||
export class TestUserDataSyncProfilesStorageService extends AbstractUserDataSyncProfilesStorageService implements IUserDataSyncProfilesStorageService {
|
||||
export class TestUserDataProfileStorageService extends AbstractUserDataProfileStorageService implements IUserDataProfileStorageService {
|
||||
|
||||
readonly onDidChange = Event.None;
|
||||
private databases = new Map<string, InMemoryStorageDatabase>();
|
||||
@@ -46,11 +46,11 @@ suite('ProfileStorageService', () => {
|
||||
|
||||
const disposables = new DisposableStore();
|
||||
const profile = toUserDataProfile('test', 'test', URI.file('foo'));
|
||||
let testObject: TestUserDataSyncProfilesStorageService;
|
||||
let testObject: TestUserDataProfileStorageService;
|
||||
let storage: Storage;
|
||||
|
||||
setup(async () => {
|
||||
testObject = disposables.add(new TestUserDataSyncProfilesStorageService(new InMemoryStorageService()));
|
||||
testObject = disposables.add(new TestUserDataProfileStorageService(new InMemoryStorageService()));
|
||||
storage = new Storage(await testObject.createStorageDatabase(profile));
|
||||
await storage.init();
|
||||
});
|
||||
@@ -31,7 +31,7 @@ import { AbstractInitializer, AbstractSynchroniser, getSyncResourceLogLabel, IAc
|
||||
import { IMergeResult as IExtensionMergeResult, merge } from 'vs/platform/userDataSync/common/extensionsMerge';
|
||||
import { IIgnoredExtensionsManagementService } from 'vs/platform/userDataSync/common/ignoredExtensions';
|
||||
import { Change, IRemoteUserData, ISyncData, ISyncExtension, ISyncExtensionWithVersion, IUserDataSyncBackupStoreService, IUserDataSynchroniser, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncStoreService, SyncResource, USER_DATA_SYNC_SCHEME } from 'vs/platform/userDataSync/common/userDataSync';
|
||||
import { IUserDataSyncProfilesStorageService } from 'vs/platform/userDataSync/common/userDataSyncProfilesStorageService';
|
||||
import { IUserDataProfileStorageService } from 'vs/platform/userDataProfile/common/userDataProfileStorageService';
|
||||
|
||||
type IExtensionResourceMergeResult = IAcceptResult & IExtensionMergeResult;
|
||||
|
||||
@@ -128,7 +128,7 @@ export class ExtensionsSynchroniser extends AbstractSynchroniser implements IUse
|
||||
@ITelemetryService telemetryService: ITelemetryService,
|
||||
@IExtensionStorageService extensionStorageService: IExtensionStorageService,
|
||||
@IUriIdentityService uriIdentityService: IUriIdentityService,
|
||||
@IUserDataSyncProfilesStorageService userDataSyncProfilesStorageService: IUserDataSyncProfilesStorageService,
|
||||
@IUserDataProfileStorageService userDataProfileStorageService: IUserDataProfileStorageService,
|
||||
@IInstantiationService private readonly instantiationService: IInstantiationService,
|
||||
) {
|
||||
super({ syncResource: SyncResource.Extensions, profile }, collection, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncBackupStoreService, userDataSyncEnablementService, telemetryService, logService, configurationService, uriIdentityService);
|
||||
@@ -137,7 +137,7 @@ export class ExtensionsSynchroniser extends AbstractSynchroniser implements IUse
|
||||
Event.any<any>(
|
||||
Event.filter(this.extensionManagementService.onDidInstallExtensions, (e => e.some(({ local }) => !!local))),
|
||||
Event.filter(this.extensionManagementService.onDidUninstallExtension, (e => !e.error)),
|
||||
Event.filter(userDataSyncProfilesStorageService.onDidChange, e => e.valueChanges.some(({ profile, changes }) => this.syncResource.profile.id === profile.id && changes.some(change => change.key === DISABLED_EXTENSIONS_STORAGE_PATH))),
|
||||
Event.filter(userDataProfileStorageService.onDidChange, e => e.valueChanges.some(({ profile, changes }) => this.syncResource.profile.id === profile.id && changes.some(change => change.key === DISABLED_EXTENSIONS_STORAGE_PATH))),
|
||||
extensionStorageService.onDidChangeExtensionStorageToSync)(() => this.triggerLocalChange()));
|
||||
}
|
||||
|
||||
@@ -341,7 +341,7 @@ export class LocalExtensionsProvider {
|
||||
|
||||
constructor(
|
||||
@IExtensionManagementService private readonly extensionManagementService: IExtensionManagementService,
|
||||
@IUserDataSyncProfilesStorageService private readonly userDataSyncProfilesStorageService: IUserDataSyncProfilesStorageService,
|
||||
@IUserDataProfileStorageService private readonly userDataProfileStorageService: IUserDataProfileStorageService,
|
||||
@IExtensionGalleryService private readonly extensionGalleryService: IExtensionGalleryService,
|
||||
@IIgnoredExtensionsManagementService private readonly ignoredExtensionsManagementService: IIgnoredExtensionsManagementService,
|
||||
@IInstantiationService private readonly instantiationService: IInstantiationService,
|
||||
@@ -510,7 +510,7 @@ export class LocalExtensionsProvider {
|
||||
}
|
||||
|
||||
private async withProfileScopedServices<T>(profile: IUserDataProfile, fn: (extensionEnablementService: IGlobalExtensionEnablementService, extensionStorageService: IExtensionStorageService) => Promise<T>): Promise<T> {
|
||||
return this.userDataSyncProfilesStorageService.withProfileScopedStorageService(profile,
|
||||
return this.userDataProfileStorageService.withProfileScopedStorageService(profile,
|
||||
async storageService => {
|
||||
const disposables = new DisposableStore();
|
||||
const instantiationService = this.instantiationService.createChild(new ServiceCollection([IStorageService, storageService]));
|
||||
|
||||
@@ -28,7 +28,7 @@ import { merge } from 'vs/platform/userDataSync/common/globalStateMerge';
|
||||
import { ALL_SYNC_RESOURCES, Change, createSyncHeaders, getEnablementKey, IGlobalState, IRemoteUserData, IStorageValue, ISyncData, IUserData, IUserDataSyncBackupStoreService, IUserDataSynchroniser, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncStoreService, SyncResource, SYNC_SERVICE_URL_TYPE, UserDataSyncError, UserDataSyncErrorCode, UserDataSyncStoreType, USER_DATA_SYNC_SCHEME } from 'vs/platform/userDataSync/common/userDataSync';
|
||||
import { UserDataSyncStoreClient } from 'vs/platform/userDataSync/common/userDataSyncStoreService';
|
||||
import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
|
||||
import { IUserDataSyncProfilesStorageService } from 'vs/platform/userDataSync/common/userDataSyncProfilesStorageService';
|
||||
import { IUserDataProfileStorageService } from 'vs/platform/userDataProfile/common/userDataProfileStorageService';
|
||||
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
||||
|
||||
const argvStoragePrefx = 'globalState.argv.';
|
||||
@@ -80,7 +80,7 @@ export class GlobalStateSynchroniser extends AbstractSynchroniser implements IUs
|
||||
constructor(
|
||||
profile: IUserDataProfile,
|
||||
collection: string | undefined,
|
||||
@IUserDataSyncProfilesStorageService private readonly userDataSyncProfilesStorageService: IUserDataSyncProfilesStorageService,
|
||||
@IUserDataProfileStorageService private readonly userDataProfileStorageService: IUserDataProfileStorageService,
|
||||
@IFileService fileService: IFileService,
|
||||
@IUserDataSyncStoreService userDataSyncStoreService: IUserDataSyncStoreService,
|
||||
@IUserDataSyncBackupStoreService userDataSyncBackupStoreService: IUserDataSyncBackupStoreService,
|
||||
@@ -100,7 +100,7 @@ export class GlobalStateSynchroniser extends AbstractSynchroniser implements IUs
|
||||
Event.any(
|
||||
/* Locale change */
|
||||
Event.filter(fileService.onDidFilesChange, e => e.contains(this.environmentService.argvResource)),
|
||||
Event.filter(userDataSyncProfilesStorageService.onDidChange, e => {
|
||||
Event.filter(userDataProfileStorageService.onDidChange, e => {
|
||||
/* StorageTarget has changed in profile storage */
|
||||
if (e.targetChanges.some(profile => this.syncResource.profile.id === profile.id)) {
|
||||
return true;
|
||||
@@ -282,7 +282,7 @@ export class GlobalStateSynchroniser extends AbstractSynchroniser implements IUs
|
||||
}
|
||||
|
||||
private async getStorageKeys(lastSyncGlobalState: IGlobalState | null): Promise<StorageKeys> {
|
||||
const storageData = await this.userDataSyncProfilesStorageService.readStorageData(this.syncResource.profile);
|
||||
const storageData = await this.userDataProfileStorageService.readStorageData(this.syncResource.profile);
|
||||
const user: string[] = [], machine: string[] = [];
|
||||
for (const [key, value] of storageData) {
|
||||
if (value.target === StorageTarget.USER) {
|
||||
@@ -309,7 +309,7 @@ export class LocalGlobalStateProvider {
|
||||
constructor(
|
||||
@IFileService private readonly fileService: IFileService,
|
||||
@IEnvironmentService private readonly environmentService: IEnvironmentService,
|
||||
@IUserDataSyncProfilesStorageService private readonly userDataSyncProfilesStorageService: IUserDataSyncProfilesStorageService,
|
||||
@IUserDataProfileStorageService private readonly userDataProfileStorageService: IUserDataProfileStorageService,
|
||||
@IUserDataSyncLogService private readonly logService: IUserDataSyncLogService
|
||||
) { }
|
||||
|
||||
@@ -324,7 +324,7 @@ export class LocalGlobalStateProvider {
|
||||
}
|
||||
}
|
||||
}
|
||||
const storageData = await this.userDataSyncProfilesStorageService.readStorageData(profile);
|
||||
const storageData = await this.userDataProfileStorageService.readStorageData(profile);
|
||||
for (const [key, value] of storageData) {
|
||||
if (value.value && value.target === StorageTarget.USER) {
|
||||
storage[key] = { version: 1, value: value.value };
|
||||
@@ -349,7 +349,7 @@ export class LocalGlobalStateProvider {
|
||||
const syncResourceLogLabel = getSyncResourceLogLabel(SyncResource.GlobalState, profile);
|
||||
const argv: IStringDictionary<any> = {};
|
||||
const updatedStorage = new Map<string, string | undefined>();
|
||||
const storageData = await this.userDataSyncProfilesStorageService.readStorageData(profile);
|
||||
const storageData = await this.userDataProfileStorageService.readStorageData(profile);
|
||||
const handleUpdatedStorage = (keys: string[], storage?: IStringDictionary<IStorageValue>): void => {
|
||||
for (const key of keys) {
|
||||
if (key.startsWith(argvStoragePrefx)) {
|
||||
@@ -389,7 +389,7 @@ export class LocalGlobalStateProvider {
|
||||
|
||||
if (updatedStorage.size) {
|
||||
this.logService.trace(`${syncResourceLogLabel}: Updating global state...`);
|
||||
await this.userDataSyncProfilesStorageService.updateStorageData(profile, updatedStorage, StorageTarget.USER);
|
||||
await this.userDataProfileStorageService.updateStorageData(profile, updatedStorage, StorageTarget.USER);
|
||||
this.logService.info(`${syncResourceLogLabel}: Updated global state`, [...updatedStorage.keys()]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storag
|
||||
import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
|
||||
import { GlobalStateSynchroniser } from 'vs/platform/userDataSync/common/globalStateSync';
|
||||
import { IGlobalState, ISyncData, IUserDataSyncStoreService, SyncResource, SyncStatus } from 'vs/platform/userDataSync/common/userDataSync';
|
||||
import { IUserDataSyncProfilesStorageService } from 'vs/platform/userDataSync/common/userDataSyncProfilesStorageService';
|
||||
import { IUserDataProfileStorageService } from 'vs/platform/userDataProfile/common/userDataProfileStorageService';
|
||||
import { UserDataSyncClient, UserDataSyncTestServer } from 'vs/platform/userDataSync/test/common/userDataSyncClient';
|
||||
|
||||
|
||||
@@ -214,7 +214,7 @@ suite('GlobalStateSync', () => {
|
||||
await testClient.sync();
|
||||
|
||||
const syncedProfile = testClient.instantiationService.get(IUserDataProfilesService).profiles.find(p => p.id === profile.id)!;
|
||||
const profileStorage = await testClient.instantiationService.get(IUserDataSyncProfilesStorageService).readStorageData(syncedProfile);
|
||||
const profileStorage = await testClient.instantiationService.get(IUserDataProfileStorageService).readStorageData(syncedProfile);
|
||||
assert.strictEqual(profileStorage.get('a')?.value, 'value1');
|
||||
assert.strictEqual(await readLocale(testClient), 'en');
|
||||
|
||||
@@ -241,7 +241,7 @@ suite('GlobalStateSync', () => {
|
||||
}
|
||||
|
||||
async function updateUserStorageForProfile(key: string, value: string, profile: IUserDataProfile, client: UserDataSyncClient): Promise<void> {
|
||||
const storageService = client.instantiationService.get(IUserDataSyncProfilesStorageService);
|
||||
const storageService = client.instantiationService.get(IUserDataProfileStorageService);
|
||||
const data = new Map<string, string>();
|
||||
data.set(key, value);
|
||||
await storageService.updateStorageData(profile, data, StorageTarget.USER);
|
||||
|
||||
@@ -43,8 +43,8 @@ import { UserDataSyncService } from 'vs/platform/userDataSync/common/userDataSyn
|
||||
import { UserDataSyncStoreManagementService, UserDataSyncStoreService } from 'vs/platform/userDataSync/common/userDataSyncStoreService';
|
||||
import { InMemoryUserDataProfilesService, IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
|
||||
import { NullPolicyService } from 'vs/platform/policy/common/policy';
|
||||
import { IUserDataSyncProfilesStorageService } from 'vs/platform/userDataSync/common/userDataSyncProfilesStorageService';
|
||||
import { TestUserDataSyncProfilesStorageService } from 'vs/platform/userDataSync/test/common/userDataSyncProfilesStorageService.test';
|
||||
import { IUserDataProfileStorageService } from 'vs/platform/userDataProfile/common/userDataProfileStorageService';
|
||||
import { TestUserDataProfileStorageService } from 'vs/platform/userDataProfile/test/common/userDataProfileStorageService.test';
|
||||
|
||||
export class UserDataSyncClient extends Disposable {
|
||||
|
||||
@@ -94,7 +94,7 @@ export class UserDataSyncClient extends Disposable {
|
||||
|
||||
const storageService = new TestStorageService(userDataProfilesService.defaultProfile);
|
||||
this.instantiationService.stub(IStorageService, this._register(storageService));
|
||||
this.instantiationService.stub(IUserDataSyncProfilesStorageService, this._register(new TestUserDataSyncProfilesStorageService(storageService)));
|
||||
this.instantiationService.stub(IUserDataProfileStorageService, this._register(new TestUserDataProfileStorageService(storageService)));
|
||||
|
||||
const configurationService = this._register(new ConfigurationService(userDataProfilesService.defaultProfile.settingsResource, fileService, new NullPolicyService(), logService));
|
||||
await configurationService.initialize();
|
||||
|
||||
+3
-3
@@ -7,13 +7,13 @@ import { Emitter, Event } from 'vs/base/common/event';
|
||||
import { IStorageDatabase } from 'vs/base/parts/storage/common/storage';
|
||||
import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
|
||||
import { ILogService } from 'vs/platform/log/common/log';
|
||||
import { AbstractUserDataSyncProfilesStorageService, IProfileStorageChanges, IUserDataSyncProfilesStorageService } from 'vs/platform/userDataSync/common/userDataSyncProfilesStorageService';
|
||||
import { AbstractUserDataProfileStorageService, IProfileStorageChanges, IUserDataProfileStorageService } from 'vs/platform/userDataProfile/common/userDataProfileStorageService';
|
||||
import { isProfileUsingDefaultStorage, IStorageService, IStorageValueChangeEvent, StorageScope } from 'vs/platform/storage/common/storage';
|
||||
import { IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
|
||||
import { IndexedDBStorageDatabase } from 'vs/workbench/services/storage/browser/storageService';
|
||||
import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
|
||||
|
||||
export class UserDataSyncProfilesStorageService extends AbstractUserDataSyncProfilesStorageService implements IUserDataSyncProfilesStorageService {
|
||||
export class UserDataProfileStorageService extends AbstractUserDataProfileStorageService implements IUserDataProfileStorageService {
|
||||
|
||||
private readonly _onDidChange = this._register(new Emitter<IProfileStorageChanges>());
|
||||
readonly onDidChange: Event<IProfileStorageChanges> = this._onDidChange.event;
|
||||
@@ -45,4 +45,4 @@ export class UserDataSyncProfilesStorageService extends AbstractUserDataSyncProf
|
||||
}
|
||||
}
|
||||
|
||||
registerSingleton(IUserDataSyncProfilesStorageService, UserDataSyncProfilesStorageService, InstantiationType.Delayed);
|
||||
registerSingleton(IUserDataProfileStorageService, UserDataProfileStorageService, InstantiationType.Delayed);
|
||||
@@ -61,7 +61,7 @@ import 'vs/workbench/services/tunnel/browser/tunnelService';
|
||||
import 'vs/workbench/services/files/browser/elevatedFileService';
|
||||
import 'vs/workbench/services/workingCopy/browser/workingCopyHistoryService';
|
||||
import 'vs/workbench/services/userDataSync/browser/webUserDataSyncEnablementService';
|
||||
import 'vs/workbench/services/userDataSync/browser/userDataSyncProfilesStorageService';
|
||||
import 'vs/workbench/services/userDataProfile/browser/userDataProfileStorageService';
|
||||
import 'vs/workbench/services/configurationResolver/browser/configurationResolverService';
|
||||
import 'vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user