move IUserDataProfileService to workbench (microsoft#152427)

Author: sandy081

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

@@ -100,12 +100,11 @@ import { InspectProfilingService as V8InspectProfilingService } from 'vs/platfor
 import { IV8InspectProfilingService } from 'vs/platform/profiling/common/profiling';
 import { IExtensionsScannerService } from 'vs/platform/extensionManagement/common/extensionsScannerService';
 import { ExtensionsScannerService } from 'vs/platform/extensionManagement/node/extensionsScannerService';
-import { IUserDataProfileService, IUserDataProfilesService, UserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { IUserDataProfilesService, UserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
 import { ExtensionsProfileScannerService, IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
 import { PolicyChannelClient } from 'vs/platform/policy/common/policyIpc';
 import { IPolicyService, NullPolicyService } from 'vs/platform/policy/common/policy';
 import { OneDataSystemAppender } from 'vs/platform/telemetry/node/1dsAppender';
-import { UserDataProfileService } from 'vs/platform/userDataProfile/common/userDataProfileService';
 // import { OneDataSystemAppender } from 'vs/platform/telemetry/node/1dsAppender';
 
 class SharedProcessMain extends Disposable {
@@ -236,15 +235,12 @@ class SharedProcessMain extends Disposable {
 		const userDataProfilesService = this._register(new UserDataProfilesService(this.configuration.defaultProfile, environmentService, fileService, logService));
 		services.set(IUserDataProfilesService, userDataProfilesService);
 
-		const userDataProfileService = this._register(new UserDataProfileService(userDataProfilesService.defaultProfile, userDataProfilesService.defaultProfile));
-		services.set(IUserDataProfileService, userDataProfileService);
-
 		// Configuration
 		const configurationService = this._register(new ConfigurationService(userDataProfilesService.defaultProfile.settingsResource, fileService, policyService, logService));
 		services.set(IConfigurationService, configurationService);
 
 		// Storage (global access only)
-		const storageService = new NativeStorageService(undefined, mainProcessService, userDataProfileService, environmentService);
+		const storageService = new NativeStorageService(undefined, { defaultProfile: userDataProfilesService.defaultProfile, currentProfile: userDataProfilesService.defaultProfile }, mainProcessService, environmentService);
 		services.set(IStorageService, storageService);
 		this._register(toDisposable(() => storageService.flush()));
 

src/vs/platform/storage/browser/storageService.ts

@@ -13,7 +13,7 @@ import { assertIsDefined } from 'vs/base/common/types';
 import { InMemoryStorageDatabase, isStorageItemsChangeEvent, IStorage, IStorageDatabase, IStorageItemsChangeEvent, IUpdateRequest, Storage } from 'vs/base/parts/storage/common/storage';
 import { ILogService } from 'vs/platform/log/common/log';
 import { AbstractStorageService, IS_NEW_KEY, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IUserDataProfile, IUserDataProfileService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
 import { IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
 
 export class BrowserStorageService extends AbstractStorageService {
@@ -42,12 +42,12 @@ export class BrowserStorageService extends AbstractStorageService {
 
 	constructor(
 		private readonly payload: IAnyWorkspaceIdentifier,
+		currentProfile: IUserDataProfile,
 		@ILogService private readonly logService: ILogService,
-		@IUserDataProfileService userDataProfileService: IUserDataProfileService
 	) {
 		super({ flushInterval: BrowserStorageService.BROWSER_DEFAULT_FLUSH_INTERVAL });
 
-		this.globalStorageProfile = userDataProfileService.currentProfile;
+		this.globalStorageProfile = currentProfile;
 	}
 
 	private getId(scope: StorageScope): string {

src/vs/platform/storage/electron-sandbox/storageService.ts

@@ -11,7 +11,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 import { IMainProcessService } from 'vs/platform/ipc/electron-sandbox/services';
 import { AbstractStorageService, StorageScope, WillSaveStateReason } from 'vs/platform/storage/common/storage';
 import { ApplicationStorageDatabaseClient, GlobalStorageDatabaseClient, WorkspaceStorageDatabaseClient } from 'vs/platform/storage/common/storageIpc';
-import { IUserDataProfile, IUserDataProfileService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
 import { IAnyWorkspaceIdentifier, IEmptyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
 
 export class NativeStorageService extends AbstractStorageService {
@@ -29,16 +29,16 @@ export class NativeStorageService extends AbstractStorageService {
 
 	constructor(
 		workspace: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IEmptyWorkspaceIdentifier | undefined,
+		{ defaultProfile, currentProfile }: { defaultProfile: IUserDataProfile; currentProfile: IUserDataProfile },
 		private readonly mainProcessService: IMainProcessService,
-		userDataProfileService: IUserDataProfileService,
 		private readonly environmentService: IEnvironmentService
 	) {
 		super();
 
-		this.applicationStorageProfile = userDataProfileService.defaultProfile;
+		this.applicationStorageProfile = defaultProfile;
 
 		this.applicationStorage = this.createApplicationStorage();
-		this.globalStorage = this.createGlobalStorage(userDataProfileService.currentProfile);
+		this.globalStorage = this.createGlobalStorage(currentProfile);
 		this.workspaceStorage = this.createWorkspaceStorage(workspace);
 	}
 

src/vs/platform/storage/test/browser/storageService.test.ts

@@ -18,7 +18,6 @@ import { BrowserStorageService, IndexedDBStorageDatabase } from 'vs/platform/sto
 import { StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { createSuite } from 'vs/platform/storage/test/common/storageService.test';
 import { IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { UserDataProfileService } from 'vs/platform/userDataProfile/common/userDataProfileService';
 
 async function createStorageService(): Promise<[DisposableStore, BrowserStorageService]> {
 	const disposables = new DisposableStore();
@@ -31,20 +30,6 @@ async function createStorageService(): Promise<[DisposableStore, BrowserStorageS
 
 	const profilesRoot = URI.file('/profiles').with({ scheme: Schemas.inMemory });
 
-	const inMemoryDefaultProfileRoot = joinPath(profilesRoot, 'default');
-	const inMemoryDefaultProfile: IUserDataProfile = {
-		id: 'id',
-		name: 'inMemory',
-		isDefault: true,
-		location: inMemoryDefaultProfileRoot,
-		globalStorageHome: joinPath(inMemoryDefaultProfileRoot, 'globalStorageHome'),
-		settingsResource: joinPath(inMemoryDefaultProfileRoot, 'settingsResource'),
-		keybindingsResource: joinPath(inMemoryDefaultProfileRoot, 'keybindingsResource'),
-		tasksResource: joinPath(inMemoryDefaultProfileRoot, 'tasksResource'),
-		snippetsHome: joinPath(inMemoryDefaultProfileRoot, 'snippetsHome'),
-		extensionsResource: joinPath(inMemoryDefaultProfileRoot, 'extensionsResource')
-	};
-
 	const inMemoryExtraProfileRoot = joinPath(profilesRoot, 'extra');
 	const inMemoryExtraProfile: IUserDataProfile = {
 		id: 'id',
@@ -59,9 +44,7 @@ async function createStorageService(): Promise<[DisposableStore, BrowserStorageS
 		extensionsResource: joinPath(inMemoryExtraProfileRoot, 'extensionsResource')
 	};
 
-	const userDataProfileService = new UserDataProfileService(inMemoryDefaultProfile, inMemoryExtraProfile);
-
-	const storageService = disposables.add(new BrowserStorageService({ id: 'workspace-storage-test' }, logService, userDataProfileService));
+	const storageService = disposables.add(new BrowserStorageService({ id: 'workspace-storage-test' }, inMemoryExtraProfile, logService));
 
 	await storageService.initialize();
 

src/vs/platform/userDataProfile/common/userDataProfile.ts

@@ -47,15 +47,6 @@ export interface IUserDataProfile {
 	readonly extensionsResource: URI | undefined;
 }
 
-export const IUserDataProfileService = createDecorator<IUserDataProfileService>('IUserDataProfileService');
-export interface IUserDataProfileService {
-	readonly _serviceBrand: undefined;
-	readonly defaultProfile: IUserDataProfile;
-	readonly onDidChangeCurrentProfile: Event<IUserDataProfile>;
-	readonly currentProfile: IUserDataProfile;
-	updateCurrentProfile(currentProfile: IUserDataProfile): void;
-}
-
 export function isUserDataProfile(thing: unknown): thing is IUserDataProfile {
 	const candidate = thing as IUserDataProfile | undefined;
 

src/vs/workbench/browser/web.main.ts

@@ -73,12 +73,13 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IProgressService } from 'vs/platform/progress/common/progress';
 import { DelayedLogChannel } from 'vs/workbench/services/output/common/delayedLogChannel';
 import { dirname, joinPath } from 'vs/base/common/resources';
-import { IUserDataProfileService, IUserDataProfilesService, UserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { IUserDataProfilesService, UserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
 import { NullPolicyService } from 'vs/platform/policy/common/policy';
 import { IRemoteExplorerService, TunnelSource } from 'vs/workbench/services/remote/common/remoteExplorerService';
 import { DisposableTunnel } from 'vs/platform/tunnel/common/tunnel';
 import { ILabelService } from 'vs/platform/label/common/label';
-import { UserDataProfileService } from 'vs/platform/userDataProfile/common/userDataProfileService';
+import { UserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfileService';
+import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
 
 export class BrowserMain extends Disposable {
 
@@ -454,7 +455,7 @@ export class BrowserMain extends Disposable {
 	}
 
 	private async createStorageService(payload: IAnyWorkspaceIdentifier, logService: ILogService, userDataProfileService: IUserDataProfileService): Promise<IStorageService> {
-		const storageService = new BrowserStorageService(payload, logService, userDataProfileService);
+		const storageService = new BrowserStorageService(payload, userDataProfileService.currentProfile, logService);
 
 		try {
 			await storageService.initialize();

src/vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.ts

@@ -32,7 +32,7 @@ import { EditorOption } from 'vs/editor/common/config/editorOptions';
 import { equals } from 'vs/base/common/arrays';
 import { assertIsDefined } from 'vs/base/common/types';
 import { isEqual } from 'vs/base/common/resources';
-import { IUserDataProfileService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
 
 const NLS_LAUNCH_MESSAGE = nls.localize('defineKeybinding.start', "Define Keybinding");
 const NLS_KB_LAYOUT_ERROR_MESSAGE = nls.localize('defineKeybinding.kbLayoutErrorMessage', "You won't be able to produce this key combination under your current keyboard layout.");

src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts

@@ -43,7 +43,7 @@ import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle
 import { KeybindingsEditorInput } from 'vs/workbench/services/preferences/browser/keybindingsEditorInput';
 import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
 import { SettingsEditor2Input } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
-import { IUserDataProfileService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
 
 const SETTINGS_EDITOR_COMMAND_SEARCH = 'settings.action.search';
 

src/vs/workbench/contrib/preferences/common/preferencesContribution.ts

@@ -23,7 +23,7 @@ import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEdit
 import { RegisteredEditorPriority, IEditorResolverService } from 'vs/workbench/services/editor/common/editorResolverService';
 import { ITextEditorService } from 'vs/workbench/services/textfile/common/textEditorService';
 import { DEFAULT_SETTINGS_EDITOR_SETTING, FOLDER_SETTINGS_PATH, IPreferencesService, USE_SPLIT_JSON_SETTING } from 'vs/workbench/services/preferences/common/preferences';
-import { IUserDataProfileService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
 
 const schemaRegistry = Registry.as<JSONContributionRegistry.IJSONContributionRegistry>(JSONContributionRegistry.Extensions.JSONContribution);
 

src/vs/workbench/contrib/snippets/browser/configureSnippets.ts

@@ -18,7 +18,7 @@ import { ITextFileService } from 'vs/workbench/services/textfile/common/textfile
 import { isValidBasename } from 'vs/base/common/extpath';
 import { joinPath, basename } from 'vs/base/common/resources';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { IUserDataProfileService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
 
 namespace ISnippetPick {
 	export function is(thing: object | undefined): thing is ISnippetPick {