improve apply changes notification (#8035)

Author: rebornix

src/commands.ts

@@ -571,7 +571,7 @@ export function registerCommands(
 		return { folderManager, pr };
 	};
 
-	const applyPullRequestChanges = async (folderManager: FolderRepositoryManager, pullRequest: PullRequestModel): Promise<void> => {
+	const applyPullRequestChanges = async (task: vscode.Progress<{ message?: string; increment?: number; }>, folderManager: FolderRepositoryManager, pullRequest: PullRequestModel): Promise<void> => {
 		let patch: string | undefined;
 		try {
 			patch = await pullRequest.getPatch();
@@ -589,22 +589,13 @@ export function registerCommands(
 			const encoder = new TextEncoder();
 			const tempUri = vscode.Uri.file(tempFilePath);
 
-			await vscode.window.withProgress(
-				{
-					location: vscode.ProgressLocation.Notification,
-					title: vscode.l10n.t('Applying changes from pull request #{0}', pullRequest.number.toString()),
-					cancellable: false
-				},
-				async (task) => {
-					await vscode.workspace.fs.writeFile(tempUri, encoder.encode(patch));
-					try {
-						await folderManager.repository.apply(tempFilePath, false);
-						task.report({ message: vscode.l10n.t('Successfully applied changes from pull request #{0}', pullRequest.number.toString()), increment: 100 });
-					} finally {
-						await vscode.workspace.fs.delete(tempUri);
-					}
-				}
-			);
+			await vscode.workspace.fs.writeFile(tempUri, encoder.encode(patch));
+			try {
+				await folderManager.repository.apply(tempFilePath, false);
+				task.report({ message: vscode.l10n.t('Successfully applied changes from pull request #{0}', pullRequest.number.toString()), increment: 100 });
+			} finally {
+				await vscode.workspace.fs.delete(tempUri);
+			}
 
 		} catch (error) {
 			const errorMessage = formatError(error);
@@ -672,21 +663,44 @@ export function registerCommands(
 			if (Number.isNaN(prNumber)) {
 				return vscode.window.showErrorMessage(vscode.l10n.t('Unable to parse pull request number.'));
 			}
-			const folderManager = reposManager.folderManagers[0];
-			const pullRequest = await folderManager.fetchById(folderManager.gitHubRepositories[0], Number(prNumber));
-			if (!pullRequest) {
-				return vscode.window.showErrorMessage(vscode.l10n.t('Unable to find pull request #{0}', prNumber.toString()));
-			}
 
-			return applyPullRequestChanges(folderManager, pullRequest);
-		}
+			await vscode.window.withProgress(
+				{
+					location: vscode.ProgressLocation.Notification,
+					title: vscode.l10n.t('Applying changes from pull request #{0}', prNumber.toString()),
+					cancellable: false
+				},
+				async (task) => {
+					task.report({ increment: 30 });
 
-		const resolved = await resolvePr(ctx);
-		if (!resolved) {
-			return vscode.window.showErrorMessage(vscode.l10n.t('Unable to resolve pull request for applying changes.'));
+					const folderManager = reposManager.folderManagers[0];
+					const pullRequest = await folderManager.fetchById(folderManager.gitHubRepositories[0], Number(prNumber));
+					if (!pullRequest) {
+						return vscode.window.showErrorMessage(vscode.l10n.t('Unable to find pull request #{0}', prNumber.toString()));
+					}
+
+					return applyPullRequestChanges(task, folderManager, pullRequest);
+				});
+
+			return;
 		}
-		return applyPullRequestChanges(resolved.folderManager, resolved.pr);
 
+		await vscode.window.withProgress(
+			{
+				location: vscode.ProgressLocation.Notification,
+				title: vscode.l10n.t('Applying changes from pull request'),
+				cancellable: false
+			},
+			async (task) => {
+				task.report({ increment: 30 });
+
+				const resolved = await resolvePr(ctx);
+				if (!resolved) {
+					return vscode.window.showErrorMessage(vscode.l10n.t('Unable to resolve pull request for applying changes.'));
+				}
+				return applyPullRequestChanges(task, resolved.folderManager, resolved.pr);
+			}
+		);
 	}));
 
 	context.subscriptions.push(