Add map state test to forEach

dbaeumer · dbaeumer · commit 480272dc7989 · 2020-05-11T11:28:28.000+02:00
diff --git a/src/vs/base/common/map.ts b/src/vs/base/common/map.ts
@@ -580,7 +580,9 @@ export const enum Touch {
 	AsNew = 2
 }
 
-export class LinkedMap<K, V> {
+export class LinkedMap<K, V> implements Map<K, V> {
+
+	readonly [Symbol.toStringTag] = 'LinkedMap';
 
 	private _map: Map<K, Item<K, V>>;
 	private _head: Item<K, V> | undefined;
@@ -636,7 +638,7 @@ export class LinkedMap<K, V> {
 		return item.value;
 	}
 
-	set(key: K, value: V, touch: Touch = Touch.None): void {
+	set(key: K, value: V, touch: Touch = Touch.None): this {
 		let item = this._map.get(key);
 		if (item) {
 			item.value = value;
@@ -662,6 +664,7 @@ export class LinkedMap<K, V> {
 			this._map.set(key, item);
 			this._size++;
 		}
+		return this;
 	}
 
 	delete(key: K): boolean {
@@ -694,13 +697,17 @@ export class LinkedMap<K, V> {
 	}
 
 	forEach(callbackfn: (value: V, key: K, map: LinkedMap<K, V>) => void, thisArg?: any): void {
+		const state = this._state;
 		let current = this._head;
 		while (current) {
 			if (thisArg) {
 				callbackfn.bind(thisArg)(current.value, current.key, this);
 			} else {
 				callbackfn(current.value, current.key, this);
 			}
+			if (this._state !== state) {
+				throw new Error(`LinkedMap got modified during iteration.`);
+			}
 			current = current.next;
 		}
 	}
@@ -987,9 +994,10 @@ export class LRUCache<K, V> extends LinkedMap<K, V> {
 		return super.get(key, Touch.None);
 	}
 
-	set(key: K, value: V): void {
+	set(key: K, value: V): this {
 		super.set(key, value, Touch.AsNew);
 		this.checkTrim();
+		return this;
 	}
 
 	private checkTrim() {

Original file line number	Diff line number	Diff line change
`@@ -580,7 +580,9 @@ export const enum Touch {`
`580`	`580`	`AsNew = 2`
`581`	`581`	`}`
`582`	`582`
`583`		`-export class LinkedMap<K, V> {`
	`583`	`+export class LinkedMap<K, V> implements Map<K, V> {`
	`584`	`+`
	`585`	`+ readonly [Symbol.toStringTag] = 'LinkedMap';`
`584`	`586`
`585`	`587`	`private _map: Map<K, Item<K, V>>;`
`586`	`588`	`private _head: Item<K, V> \| undefined;`
`@@ -636,7 +638,7 @@ export class LinkedMap<K, V> {`
`636`	`638`	`return item.value;`
`637`	`639`	`}`
`638`	`640`
`639`		`- set(key: K, value: V, touch: Touch = Touch.None): void {`
	`641`	`+ set(key: K, value: V, touch: Touch = Touch.None): this {`
`640`	`642`	`let item = this._map.get(key);`
`641`	`643`	`if (item) {`
`642`	`644`	`item.value = value;`
`@@ -662,6 +664,7 @@ export class LinkedMap<K, V> {`
`662`	`664`	`this._map.set(key, item);`
`663`	`665`	`this._size++;`
`664`	`666`	`}`
	`667`	`+ return this;`
`665`	`668`	`}`
`666`	`669`
`667`	`670`	`delete(key: K): boolean {`
`@@ -694,13 +697,17 @@ export class LinkedMap<K, V> {`
`694`	`697`	`}`
`695`	`698`
`696`	`699`	`forEach(callbackfn: (value: V, key: K, map: LinkedMap<K, V>) => void, thisArg?: any): void {`
	`700`	`+ const state = this._state;`
`697`	`701`	`let current = this._head;`
`698`	`702`	`while (current) {`
`699`	`703`	`if (thisArg) {`
`700`	`704`	`callbackfn.bind(thisArg)(current.value, current.key, this);`
`701`	`705`	`} else {`
`702`	`706`	`callbackfn(current.value, current.key, this);`
`703`	`707`	`}`
	`708`	`+ if (this._state !== state) {`
	`709`	+ throw new Error(`LinkedMap got modified during iteration.`);
	`710`	`+ }`
`704`	`711`	`current = current.next;`
`705`	`712`	`}`
`706`	`713`	`}`
`@@ -987,9 +994,10 @@ export class LRUCache<K, V> extends LinkedMap<K, V> {`
`987`	`994`	`return super.get(key, Touch.None);`
`988`	`995`	`}`
`989`	`996`
`990`		`- set(key: K, value: V): void {`
	`997`	`+ set(key: K, value: V): this {`
`991`	`998`	`super.set(key, value, Touch.AsNew);`
`992`	`999`	`this.checkTrim();`
	`1000`	`+ return this;`
`993`	`1001`	`}`
`994`	`1002`
`995`	`1003`	`private checkTrim() {`