Adds AutolinkType to cache keys for issue/PR retrieval

preventing potential cache collisions.
(#4193, #4233)

Author: sergeibbb

CHANGELOG.md

@@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ### Fixed
 
+- Fixes cache collision between issues and PRs in autolinks ([#4193](https://github.com/gitkraken/vscode-gitlens/issues/4193))
 - Fixes incorrect PR Link Across Azure DevOps Projects ([#4207](https://github.com/gitkraken/vscode-gitlens/issues/4207))
 - Fixes detail view incorrectly parses GitHub account in commit message ([#3246](https://github.com/gitkraken/vscode-gitlens/issues/3246))
 

src/cache.ts

@@ -1,5 +1,6 @@
 // import type { EnrichedAutolink } from './annotations/autolinks';
 import type { Disposable } from './api/gitlens';
+import type { AutolinkType } from './autolinks/models/autolinks';
 import type { Container } from './container';
 import type { Account } from './git/models/author';
 import type { DefaultBranch } from './git/models/defaultBranch';
@@ -111,6 +112,7 @@ export class CacheProvider implements Disposable {
 
 	getIssueOrPullRequest(
 		id: string,
+		type: AutolinkType | undefined,
 		resource: ResourceDescriptor,
 		integration: IntegrationBase | undefined,
 		cacheable: Cacheable<IssueOrPullRequest>,
@@ -119,11 +121,11 @@ export class CacheProvider implements Disposable {
 		const { key, etag } = getResourceKeyAndEtag(resource, integration);
 
 		if (resource == null) {
-			return this.get('issuesOrPrsById', `id:${id}:${key}`, etag, cacheable, options);
+			return this.get('issuesOrPrsById', `id:${id}:${key}:${type ?? 'unknown'}`, etag, cacheable, options);
 		}
 		return this.get(
 			'issuesOrPrsByIdAndRepo',
-			`id:${id}:${key}:${JSON.stringify(resource)}}`,
+			`id:${id}:${key}:${type ?? 'unknown'}:${JSON.stringify(resource)}}`,
 			etag,
 			cacheable,
 			options,
@@ -140,11 +142,17 @@ export class CacheProvider implements Disposable {
 		const { key, etag } = getResourceKeyAndEtag(resource, integration);
 
 		if (resource == null) {
-			return this.get('issuesById', `id:${id}:${key}`, etag, cacheable, options);
+			return this.get(
+				'issuesById',
+				`id:${id}:${key}:${'issue' satisfies AutolinkType}`,
+				etag,
+				cacheable,
+				options,
+			);
 		}
 		return this.get(
 			'issuesByIdAndResource',
-			`id:${id}:${key}:${JSON.stringify(resource)}}`,
+			`id:${id}:${key}:${'issue' satisfies AutolinkType}:${JSON.stringify(resource)}}`,
 			etag,
 			cacheable,
 			options,
@@ -161,9 +169,21 @@ export class CacheProvider implements Disposable {
 		const { key, etag } = getResourceKeyAndEtag(resource, integration);
 
 		if (resource == null) {
-			return this.get('prsById', `id:${id}:${key}`, etag, cacheable, options);
+			return this.get(
+				'prsById',
+				`id:${id}:${key}:${'pullrequest' satisfies AutolinkType}`,
+				etag,
+				cacheable,
+				options,
+			);
 		}
-		return this.get('prsById', `id:${id}:${key}:${JSON.stringify(resource)}}`, etag, cacheable, options);
+		return this.get(
+			'prsById',
+			`id:${id}:${key}:${'pullrequest' satisfies AutolinkType}:${JSON.stringify(resource)}}`,
+			etag,
+			cacheable,
+			options,
+		);
 	}
 
 	getPullRequestForBranch(
@@ -264,7 +284,12 @@ export class CacheProvider implements Disposable {
 			if (isPromise(item.value)) {
 				void item.value.then(v => {
 					if (v != null) {
-						this.set('issuesOrPrsById', `id:${v.id}:${key}`, v, etag);
+						this.set(
+							'issuesOrPrsById',
+							`id:${v.id}:${key}:${'pullrequest' satisfies AutolinkType}`,
+							v,
+							etag,
+						);
 					}
 				});
 			}

src/plus/integrations/integration.ts

@@ -465,6 +465,7 @@ export abstract class IntegrationBase<
 
 		const issueOrPR = this.container.cache.getIssueOrPullRequest(
 			id,
+			options?.type,
 			resource,
 			this,
 			() => ({