Shows enriched PRs on hover

(#4107, #4146)

Author: sergeibbb

src/plus/integrations/providers/bitbucket-server.ts

@@ -96,19 +96,21 @@ export class BitbucketServerIntegration extends HostingIntegration<
 		id: string,
 		type: undefined | IssueOrPullRequestType,
 	): Promise<IssueOrPullRequest | undefined> {
-		if (type !== 'pullrequest') {
+		if (type === 'issue') {
 			return undefined;
 		}
-		return (await this.container.bitbucket)?.getIssueOrPullRequest(
+		const integration = await this.container.integrations.get(this.id);
+		if (!integration) {
+			return undefined;
+		}
+		return (await this.container.bitbucket)?.getServerPullRequestById(
 			this,
 			accessToken,
 			repo.owner,
 			repo.name,
 			id,
 			this.apiBaseUrl,
-			{
-				type: 'pullrequest',
-			},
+			integration,
 		);
 	}
 

src/plus/integrations/providers/bitbucket-server/models.ts

@@ -185,7 +185,7 @@ export const normalizeBitbucketServerPullRequest = (pr: BitbucketServerPullReque
 			name: pr.fromRef.displayId,
 			oid: pr.fromRef.latestCommit,
 		},
-		commentCount: pr.properties.commentCount,
+		commentCount: pr.properties?.commentCount,
 		upvoteCount: null,
 		commitCount: null,
 		fileCount: null,

src/plus/integrations/providers/bitbucket/bitbucket.ts

@@ -275,6 +275,45 @@ export class BitbucketApi implements Disposable {
 		return undefined;
 	}
 
+	@debug<BitbucketApi['getServerPullRequestById']>({ args: { 0: p => p.name, 1: '<token>' } })
+	public async getServerPullRequestById(
+		provider: Provider,
+		token: string,
+		owner: string,
+		repo: string,
+		id: string,
+		baseUrl: string,
+		integration: Integration,
+	): Promise<IssueOrPullRequest | undefined> {
+		const scope = getLogScope();
+
+		try {
+			const prResponse = await this.request<BitbucketServerPullRequest>(
+				provider,
+				token,
+				baseUrl,
+				`projects/${owner}/repos/${repo}/pull-requests/${id}`,
+				{
+					method: 'GET',
+				},
+				scope,
+			);
+
+			if (prResponse) {
+				const providersPr = normalizeBitbucketServerPullRequest(prResponse);
+				const gitlensPr = fromProviderPullRequest(providersPr, integration);
+				return gitlensPr;
+			}
+		} catch (ex) {
+			if (ex.original?.status !== 404) {
+				Logger.error(ex, scope);
+				return undefined;
+			}
+		}
+
+		return undefined;
+	}
+
 	@debug<BitbucketApi['getRepositoriesForWorkspace']>({ args: { 0: p => p.name, 1: '<token>' } })
 	async getRepositoriesForWorkspace(
 		provider: Provider,