fix microsoft#186269 (microsoft#186602)

Author: sandy081

src/vs/workbench/services/issue/browser/issueTroubleshoot.ts

@@ -120,7 +120,7 @@ class TroubleshootIssueService extends Disposable implements ITroubleshootIssueS
 		}
 
 		const originalProfile = this.userDataProfileService.currentProfile;
-		await this.userDataProfileImportExportService.createTemporaryProfile(this.userDataProfileService.currentProfile, localize('troubleshoot issue', "Troubleshoot Issue"), true);
+		await this.userDataProfileImportExportService.createTroubleshootProfile();
 		this.state = new TroubleShootState(TroubleshootStage.EXTENSIONS, originalProfile.id);
 		await this.resume();
 	}

src/vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService.ts

@@ -256,11 +256,16 @@ export class UserDataProfileImportExportService extends Disposable implements IU
 		}
 	}
 
-	async createTemporaryProfile(profile: IUserDataProfile, name: string, extensionsDisabled: boolean): Promise<void> {
-		const userDataProfilesExportState = this.instantiationService.createInstance(UserDataProfileExportState, profile, extensionsDisabled);
+	async createTroubleshootProfile(): Promise<void> {
+		const userDataProfilesExportState = this.instantiationService.createInstance(UserDataProfileExportState, this.userDataProfileService.currentProfile, true);
 		try {
-			const profileTemplate = await userDataProfilesExportState.getProfileTemplate(name, undefined);
-			await this.importAndSwitch(profileTemplate, true, true, extensionsDisabled, localize('import', "Create Profile"));
+			const profileTemplate = await userDataProfilesExportState.getProfileTemplate(localize('troubleshoot issue', "Troubleshoot Issue"), undefined);
+			await this.progressService.withProgress({
+				location: ProgressLocation.Notification,
+				delay: 1000,
+				sticky: true,
+			}, progress =>
+				this.importAndSwitchWithProgress(profileTemplate, true, true, true, message => progress.report({ message: localize('troubleshoot profile progress', "Setting up Troubleshoot Profile: {0}", message) })));
 		} finally {
 			userDataProfilesExportState.dispose();
 		}
@@ -464,40 +469,44 @@ export class UserDataProfileImportExportService extends Disposable implements IU
 			command: showWindowLogActionId,
 		}, async (progress) => {
 			progress.report({ message: localize('Importing profile', "{0} ({1})...", title, profileTemplate.name) });
-			const profile = await this.getProfileToImport(profileTemplate, temporaryProfile);
-			if (!profile) {
-				return undefined;
-			}
+			return this.importAndSwitchWithProgress(profileTemplate, temporaryProfile, extensions, extensionsDisabled, message => progress.report({ message: `${title} (${profileTemplate.name}): ${message}` }));
+		});
+	}
 
-			if (profileTemplate.settings) {
-				progress.report({ message: localize('progress settings', "{0} ({1}): Applying Settings...", title, profileTemplate.name) });
-				await this.instantiationService.createInstance(SettingsResource).apply(profileTemplate.settings, profile);
-			}
-			if (profileTemplate.keybindings) {
-				progress.report({ message: localize('progress keybindings', "{0} ({1}): Applying Keyboard Shortcuts...", title, profileTemplate.name) });
-				await this.instantiationService.createInstance(KeybindingsResource).apply(profileTemplate.keybindings, profile);
-			}
-			if (profileTemplate.tasks) {
-				progress.report({ message: localize('progress tasks', "{0} ({1}): Applying Tasks...", title, profileTemplate.name) });
-				await this.instantiationService.createInstance(TasksResource).apply(profileTemplate.tasks, profile);
-			}
-			if (profileTemplate.snippets) {
-				progress.report({ message: localize('progress snippets', "{0} ({1}): Applying Snippets...", title, profileTemplate.name) });
-				await this.instantiationService.createInstance(SnippetsResource).apply(profileTemplate.snippets, profile);
-			}
-			if (profileTemplate.globalState) {
-				progress.report({ message: localize('progress global state', "{0} ({1}): Applying State...", title, profileTemplate.name) });
-				await this.instantiationService.createInstance(GlobalStateResource).apply(profileTemplate.globalState, profile);
-			}
-			if (profileTemplate.extensions && extensions) {
-				progress.report({ message: localize('progress extensions', "{0} ({1}): Applying Extensions...", title, profileTemplate.name) });
-				await this.instantiationService.createInstance(ExtensionsResource, extensionsDisabled).apply(profileTemplate.extensions, profile);
-			}
+	private async importAndSwitchWithProgress(profileTemplate: IUserDataProfileTemplate, temporaryProfile: boolean, extensions: boolean, extensionsDisabled: boolean, progress: (message: string) => void): Promise<IUserDataProfile | undefined> {
+		const profile = await this.getProfileToImport(profileTemplate, temporaryProfile);
+		if (!profile) {
+			return undefined;
+		}
 
-			progress.report({ message: localize('switching profile', "{0} ({1}): Applying...", title, profileTemplate.name) });
-			await this.userDataProfileManagementService.switchProfile(profile);
-			return profile;
-		});
+		if (profileTemplate.settings) {
+			progress(localize('progress settings', "Applying Settings..."));
+			await this.instantiationService.createInstance(SettingsResource).apply(profileTemplate.settings, profile);
+		}
+		if (profileTemplate.keybindings) {
+			progress(localize('progress keybindings', "{0}ying Keyboard Shortcuts..."));
+			await this.instantiationService.createInstance(KeybindingsResource).apply(profileTemplate.keybindings, profile);
+		}
+		if (profileTemplate.tasks) {
+			progress(localize('progress tasks', "Applying Tasks..."));
+			await this.instantiationService.createInstance(TasksResource).apply(profileTemplate.tasks, profile);
+		}
+		if (profileTemplate.snippets) {
+			progress(localize('progress snippets', "Applying Snippets..."));
+			await this.instantiationService.createInstance(SnippetsResource).apply(profileTemplate.snippets, profile);
+		}
+		if (profileTemplate.globalState) {
+			progress(localize('progress global state', "Applying State..."));
+			await this.instantiationService.createInstance(GlobalStateResource).apply(profileTemplate.globalState, profile);
+		}
+		if (profileTemplate.extensions && extensions) {
+			progress(localize('progress extensions', "Applying Extensions..."));
+			await this.instantiationService.createInstance(ExtensionsResource, extensionsDisabled).apply(profileTemplate.extensions, profile);
+		}
+
+		progress(localize('switching profile', " Applying..."));
+		await this.userDataProfileManagementService.switchProfile(profile);
+		return profile;
 	}
 
 	private async resolveProfileContent(resource: URI): Promise<string | null> {

src/vs/workbench/services/userDataProfile/common/userDataProfile.ts

@@ -88,7 +88,7 @@ export interface IUserDataProfileImportExportService {
 	importProfile(uri: URI, options?: IProfileImportOptions): Promise<void>;
 	showProfileContents(): Promise<void>;
 	createFromCurrentProfile(name: string): Promise<void>;
-	createTemporaryProfile(from: IUserDataProfile, name: string, extensionsDisabled: boolean): Promise<void>;
+	createTroubleshootProfile(): Promise<void>;
 	setProfile(profile: IUserDataProfileTemplate): Promise<void>;
 }