Fixes #4692 differs cache keys for autolink refs

- Ensures that filtered autolink refs aren't cached

Author: eamodio

src/autolinks/autolinksProvider.ts

@@ -120,7 +120,7 @@ export class AutolinksProvider implements Disposable {
 			}
 		}
 
-		if (promises.length === 0) return;
+		if (!promises.length) return;
 
 		await Promise.allSettled(promises);
 	}
@@ -144,7 +144,7 @@ export class AutolinksProvider implements Disposable {
 	}
 
 	private async getRefSets(remote?: GitRemote, forBranch?: boolean) {
-		return this._refsetCache.get(remote?.remoteKey, async () => {
+		return this._refsetCache.get(`${remote?.remoteKey}${forBranch ? ':branch' : ''}`, async () => {
 			const refsets: RefSet[] = [];
 
 			await this.collectIntegrationAutolinks(forBranch ? undefined : remote, refsets);
@@ -158,29 +158,21 @@ export class AutolinksProvider implements Disposable {
 	/** @returns A sorted list of autolinks. the first match is the most relevant */
 	async getBranchAutolinks(branchName: string, remote?: GitRemote): Promise<Map<string, Autolink>> {
 		const refsets = await this.getRefSets(remote, true);
-		if (refsets.length === 0) return emptyAutolinkMap;
+		if (!refsets.length) return emptyAutolinkMap;
 
 		return getBranchAutolinks(branchName, refsets);
 	}
 
-	@debug<AutolinksProvider['getAutolinks']>({
-		args: {
-			0: '<message>',
-			1: false,
-		},
-	})
+	@debug<AutolinksProvider['getAutolinks']>({ args: { 0: '<message>', 1: false } })
 	async getAutolinks(message: string, remote?: GitRemote): Promise<Map<string, Autolink>> {
 		const refsets = await this.getRefSets(remote);
-		if (refsets.length === 0) return emptyAutolinkMap;
+		if (!refsets.length) return emptyAutolinkMap;
 
 		return getAutolinks(message, refsets);
 	}
 
 	getAutolinkEnrichableId(autolink: Autolink): { id: string; key: string } {
-		return {
-			id: autolink.id,
-			key: `${autolink.prefix}${autolink.id}`,
-		};
+		return { id: autolink.id, key: `${autolink.prefix}${autolink.id}` };
 	}
 
 	async getEnrichedAutolinks(
@@ -205,7 +197,7 @@ export class AutolinksProvider implements Disposable {
 		if (typeof messageOrAutolinks === 'string') {
 			messageOrAutolinks = await this.getAutolinks(messageOrAutolinks, remote);
 		}
-		if (messageOrAutolinks.size === 0) return undefined;
+		if (!messageOrAutolinks.size) return undefined;
 
 		let integration = await remote?.getIntegration();
 		if (integration != null) {
@@ -339,7 +331,7 @@ export class AutolinksProvider implements Disposable {
 			}
 		}
 
-		if (tokenMapping.size !== 0) {
+		if (tokenMapping.size) {
 			// eslint-disable-next-line no-control-regex
 			text = text.replace(/(\x00\d+\x00)/g, (_, t: string) => tokenMapping.get(t) ?? t);
 		}
@@ -388,10 +380,9 @@ export class AutolinksProvider implements Disposable {
 									if (issueResult?.value != null) {
 										if (issueResult.paused) {
 											if (footnotes != null && !prs?.has(num)) {
-												let name = ref.description?.replace(numRegex, num);
-												if (name == null) {
-													name = `Custom Autolink ${ref.prefix}${num}`;
-												}
+												const name =
+													ref.description?.replace(numRegex, num) ??
+													`Custom Autolink ${ref.prefix}${num}`;
 												footnoteIndex = footnotes.size + 1;
 												footnotes.set(
 													footnoteIndex,
@@ -426,10 +417,9 @@ export class AutolinksProvider implements Disposable {
 											)}`;
 										}
 									} else if (footnotes != null && !prs?.has(num)) {
-										let name = ref.description?.replace(numRegex, num);
-										if (name == null) {
-											name = `Custom Autolink ${ref.prefix}${num}`;
-										}
+										const name =
+											ref.description?.replace(numRegex, num) ??
+											`Custom Autolink ${ref.prefix}${num}`;
 										footnoteIndex = footnotes.size + 1;
 										footnotes.set(
 											footnoteIndex,
@@ -460,10 +450,9 @@ export class AutolinksProvider implements Disposable {
 									if (issueResult?.value != null) {
 										if (issueResult.paused) {
 											if (footnotes != null && !prs?.has(num)) {
-												let name = ref.description?.replace(numRegex, num);
-												if (name == null) {
-													name = `Custom Autolink ${ref.prefix}${num}`;
-												}
+												const name =
+													ref.description?.replace(numRegex, num) ??
+													`Custom Autolink ${ref.prefix}${num}`;
 												footnoteIndex = footnotes.size + 1;
 												footnotes.set(
 													footnoteIndex,
@@ -498,10 +487,9 @@ export class AutolinksProvider implements Disposable {
 											)}`;
 										}
 									} else if (footnotes != null && !prs?.has(num)) {
-										let name = ref.description?.replace(numRegex, num);
-										if (name == null) {
-											name = `Custom Autolink ${ref.prefix}${num}`;
-										}
+										const name =
+											ref.description?.replace(numRegex, num) ??
+											`Custom Autolink ${ref.prefix}${num}`;
 										footnoteIndex = footnotes.size + 1;
 										footnotes.set(
 											footnoteIndex,