Fix microsoft#159072 (microsoft#159073)

Author: sandy081

src/vs/platform/extensionManagement/electron-main/defaultExtensionsProfileInit.ts

@@ -9,6 +9,7 @@ import { URI } from 'vs/base/common/uri';
 import { IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
 import { IExtensionsScannerService } from 'vs/platform/extensionManagement/common/extensionsScannerService';
 import { IFileService } from 'vs/platform/files/common/files';
+import { ILogService } from 'vs/platform/log/common/log';
 import { EXTENSIONS_RESOURCE_NAME } from 'vs/platform/userDataProfile/common/userDataProfile';
 import { IUserDataProfilesMainService } from 'vs/platform/userDataProfile/electron-main/userDataProfile';
 
@@ -18,18 +19,23 @@ export class DefaultExtensionsProfileInitHandler extends Disposable {
 		@IFileService private readonly fileService: IFileService,
 		@IExtensionsScannerService private readonly extensionsScannerService: IExtensionsScannerService,
 		@IExtensionsProfileScannerService private readonly extensionsProfileScannerService: IExtensionsProfileScannerService,
+		@ILogService logService: ILogService,
 	) {
 		super();
-		this._register(userDataProfilesService.onWillCreateProfile(e => {
-			if (userDataProfilesService.profiles.length === 1) {
-				e.join(this.initialize());
-			}
-		}));
-		this._register(userDataProfilesService.onDidChangeProfiles(e => {
-			if (userDataProfilesService.profiles.length === 1) {
-				this.uninitialize();
-			}
-		}));
+		if (userDataProfilesService.isEnabled()) {
+			this._register(userDataProfilesService.onWillCreateProfile(e => {
+				if (userDataProfilesService.profiles.length === 1) {
+					e.join(this.initialize());
+				}
+			}));
+			this._register(userDataProfilesService.onDidChangeProfiles(e => {
+				if (userDataProfilesService.profiles.length === 1) {
+					this.uninitialize();
+				}
+			}));
+		} else {
+			this.uninitialize().then(null, e => logService.error(e));
+		}
 	}
 
 	private async initialize(): Promise<void> {

src/vs/platform/userDataProfile/electron-main/userDataProfile.ts

@@ -39,6 +39,15 @@ export class UserDataProfilesMainService extends UserDataProfilesService impleme
 		super(stateMainService, uriIdentityService, environmentService, fileService, logService);
 	}
 
+	override setEnablement(enabled: boolean): void {
+		super.setEnablement(enabled);
+		if (!this.enabled) {
+			// reset
+			this.saveStoredProfiles([]);
+			this.saveStoredProfileAssociations({});
+		}
+	}
+
 	isEnabled(): boolean {
 		return this.enabled;
 	}
@@ -69,11 +78,19 @@ export class UserDataProfilesMainService extends UserDataProfilesService impleme
 	}
 
 	protected override saveStoredProfiles(storedProfiles: StoredUserDataProfile[]): void {
-		this.stateMainService.setItem(UserDataProfilesMainService.PROFILES_KEY, storedProfiles);
+		if (storedProfiles.length) {
+			this.stateMainService.setItem(UserDataProfilesMainService.PROFILES_KEY, storedProfiles);
+		} else {
+			this.stateMainService.removeItem(UserDataProfilesMainService.PROFILES_KEY);
+		}
 	}
 
 	protected override saveStoredProfileAssociations(storedProfileAssociations: StoredProfileAssociations): void {
-		this.stateMainService.setItem(UserDataProfilesMainService.PROFILE_ASSOCIATIONS_KEY, storedProfileAssociations);
+		if (storedProfileAssociations.emptyWindow || storedProfileAssociations.workspaces) {
+			this.stateMainService.setItem(UserDataProfilesMainService.PROFILE_ASSOCIATIONS_KEY, storedProfileAssociations);
+		} else {
+			this.stateMainService.removeItem(UserDataProfilesMainService.PROFILE_ASSOCIATIONS_KEY);
+		}
 	}
 
 	protected override getStoredProfileAssociations(): StoredProfileAssociations {