Remove commit count from URI, fetch from PR model instead

Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

Author: Copilot

src/common/uri.ts

@@ -524,15 +524,13 @@ export interface CommitsNodeUriParams {
 	owner: string;
 	repo: string;
 	prNumber: number;
-	commitsCount: number;
 }
 
-export function createCommitsNodeUri(owner: string, repo: string, prNumber: number, commitsCount: number): vscode.Uri {
+export function createCommitsNodeUri(owner: string, repo: string, prNumber: number): vscode.Uri {
 	const params: CommitsNodeUriParams = {
 		owner,
 		repo,
-		prNumber,
-		commitsCount
+		prNumber
 	};
 
 	return vscode.Uri.parse(`${Schemes.CommitsNode}:${owner}/${repo}/${prNumber}`).with({

src/extension.ts

@@ -172,7 +172,7 @@ async function init(
 	);
 	const treeDecorationProviders = new TreeDecorationProviders(reposManager);
 	context.subscriptions.push(treeDecorationProviders);
-	treeDecorationProviders.registerProviders([new FileTypeDecorationProvider(), new CommentDecorationProvider(reposManager), new CommitsDecorationProvider()]);
+	treeDecorationProviders.registerProviders([new FileTypeDecorationProvider(), new CommentDecorationProvider(reposManager), new CommitsDecorationProvider(reposManager)]);
 
 	const notificationsProvider = new NotificationsProvider(credentialStore, reposManager);
 	context.subscriptions.push(notificationsProvider);

src/view/commitsDecorationProvider.ts

@@ -1,47 +1,68 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as vscode from 'vscode';
-import { TreeDecorationProvider } from './treeDecorationProviders';
-import { createCommitsNodeUri, fromCommitsNodeUri, Schemes } from '../common/uri';
-import { FolderRepositoryManager } from '../github/folderRepositoryManager';
-import { PullRequestModel } from '../github/pullRequestModel';
-
-export class CommitsDecorationProvider extends TreeDecorationProvider {
-
-	constructor() {
-		super();
-	}
-
-	registerPullRequestPropertyChangedListeners(_folderManager: FolderRepositoryManager, model: PullRequestModel): vscode.Disposable {
-		return model.onDidChange(e => {
-			if (e.timeline) {
-				// Timeline changed, which may include new commits, so update the decoration
-				const uri = createCommitsNodeUri(model.remote.owner, model.remote.repositoryName, model.number, model.item.commits.length);
-				this._onDidChangeFileDecorations.fire(uri);
-			}
-		});
-	}
-
-	provideFileDecoration(
-		uri: vscode.Uri,
-		_token: vscode.CancellationToken,
-	): vscode.ProviderResult<vscode.FileDecoration> {
-		if (uri.scheme !== Schemes.CommitsNode) {
-			return undefined;
-		}
-
-		const params = fromCommitsNodeUri(uri);
-		if (!params) {
-			return undefined;
-		}
-
-		return {
-			badge: params.commitsCount.toString(),
-			tooltip: vscode.l10n.t('{0} commits', params.commitsCount)
-		};
-	}
-
-}
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { TreeDecorationProvider } from './treeDecorationProviders';
+import { createCommitsNodeUri, fromCommitsNodeUri, Schemes } from '../common/uri';
+import { FolderRepositoryManager } from '../github/folderRepositoryManager';
+import { PullRequestModel } from '../github/pullRequestModel';
+import { RepositoriesManager } from '../github/repositoriesManager';
+
+export class CommitsDecorationProvider extends TreeDecorationProvider {
+
+	constructor(private readonly _repositoriesManager: RepositoriesManager) {
+		super();
+	}
+
+	registerPullRequestPropertyChangedListeners(_folderManager: FolderRepositoryManager, model: PullRequestModel): vscode.Disposable {
+		return model.onDidChange(e => {
+			if (e.timeline) {
+				// Timeline changed, which may include new commits, so update the decoration
+				const uri = createCommitsNodeUri(model.remote.owner, model.remote.repositoryName, model.number);
+				this._onDidChangeFileDecorations.fire(uri);
+			}
+		});
+	}
+
+	provideFileDecoration(
+		uri: vscode.Uri,
+		_token: vscode.CancellationToken,
+	): vscode.ProviderResult<vscode.FileDecoration> {
+		if (uri.scheme !== Schemes.CommitsNode) {
+			return undefined;
+		}
+
+		const params = fromCommitsNodeUri(uri);
+		if (!params) {
+			return undefined;
+		}
+
+		// Find the PR model to get the current commit count
+		const folderManager = this._repositoriesManager.folderManagers.find(fm =>
+			fm.gitHubRepositories.some(repo =>
+				repo.remote.owner === params.owner && repo.remote.repositoryName === params.repo
+			)
+		);
+
+		if (folderManager) {
+			const repo = folderManager.gitHubRepositories.find(r =>
+				r.remote.owner === params.owner && r.remote.repositoryName === params.repo
+			);
+			if (repo) {
+				const pr = repo.getExistingPullRequestModel(params.prNumber);
+				if (pr) {
+					const commitsCount = pr.item.commits.length;
+					return {
+						badge: commitsCount.toString(),
+						tooltip: vscode.l10n.t('{0} commits', commitsCount)
+					};
+				}
+			}
+		}
+
+		return undefined;
+	}
+
+}

src/view/treeNodes/commitsCategoryNode.ts

@@ -27,7 +27,7 @@ export class CommitsNode extends TreeNode implements vscode.TreeItem {
 		this._pr = pr;
 		this._folderRepoManager = reposManager;
 		this.collapsibleState = vscode.TreeItemCollapsibleState.Collapsed;
-		this.resourceUri = createCommitsNodeUri(pr.remote.owner, pr.remote.repositoryName, pr.number, pr.item.commits.length);
+		this.resourceUri = createCommitsNodeUri(pr.remote.owner, pr.remote.repositoryName, pr.number);
 
 		this.childrenDisposables = [];
 		this.childrenDisposables.push(this._pr.onDidChangeReviewThreads(() => {