Merge branch 'main' into 2959/autosquash

Author: gabeseltzer

CHANGELOG.md

@@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - Adds AI model status and model switcher to the _Home_ view ([#4064](https://github.com/gitkraken/vscode-gitlens/issues/4064))
 - Adds Anthropic Claude 3.7 Sonnet model for GitLens' AI features ([#4101](https://github.com/gitkraken/vscode-gitlens/issues/4101))
 - Adds Google Gemini 2.0 Flash-Lite model for GitLens' AI features ([#4104](https://github.com/gitkraken/vscode-gitlens/issues/4104))
+- Adds integration with Bitbucket Cloud by showing enriched links to PRs and issues [#4045](https://github.com/gitkraken/vscode-gitlens/issues/4045)
 
 ### Changed
 

package.json

@@ -20253,7 +20253,7 @@
 		"@types/slug": "5.0.9",
 		"@types/sortablejs": "1.15.8",
 		"@types/vscode": "1.92.0",
-		"@typescript-eslint/parser": "8.24.1",
+		"@typescript-eslint/parser": "8.25.0",
 		"@vscode/test-cli": "^0.0.10",
 		"@vscode/test-electron": "2.4.1",
 		"@vscode/test-web": "0.0.66",
@@ -20290,15 +20290,15 @@
 		"playwright": "1.50.1",
 		"prettier": "3.1.0",
 		"regex-to-strings": "2.1.0",
-		"sass": "1.85.0",
+		"sass": "1.85.1",
 		"sass-loader": "16.0.5",
 		"schema-utils": "4.3.0",
 		"sharp": "0.33.5",
 		"svgo": "3.3.2",
 		"terser-webpack-plugin": "5.3.11",
 		"ts-loader": "9.5.2",
 		"typescript": "5.8.1-rc",
-		"typescript-eslint": "8.24.1",
+		"typescript-eslint": "8.25.0",
 		"webpack": "5.98.0",
 		"webpack-bundle-analyzer": "4.10.2",
 		"webpack-cli": "6.0.1",
@@ -20311,5 +20311,5 @@
 		"node-fetch": "2.7.0",
 		"semver-regex": "4.0.5"
 	},
-	"packageManager": "pnpm@10.4.1"
+	"packageManager": "pnpm@10.5.0"
 }

pnpm-lock.yaml

@@ -248,9 +248,12 @@ export class AutolinksProvider implements Disposable {
 					? integration.getIssueOrPullRequest(
 							link.descriptor ?? remote.provider.repoDesc,
 							this.getAutolinkEnrichableId(link),
+							{ type: link.type },
 					  )
 					: link.descriptor != null
-					  ? linkIntegration?.getIssueOrPullRequest(link.descriptor, this.getAutolinkEnrichableId(link))
+					  ? linkIntegration?.getIssueOrPullRequest(link.descriptor, this.getAutolinkEnrichableId(link), {
+								type: link.type,
+					    })
 					  : undefined;
 			enrichedAutolinks.set(id, [issueOrPullRequestPromise, link]);
 		}

src/autolinks/autolinksProvider.ts

@@ -36,6 +36,7 @@ import { ConfiguredIntegrationService } from './plus/integrations/authentication
 import { IntegrationAuthenticationService } from './plus/integrations/authentication/integrationAuthenticationService';
 import { IntegrationService } from './plus/integrations/integrationService';
 import type { AzureDevOpsApi } from './plus/integrations/providers/azure/azure';
+import type { BitbucketApi } from './plus/integrations/providers/bitbucket/bitbucket';
 import type { GitHubApi } from './plus/integrations/providers/github/github';
 import type { GitLabApi } from './plus/integrations/providers/gitlab/gitlab';
 import { EnrichmentService } from './plus/launchpad/enrichmentService';
@@ -487,6 +488,30 @@ export class Container {
 		return this._azure;
 	}
 
+	private _bitbucket: Promise<BitbucketApi | undefined> | undefined;
+	get bitbucket(): Promise<BitbucketApi | undefined> {
+		if (this._bitbucket == null) {
+			async function load(this: Container) {
+				try {
+					const bitbucket = new (
+						await import(
+							/* webpackChunkName: "integrations" */ './plus/integrations/providers/bitbucket/bitbucket'
+						)
+					).BitbucketApi(this);
+					this._disposables.push(bitbucket);
+					return bitbucket;
+				} catch (ex) {
+					Logger.error(ex);
+					return undefined;
+				}
+			}
+
+			this._bitbucket = load.call(this);
+		}
+
+		return this._bitbucket;
+	}
+
 	private _github: Promise<GitHubApi | undefined> | undefined;
 	get github(): Promise<GitHubApi | undefined> {
 		if (this._github == null) {

src/container.ts

@@ -76,11 +76,6 @@ export interface IssueRepository {
 	id?: string;
 }
 
-export interface SearchedIssue {
-	issue: IssueShape;
-	reasons: string[];
-}
-
 export type IssueRepositoryIdentityDescriptor = RequireSomeWithProps<
 	RequireSome<RepositoryIdentityDescriptor<string>, 'provider'>,
 	'provider',

src/git/models/issue.ts

@@ -185,8 +185,3 @@ export type PullRequestRepositoryIdentityDescriptor = RequireSomeWithProps<
 	'id' | 'domain' | 'repoDomain' | 'repoName'
 > &
 	RequireSomeWithProps<RequireSome<RepositoryIdentityDescriptor<string>, 'remote'>, 'remote', 'domain'>;
-
-export interface SearchedPullRequest {
-	pullRequest: PullRequest;
-	reasons: string[];
-}

src/git/models/pullRequest.ts

@@ -14,14 +14,9 @@ import { AuthenticationError, CancellationError, RequestClientError } from '../.
 import type { PagedResult } from '../../git/gitProvider';
 import type { Account, UnidentifiedAuthor } from '../../git/models/author';
 import type { DefaultBranch } from '../../git/models/defaultBranch';
-import type { Issue, SearchedIssue } from '../../git/models/issue';
-import type { IssueOrPullRequest } from '../../git/models/issueOrPullRequest';
-import type {
-	PullRequest,
-	PullRequestMergeMethod,
-	PullRequestState,
-	SearchedPullRequest,
-} from '../../git/models/pullRequest';
+import type { Issue, IssueShape } from '../../git/models/issue';
+import type { IssueOrPullRequest, IssueOrPullRequestType } from '../../git/models/issueOrPullRequest';
+import type { PullRequest, PullRequestMergeMethod, PullRequestState } from '../../git/models/pullRequest';
 import type { RepositoryMetadata } from '../../git/models/repositoryMetadata';
 import type { PullRequestUrlIdentity } from '../../git/utils/pullRequest.utils';
 import { showIntegrationDisconnectedTooManyFailedRequestsWarningMessage } from '../../messages';
@@ -418,16 +413,16 @@ export abstract class IntegrationBase<
 	async searchMyIssues(
 		resource?: ResourceDescriptor,
 		cancellation?: CancellationToken,
-	): Promise<SearchedIssue[] | undefined>;
+	): Promise<IssueShape[] | undefined>;
 	async searchMyIssues(
 		resources?: ResourceDescriptor[],
 		cancellation?: CancellationToken,
-	): Promise<SearchedIssue[] | undefined>;
+	): Promise<IssueShape[] | undefined>;
 	@debug()
 	async searchMyIssues(
 		resources?: ResourceDescriptor | ResourceDescriptor[],
 		cancellation?: CancellationToken,
-	): Promise<SearchedIssue[] | undefined> {
+	): Promise<IssueShape[] | undefined> {
 		const scope = getLogScope();
 		const connected = this.maybeConnected ?? (await this.isConnected());
 		if (!connected) return undefined;
@@ -441,21 +436,21 @@ export abstract class IntegrationBase<
 			this.resetRequestExceptionCount();
 			return issues;
 		} catch (ex) {
-			return this.handleProviderException<SearchedIssue[] | undefined>(ex, scope, undefined);
+			return this.handleProviderException<IssueShape[] | undefined>(ex, scope, undefined);
 		}
 	}
 
 	protected abstract searchProviderMyIssues(
 		session: ProviderAuthenticationSession,
 		resources?: ResourceDescriptor[],
 		cancellation?: CancellationToken,
-	): Promise<SearchedIssue[] | undefined>;
+	): Promise<IssueShape[] | undefined>;
 
 	@debug()
 	async getIssueOrPullRequest(
 		resource: T,
 		id: string,
-		options?: { expiryOverride?: boolean | number },
+		options?: { expiryOverride?: boolean | number; type?: IssueOrPullRequestType },
 	): Promise<IssueOrPullRequest | undefined> {
 		const scope = getLogScope();
 
@@ -469,7 +464,12 @@ export abstract class IntegrationBase<
 			() => ({
 				value: (async () => {
 					try {
-						const result = await this.getProviderIssueOrPullRequest(this._session!, resource, id);
+						const result = await this.getProviderIssueOrPullRequest(
+							this._session!,
+							resource,
+							id,
+							options?.type,
+						);
 						this.resetRequestExceptionCount();
 						return result;
 					} catch (ex) {
@@ -486,6 +486,7 @@ export abstract class IntegrationBase<
 		session: ProviderAuthenticationSession,
 		resource: T,
 		id: string,
+		type: undefined | IssueOrPullRequestType,
 	): Promise<IssueOrPullRequest | undefined>;
 
 	@debug()
@@ -660,7 +661,7 @@ export abstract class IssueIntegration<
 	async getIssuesForProject(
 		project: T,
 		options?: { user?: string; filters?: IssueFilter[] },
-	): Promise<SearchedIssue[] | undefined> {
+	): Promise<IssueShape[] | undefined> {
 		const connected = this.maybeConnected ?? (await this.isConnected());
 		if (!connected) return undefined;
 
@@ -669,15 +670,15 @@ export abstract class IssueIntegration<
 			this.resetRequestExceptionCount();
 			return issues;
 		} catch (ex) {
-			return this.handleProviderException<SearchedIssue[] | undefined>(ex, undefined, undefined);
+			return this.handleProviderException<IssueShape[] | undefined>(ex, undefined, undefined);
 		}
 	}
 
 	protected abstract getProviderIssuesForProject(
 		session: ProviderAuthenticationSession,
 		project: T,
 		options?: { user?: string; filters?: IssueFilter[] },
-	): Promise<SearchedIssue[] | undefined>;
+	): Promise<IssueShape[] | undefined>;
 }
 
 export abstract class HostingIntegration<
@@ -1293,18 +1294,18 @@ export abstract class HostingIntegration<
 		repo?: T,
 		cancellation?: CancellationToken,
 		silent?: boolean,
-	): Promise<IntegrationResult<SearchedPullRequest[] | undefined>>;
+	): Promise<IntegrationResult<PullRequest[] | undefined>>;
 	async searchMyPullRequests(
 		repos?: T[],
 		cancellation?: CancellationToken,
 		silent?: boolean,
-	): Promise<IntegrationResult<SearchedPullRequest[] | undefined>>;
+	): Promise<IntegrationResult<PullRequest[] | undefined>>;
 	@debug()
 	async searchMyPullRequests(
 		repos?: T | T[],
 		cancellation?: CancellationToken,
 		silent?: boolean,
-	): Promise<IntegrationResult<SearchedPullRequest[] | undefined>> {
+	): Promise<IntegrationResult<PullRequest[] | undefined>> {
 		const scope = getLogScope();
 		const connected = this.maybeConnected ?? (await this.isConnected());
 		if (!connected) return undefined;
@@ -1329,7 +1330,7 @@ export abstract class HostingIntegration<
 		repos?: T[],
 		cancellation?: CancellationToken,
 		silent?: boolean,
-	): Promise<SearchedPullRequest[] | undefined>;
+	): Promise<PullRequest[] | undefined>;
 
 	async searchPullRequests(
 		searchQuery: string,

src/plus/integrations/integration.ts

@@ -11,8 +11,8 @@ import type { Source } from '../../constants.telemetry';
 import { sourceToContext } from '../../constants.telemetry';
 import type { Container } from '../../container';
 import type { Account } from '../../git/models/author';
-import type { SearchedIssue } from '../../git/models/issue';
-import type { SearchedPullRequest } from '../../git/models/pullRequest';
+import type { IssueShape } from '../../git/models/issue';
+import type { PullRequest } from '../../git/models/pullRequest';
 import type { GitRemote } from '../../git/models/remote';
 import type { RemoteProvider, RemoteProviderId } from '../../git/remotes/remoteProvider';
 import { configuration } from '../../system/-webview/configuration';
@@ -726,7 +726,7 @@ export class IntegrationService implements Disposable {
 			| SupportedSelfHostedIntegrationIds
 		)[],
 		options?: { openRepositoriesOnly?: boolean; cancellation?: CancellationToken },
-	): Promise<SearchedIssue[] | undefined> {
+	): Promise<IssueShape[] | undefined> {
 		const integrations: Map<Integration, ResourceDescriptor[] | undefined> = new Map();
 		const hostingIntegrationIds = integrationIds?.filter(
 			id => id in HostingIntegrationId || id in SelfHostedIntegrationId,
@@ -796,8 +796,8 @@ export class IntegrationService implements Disposable {
 	private async getMyIssuesCore(
 		integrations: Map<Integration, ResourceDescriptor[] | undefined>,
 		cancellation?: CancellationToken,
-	): Promise<SearchedIssue[] | undefined> {
-		const promises: Promise<SearchedIssue[] | undefined>[] = [];
+	): Promise<IssueShape[] | undefined> {
+		const promises: Promise<IssueShape[] | undefined>[] = [];
 		for (const [integration, repos] of integrations) {
 			if (integration == null) continue;
 
@@ -808,12 +808,12 @@ export class IntegrationService implements Disposable {
 		return [...flatten(filterMap(results, r => (r.status === 'fulfilled' ? r.value : undefined)))];
 	}
 
-	async getMyIssuesForRemotes(remote: GitRemote): Promise<SearchedIssue[] | undefined>;
-	async getMyIssuesForRemotes(remotes: GitRemote[]): Promise<SearchedIssue[] | undefined>;
+	async getMyIssuesForRemotes(remote: GitRemote): Promise<IssueShape[] | undefined>;
+	async getMyIssuesForRemotes(remotes: GitRemote[]): Promise<IssueShape[] | undefined>;
 	@debug<IntegrationService['getMyIssuesForRemotes']>({
 		args: { 0: (r: GitRemote | GitRemote[]) => (Array.isArray(r) ? r.map(rp => rp.name) : r.name) },
 	})
-	async getMyIssuesForRemotes(remoteOrRemotes: GitRemote | GitRemote[]): Promise<SearchedIssue[] | undefined> {
+	async getMyIssuesForRemotes(remoteOrRemotes: GitRemote | GitRemote[]): Promise<IssueShape[] | undefined> {
 		if (!Array.isArray(remoteOrRemotes)) {
 			remoteOrRemotes = [remoteOrRemotes];
 		}
@@ -874,7 +874,7 @@ export class IntegrationService implements Disposable {
 		integrationIds?: (HostingIntegrationId | CloudSelfHostedIntegrationId)[],
 		cancellation?: CancellationToken,
 		silent?: boolean,
-	): Promise<IntegrationResult<SearchedPullRequest[] | undefined>> {
+	): Promise<IntegrationResult<PullRequest[] | undefined>> {
 		const integrations: Map<HostingIntegration, ResourceDescriptor[] | undefined> = new Map();
 		for (const integrationId of integrationIds?.length ? integrationIds : Object.values(HostingIntegrationId)) {
 			let integration;
@@ -894,10 +894,10 @@ export class IntegrationService implements Disposable {
 		integrations: Map<HostingIntegration, ResourceDescriptor[] | undefined>,
 		cancellation?: CancellationToken,
 		silent?: boolean,
-	): Promise<IntegrationResult<SearchedPullRequest[] | undefined>> {
+	): Promise<IntegrationResult<PullRequest[] | undefined>> {
 		const start = Date.now();
 
-		const promises: Promise<IntegrationResult<SearchedPullRequest[] | undefined>>[] = [];
+		const promises: Promise<IntegrationResult<PullRequest[] | undefined>>[] = [];
 		for (const [integration, repos] of integrations) {
 			if (integration == null) continue;
 
@@ -932,16 +932,14 @@ export class IntegrationService implements Disposable {
 		};
 	}
 
-	async getMyPullRequestsForRemotes(remote: GitRemote): Promise<IntegrationResult<SearchedPullRequest[] | undefined>>;
-	async getMyPullRequestsForRemotes(
-		remotes: GitRemote[],
-	): Promise<IntegrationResult<SearchedPullRequest[] | undefined>>;
+	async getMyPullRequestsForRemotes(remote: GitRemote): Promise<IntegrationResult<PullRequest[] | undefined>>;
+	async getMyPullRequestsForRemotes(remotes: GitRemote[]): Promise<IntegrationResult<PullRequest[] | undefined>>;
 	@debug<IntegrationService['getMyPullRequestsForRemotes']>({
 		args: { 0: (r: GitRemote | GitRemote[]) => (Array.isArray(r) ? r.map(rp => rp.name) : r.name) },
 	})
 	async getMyPullRequestsForRemotes(
 		remoteOrRemotes: GitRemote | GitRemote[],
-	): Promise<IntegrationResult<SearchedPullRequest[] | undefined>> {
+	): Promise<IntegrationResult<PullRequest[] | undefined>> {
 		if (!Array.isArray(remoteOrRemotes)) {
 			remoteOrRemotes = [remoteOrRemotes];
 		}

src/plus/integrations/integrationService.ts

@@ -376,22 +376,22 @@ export class AzureDevOpsApi implements Disposable {
 				throw new RequestNotFoundError(ex);
 			case 401: // Unauthorized
 				throw new AuthenticationError('azureDevOps', AuthenticationErrorReason.Unauthorized, ex);
-			// TODO: Learn the Azure API docs and put it in order:
-			// case 403: // Forbidden
-			// 	if (ex.message.includes('rate limit')) {
-			// 		let resetAt: number | undefined;
-
-			// 		const reset = ex.response?.headers?.get('x-ratelimit-reset');
-			// 		if (reset != null) {
-			// 			resetAt = parseInt(reset, 10);
-			// 			if (Number.isNaN(resetAt)) {
-			// 				resetAt = undefined;
-			// 			}
-			// 		}
-
-			// 		throw new RequestRateLimitError(ex, token, resetAt);
-			// 	}
-			// 	throw new AuthenticationError('azure', AuthenticationErrorReason.Forbidden, ex);
+			case 403: // Forbidden
+				// TODO: Learn the Azure API docs and put it in order:
+				// 	if (ex.message.includes('rate limit')) {
+				// 		let resetAt: number | undefined;
+
+				// 		const reset = ex.response?.headers?.get('x-ratelimit-reset');
+				// 		if (reset != null) {
+				// 			resetAt = parseInt(reset, 10);
+				// 			if (Number.isNaN(resetAt)) {
+				// 				resetAt = undefined;
+				// 			}
+				// 		}
+
+				// 		throw new RequestRateLimitError(ex, token, resetAt);
+				// 	}
+				throw new AuthenticationError('azure', AuthenticationErrorReason.Forbidden, ex);
 			case 500: // Internal Server Error
 				Logger.error(ex, scope);
 				if (ex.response != null) {