Merge branch 'main' into alexr00/like-crane

Author: alexr00

.github/commands.json

@@ -41,7 +41,7 @@
 		"treeItemMarkdownLabel",
 		"treeViewMarkdownMessage"
 	],
-	"version": "0.124.0",
+	"version": "0.126.0",
 	"publisher": "GitHub",
 	"engines": {
 		"vscode": "^1.107.0"
@@ -3610,12 +3610,12 @@
 				{
 					"command": "pr.checkoutFromDescription",
 					"group": "navigation@0",
-					"when": "chatSessionType == copilot-cloud-agent && workspaceFolderCount > 0"
+					"when": "chatSessionType == copilot-cloud-agent && workspaceFolderCount > 0 && github.vscode-pull-request-github.activated"
 				},
 				{
 					"command": "pr.applyChangesFromDescription",
 					"group": "navigation@1",
-					"when": "chatSessionType == copilot-cloud-agent && workspaceFolderCount > 0"
+					"when": "chatSessionType == copilot-cloud-agent && workspaceFolderCount > 0 && github.vscode-pull-request-github.activated"
 				}
 			]
 		},

package.json

@@ -49,26 +49,6 @@ declare module 'vscode' {
 		 */
 		readonly onDidCommitChatSessionItem: Event<{ original: ChatSessionItem /** untitled */; modified: ChatSessionItem /** newly created */ }>;
 
-		/**
-		 * DEPRECATED: Will be removed!
-		 * Creates a new chat session.
-		 *
-		 * @param options Options for the new session including an optional initial prompt and history
-		 * @param token A cancellation token
-		 * @returns Metadata for the chat session
-		 */
-		provideNewChatSessionItem?(options: {
-			/**
-			 * The chat request that initiated the session creation
-			 */
-			readonly request: ChatRequest;
-
-			/**
-			 * Additional metadata to use for session creation
-			 */
-			metadata?: any;
-		}, token: CancellationToken): ProviderResult<ChatSessionItem>;
-
 		// #endregion
 	}
 
@@ -241,6 +221,14 @@ declare module 'vscode' {
 		 */
 		readonly onDidChangeChatSessionOptions?: Event<ChatSessionOptionChangeEvent>;
 
+		/**
+		 * Event that the provider can fire to signal that the available provider options have changed.
+		 *
+		 * When fired, the editor will re-query {@link ChatSessionContentProvider.provideChatSessionProviderOptions}
+		 * and update the UI to reflect the new option groups.
+		 */
+		readonly onDidChangeChatSessionProviderOptions?: Event<void>;
+
 		/**
 		 * Provides the chat session content for a given uri.
 		 *

src/@types/vscode.proposed.chatSessionsProvider.d.ts

@@ -20,6 +20,7 @@ export namespace contexts {
 	export const ACTIVE_COMMENT_HAS_SUGGESTION = 'github:activeCommentHasSuggestion'; // Boolean indicating if the active comment has a suggestion
 	export const CREATING = 'pr:creating';
 	export const NOTIFICATION_COUNT = 'github:notificationCount'; // Number of notifications in the notifications view
+	export const ACTIVATED = 'github.vscode-pull-request-github.activated'; // Boolean indicating if the extension has been activated
 }
 
 export namespace commands {

src/common/executeCommands.ts

@@ -10,7 +10,7 @@ import { LiveShare } from 'vsls/vscode.js';
 import { PostCommitCommandsProvider, Repository } from './api/api';
 import { GitApiImpl } from './api/api1';
 import { registerCommands } from './commands';
-import { commands } from './common/executeCommands';
+import { commands, contexts } from './common/executeCommands';
 import { isSubmodule } from './common/gitUtils';
 import Logger from './common/logger';
 import * as PersistentState from './common/persistentState';
@@ -340,7 +340,9 @@ export async function activate(context: vscode.ExtensionContext): Promise<GitApi
 	telemetry = new ExperimentationTelemetry(new TelemetryReporter(ingestionKey));
 	context.subscriptions.push(telemetry);
 
-	return await deferredActivate(context, showPRController);
+	const deferred = await deferredActivate(context, showPRController);
+	await commands.setContext(contexts.ACTIVATED, true);
+	return deferred;
 }
 
 async function setGitSettingContexts(context: vscode.ExtensionContext) {

src/extension.ts

@@ -15,6 +15,7 @@ import { MergeArguments, PullRequest, ReviewType } from './views';
 import { IComment } from '../common/comment';
 import { emojify, ensureEmojis } from '../common/emoji';
 import { disposeAll } from '../common/lifecycle';
+import Logger from '../common/logger';
 import { CHECKOUT_DEFAULT_BRANCH, CHECKOUT_PULL_REQUEST_BASE_BRANCH, DELETE_BRANCH_AFTER_MERGE, POST_DONE, PR_SETTINGS_NAMESPACE } from '../common/settingKeys';
 import { ReviewEvent } from '../common/timelineEvent';
 import { formatError } from '../common/utils';
@@ -25,7 +26,7 @@ import { ReviewManager } from '../view/reviewManager';
 export class PullRequestViewProvider extends WebviewViewBase implements vscode.WebviewViewProvider {
 	public override readonly viewType = 'github:activePullRequest';
 	private _existingReviewers: ReviewState[] = [];
-	private _isUpdating: boolean = false;
+	private _updatingPromise: Promise<unknown> | undefined;
 
 	constructor(
 		extensionUri: vscode.Uri,
@@ -151,7 +152,7 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
 		}
 		this._prDisposables = [];
 		this._prDisposables.push(pullRequestModel.onDidChange(e => {
-			if ((e.state || e.comments || e.reviewers) && !this._isUpdating) {
+			if ((e.state || e.comments || e.reviewers) && !this._updatingPromise) {
 				this.updatePullRequest(pullRequestModel);
 			}
 		}));
@@ -160,10 +161,16 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
 
 	private _updatePendingVisibility: vscode.Disposable | undefined = undefined;
 	public async updatePullRequest(pullRequestModel: PullRequestModel): Promise<void> {
-		if (this._isUpdating) {
-			throw new Error('Already updating pull request view');
+		const isSamePullRequest = pullRequestModel.equals(this._item);
+		if (this._updatingPromise && isSamePullRequest) {
+			Logger.error('Already updating pull request view', PullRequestViewProvider.name);
+			return;
+		} else if (this._updatingPromise && !isSamePullRequest) {
+			this._item = pullRequestModel;
+			await this._updatingPromise;
+		} else {
+			this._item = pullRequestModel;
 		}
-		this._isUpdating = true;
 
 		try {
 			if (this._view && !this._view.visible) {
@@ -178,7 +185,7 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
 				this.registerPrSpecificListeners(pullRequestModel);
 			}
 			this._item = pullRequestModel;
-			const [pullRequest, repositoryAccess, timelineEvents, requestedReviewers, branchInfo, defaultBranch, currentUser, viewerCanEdit, hasReviewDraft, coAuthors] = await Promise.all([
+			const updatingPromise = Promise.all([
 				this._folderRepositoryManager.resolvePullRequest(
 					pullRequestModel.remote.owner,
 					pullRequestModel.remote.repositoryName,
@@ -195,13 +202,19 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
 				pullRequestModel.getCoAuthors(),
 				ensureEmojis(this._folderRepositoryManager.context)
 			]);
+			this._updatingPromise = updatingPromise;
+			const [pullRequest, repositoryAccess, timelineEvents, requestedReviewers, branchInfo, defaultBranch, currentUser, viewerCanEdit, hasReviewDraft, coAuthors] = await updatingPromise;
 
 			if (!pullRequest) {
 				throw new Error(
 					`Fail to resolve Pull Request #${pullRequestModel.number} in ${pullRequestModel.remote.owner}/${pullRequestModel.remote.repositoryName}`,
 				);
 			}
 
+			if (!this._item.equals(pullRequestModel)) {
+				return;
+			}
+
 			this._item = pullRequest;
 			if (!this._view) {
 				// If the there is no PR webview, then there is nothing else to update.
@@ -292,8 +305,6 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
 
 		} catch (e) {
 			vscode.window.showErrorMessage(`Error updating active pull request view: ${formatError(e)}`);
-		} finally {
-			this._isUpdating = false;
 		}
 	}
 

src/github/activityBarViewProvider.ts

@@ -69,6 +69,9 @@ export class CopilotStateModel extends Disposable {
 				continue;
 			}
 			this._states.set(key, { item, status });
+			if (status === CopilotPRStatus.Started) {
+				continue;
+			}
 			changedModels.push(item);
 			changedKeys.push(key);
 		}

src/github/copilotPrWatcher.ts

@@ -58,7 +58,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 	private _assignableUsers: { [key: string]: IAccount[] } = {};
 
 	private _prListeners: vscode.Disposable[] = [];
-	private _isUpdating: boolean = false;
+	private _updatingPromise: Promise<unknown> | undefined;
 
 	public static override async createOrShow(
 		telemetry: ITelemetry,
@@ -173,7 +173,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 
 		if (this._item) {
 			this._prListeners.push(this._item.onDidChange(e => {
-				if ((e.state || e.comments) && !this._isUpdating) {
+				if ((e.state || e.comments) && !this._updatingPromise) {
 					this.refreshPanel();
 				}
 			}));
@@ -236,32 +236,19 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 	}
 
 	protected override async updateItem(pullRequestModel: PullRequestModel): Promise<void> {
-		this._item = pullRequestModel;
-
-		if (this._isUpdating) {
-			throw new Error('Already updating pull request webview');
+		const isSamePullRequest = pullRequestModel.equals(this._item);
+		if (this._updatingPromise && isSamePullRequest) {
+			Logger.error('Already updating pull request webview', PullRequestOverviewPanel.ID);
+			return;
+		} else if (this._updatingPromise && !isSamePullRequest) {
+			this._item = pullRequestModel;
+			await this._updatingPromise;
+		} else {
+			this._item = pullRequestModel;
 		}
-		this._isUpdating = true;
+
 		try {
-			const [
-				pullRequest,
-				timelineEvents,
-				defaultBranch,
-				status,
-				requestedReviewers,
-				repositoryAccess,
-				branchInfo,
-				currentUser,
-				viewerCanEdit,
-				orgTeamsCount,
-				mergeQueueMethod,
-				isBranchUpToDateWithBase,
-				mergeability,
-				emailForCommit,
-				coAuthors,
-				hasReviewDraft,
-				assignableUsers
-			] = await Promise.all([
+			const updatingPromise = Promise.all([
 				this._folderRepositoryManager.resolvePullRequest(
 					pullRequestModel.remote.owner,
 					pullRequestModel.remote.repositoryName,
@@ -284,12 +271,39 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 				pullRequestModel.validateDraftMode(),
 				this._folderRepositoryManager.getAssignableUsers()
 			]);
+			this._updatingPromise = updatingPromise;
+
+			const [
+				pullRequest,
+				timelineEvents,
+				defaultBranch,
+				status,
+				requestedReviewers,
+				repositoryAccess,
+				branchInfo,
+				currentUser,
+				viewerCanEdit,
+				orgTeamsCount,
+				mergeQueueMethod,
+				isBranchUpToDateWithBase,
+				mergeability,
+				emailForCommit,
+				coAuthors,
+				hasReviewDraft,
+				assignableUsers
+			] = await updatingPromise;
+			this._updatingPromise = undefined;
 			if (!pullRequest) {
 				throw new Error(
 					`Fail to resolve Pull Request #${pullRequestModel.number} in ${pullRequestModel.remote.owner}/${pullRequestModel.remote.repositoryName}`,
 				);
 			}
 
+			if (!this._item.equals(pullRequestModel)) {
+				// Updated PR is no longer the current one
+				return;
+			}
+
 			this._item = pullRequest;
 			this.registerPrListeners();
 			this._repositoryDefaultBranch = defaultBranch!;
@@ -362,8 +376,6 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 			}
 		} catch (e) {
 			vscode.window.showErrorMessage(`Error updating pull request description: ${formatError(e)}`);
-		} finally {
-			this._isUpdating = false;
 		}
 	}
 

src/github/pullRequestOverview.ts

@@ -462,6 +462,30 @@ export namespace PullRequestReviewCommon {
 		}
 
 		// Execute all deletions in parallel
-		await performBranchDeletion(folderRepositoryManager, item, defaultBranch, branchInfo!, selectedActions);
+		const deletedBranchTypes = await performBranchDeletion(folderRepositoryManager, item, defaultBranch, branchInfo!, selectedActions);
+
+		// Show notification to the user about what was deleted
+		if (deletedBranchTypes.length > 0) {
+			const wasLocalDeleted = deletedBranchTypes.includes('local');
+			const wasRemoteDeleted = deletedBranchTypes.includes('remoteHead') || deletedBranchTypes.includes('remote');
+			const branchName = branchInfo?.branch || item.head?.ref;
+
+			// Only show notification if we have a branch name
+			if (branchName) {
+				if (wasLocalDeleted && wasRemoteDeleted) {
+					vscode.window.showInformationMessage(
+						vscode.l10n.t('Deleted local and remote branches for {0}.', branchName)
+					);
+				} else if (wasLocalDeleted) {
+					vscode.window.showInformationMessage(
+						vscode.l10n.t('Deleted local branch {0}.', branchName)
+					);
+				} else {
+					vscode.window.showInformationMessage(
+						vscode.l10n.t('Deleted remote branch {0}.', branchName)
+					);
+				}
+			}
+		}
 	}
 }

src/github/pullRequestReviewCommon.ts

@@ -31,19 +31,19 @@ describe('Copilot PR watcher', () => {
 			model.set([{ item: pr, status: CopilotPRStatus.Started }]);
 
 			assert.strictEqual(model.get('octo', 'repo', 1), CopilotPRStatus.Started);
-			assert.strictEqual(changeEvents, 1);
+			assert.strictEqual(changeEvents, 0);
 			assert.strictEqual(notifications.length, 0);
 			assert.strictEqual(model.notifications.size, 0);
 
 			model.set([{ item: pr, status: CopilotPRStatus.Started }]);
-			assert.strictEqual(changeEvents, 1);
+			assert.strictEqual(changeEvents, 0);
 
 			model.setInitialized();
 			const updated = createPullRequest('octo', 'repo', 1);
 			model.set([{ item: updated, status: CopilotPRStatus.Completed }]);
 
 			assert.strictEqual(model.get('octo', 'repo', 1), CopilotPRStatus.Completed);
-			assert.strictEqual(changeEvents, 2);
+			assert.strictEqual(changeEvents, 1);
 			assert.strictEqual(notifications.length, 1);
 			assert.deepStrictEqual(notifications[0], [updated]);
 			assert.ok(model.notifications.has('octo/repo#1'));
@@ -58,7 +58,7 @@ describe('Copilot PR watcher', () => {
 
 			model.setInitialized();
 			const pr = createPullRequest('octo', 'repo', 42);
-			model.set([{ item: pr, status: CopilotPRStatus.Started }]);
+			model.set([{ item: pr, status: CopilotPRStatus.Completed }]);
 
 			assert.strictEqual(model.notifications.size, 1);
 			assert.strictEqual(changeEvents, 1);
@@ -79,7 +79,7 @@ describe('Copilot PR watcher', () => {
 
 			model.setInitialized();
 			const pr = createPullRequest('octo', 'repo', 5);
-			model.set([{ item: pr, status: CopilotPRStatus.Started }]);
+			model.set([{ item: pr, status: CopilotPRStatus.Completed }]);
 			assert.strictEqual(model.notifications.size, 1);
 			assert.strictEqual(notifications.length, 1);
 
@@ -110,22 +110,18 @@ describe('Copilot PR watcher', () => {
 				{ item: prThree, status: CopilotPRStatus.Completed }
 			]);
 
-			assert.strictEqual(model.notifications.size, 3);
+			assert.strictEqual(model.notifications.size, 2);
 			assert.strictEqual(notifications.length, 1);
-			assert.deepStrictEqual(notifications[0], [prOne, prTwo, prThree]);
-			assert.strictEqual(model.getNotificationsCount('octo', 'repo'), 2);
+			assert.deepStrictEqual(notifications[0], [prTwo, prThree]);
+			assert.strictEqual(model.getNotificationsCount('octo', 'repo'), 1);
 			assert.deepStrictEqual(model.keys().sort(), ['octo/repo#1', 'octo/repo#2', 'other/repo#3']);
 
 			model.clearAllNotifications('octo', 'repo');
 			assert.strictEqual(model.notifications.size, 1);
 			assert.strictEqual(model.getNotificationsCount('octo', 'repo'), 0);
-			assert.strictEqual(notifications.length, 2);
-			assert.deepStrictEqual(notifications[1], [prOne, prTwo]);
 
 			model.clearAllNotifications();
 			assert.strictEqual(model.notifications.size, 0);
-			assert.strictEqual(notifications.length, 3);
-			assert.deepStrictEqual(notifications[2], [prThree]);
 
 			const counts = model.getCounts('octo', 'repo');
 			assert.deepStrictEqual(counts, { total: 3, inProgress: 1, error: 1 });