Renames & tweaks the new Map/Set classes

Updates the CHANGELOG

Author: eamodio

CHANGELOG.md

@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 ### Fixed
 
 - Fixes [#3592](https://github.com/gitkraken/vscode-gitlens/issues/3592) - Connecting to an integration via Remotes view (but likely others) doesn't work
+- Fixes [#3571](https://github.com/gitkraken/vscode-gitlens/issues/3571) - Gitlens fails to register buttons on top-right corner — thanks to [PR #3605](https://github.com/gitkraken/vscode-gitlens/pull/3605) by Jean Pierre ([@jeanp413](https://github.com/jeanp413))
 - Fixes an issue where virtual repositories for GitHub PRs from forks wouldn't load properly
 - Fixes an issue where deleting a worktree would not always remove the worktree from the view
 

README.md

@@ -449,6 +449,7 @@ A big thanks to the people that have contributed to this project 🙏❤️:
 - may ([@m4rch3n1ng](https://github.com/m4rch3n1ng)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=m4rch3n1ng)
 - bm-w ([@bm-w](https://github.com/bm-w)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=bm-w)
 - Tyler Johnson ([@TJohnsonSE](https://github.com/TJohnsonSE)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=TJohnsonSE)
+- Jean Pierre ([@jeanp413](https://github.com/jeanp413)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=jeanp413)
 
 Also special thanks to the people that have provided support, testing, brainstorming, etc:
 

src/annotations/fileAnnotationController.ts

@@ -33,7 +33,7 @@ import { registerCommand } from '../system/vscode/command';
 import { configuration } from '../system/vscode/configuration';
 import { setContext } from '../system/vscode/context';
 import type { KeyboardScope } from '../system/vscode/keyboard';
-import { ResourceSet } from '../system/vscode/map';
+import { UriSet } from '../system/vscode/uriMap';
 import { isTrackableTextEditor } from '../system/vscode/utils';
 import type {
 	DocumentBlameStateChangeEvent,
@@ -328,8 +328,8 @@ export class FileAnnotationController implements Disposable {
 		debouncedRestore(editor);
 	}
 
-	private readonly _annotatedUris = new ResourceSet();
-	private readonly _computingUris = new ResourceSet();
+	private readonly _annotatedUris = new UriSet();
+	private readonly _computingUris = new UriSet();
 
 	async onProviderEditorStatusChanged(editor: TextEditor | undefined, status: AnnotationStatus | undefined) {
 		if (editor == null) return;

src/system/vscode/map.ts

@@ -0,0 +1,136 @@
+import type { Uri } from 'vscode';
+
+type UriMapEntry<T> = {
+	readonly uri: Uri;
+	readonly value: T;
+};
+
+export class UriMap<T> implements Map<Uri, T> {
+	private static readonly defaultToKey = (resource: Uri) => resource.toString();
+
+	readonly [Symbol.toStringTag] = 'UriMap';
+	private readonly _map: Map<string, UriMapEntry<T>>;
+
+	constructor(entries?: readonly (readonly [Uri, T])[]) {
+		this._map = new Map();
+		if (entries?.length) {
+			for (const [uri, value] of entries) {
+				this.set(uri, value);
+			}
+		}
+	}
+
+	set(uri: Uri, value: T): this {
+		this._map.set(UriMap.defaultToKey(uri), { uri: uri, value: value });
+		return this;
+	}
+
+	get(uri: Uri): T | undefined {
+		return this._map.get(UriMap.defaultToKey(uri))?.value;
+	}
+
+	has(uri: Uri): boolean {
+		return this._map.has(UriMap.defaultToKey(uri));
+	}
+
+	get size(): number {
+		return this._map.size;
+	}
+
+	clear(): void {
+		this._map.clear();
+	}
+
+	delete(uri: Uri): boolean {
+		return this._map.delete(UriMap.defaultToKey(uri));
+	}
+
+	forEach(callbackfn: (value: T, key: Uri, map: Map<Uri, T>) => void, thisArg?: any): void {
+		if (typeof thisArg !== 'undefined') {
+			callbackfn = callbackfn.bind(thisArg);
+		}
+		for (const [_, entry] of this._map) {
+			callbackfn(entry.value, entry.uri, this);
+		}
+	}
+
+	*values(): MapIterator<T> {
+		for (const entry of this._map.values()) {
+			yield entry.value;
+		}
+	}
+
+	*keys(): MapIterator<Uri> {
+		for (const entry of this._map.values()) {
+			yield entry.uri;
+		}
+	}
+
+	*entries(): MapIterator<[Uri, T]> {
+		for (const entry of this._map.values()) {
+			yield [entry.uri, entry.value];
+		}
+	}
+
+	*[Symbol.iterator](): MapIterator<[Uri, T]> {
+		for (const [, entry] of this._map) {
+			yield [entry.uri, entry.value];
+		}
+	}
+}
+
+export class UriSet implements Set<Uri> {
+	readonly [Symbol.toStringTag]: string = 'UriSet';
+
+	private readonly _map: UriMap<Uri>;
+
+	constructor(entries?: readonly Uri[]) {
+		this._map = new UriMap();
+		if (entries?.length) {
+			for (const uri of entries) {
+				this.add(uri);
+			}
+		}
+	}
+
+	get size(): number {
+		return this._map.size;
+	}
+
+	add(uri: Uri): this {
+		this._map.set(uri, uri);
+		return this;
+	}
+
+	clear(): void {
+		this._map.clear();
+	}
+
+	delete(uri: Uri): boolean {
+		return this._map.delete(uri);
+	}
+
+	forEach(callbackfn: (value: Uri, value2: Uri, set: Set<Uri>) => void, thisArg?: any): void {
+		this._map.forEach((_value, key) => callbackfn.call(thisArg, key, key, this));
+	}
+
+	has(uri: Uri): boolean {
+		return this._map.has(uri);
+	}
+
+	entries(): SetIterator<[Uri, Uri]> {
+		return this._map.entries();
+	}
+
+	keys(): SetIterator<Uri> {
+		return this._map.keys();
+	}
+
+	values(): SetIterator<Uri> {
+		return this._map.keys();
+	}
+
+	[Symbol.iterator](): SetIterator<Uri> {
+		return this.keys();
+	}
+}

src/system/vscode/uriMap.ts

@@ -22,7 +22,7 @@ import type { Deferrable } from '../system/function';
 import { debounce } from '../system/function';
 import { configuration } from '../system/vscode/configuration';
 import { setContext } from '../system/vscode/context';
-import { ResourceSet } from '../system/vscode/map';
+import { UriSet } from '../system/vscode/uriMap';
 import { findTextDocument, isVisibleDocument } from '../system/vscode/utils';
 import type { TrackedGitDocument } from './trackedDocument';
 import { createTrackedGitDocument } from './trackedDocument';
@@ -415,8 +415,8 @@ export class GitDocumentTracker implements Disposable {
 		(tracked ?? (await docPromise))?.dispose();
 	}
 
-	private readonly _openUrisBlameable = new ResourceSet();
-	private readonly _openUrisTracked = new ResourceSet();
+	private readonly _openUrisBlameable = new UriSet();
+	private readonly _openUrisTracked = new UriSet();
 	private _updateContextDebounced: Deferrable<() => void> | undefined;
 
 	updateContext(uri: Uri, blameable: boolean, tracked: boolean) {