debt - use Set for cloneAndChange

jrieken · jrieken · commit 1701b8d3bd41 · 2018-11-30T18:20:55.000+01:00
diff --git a/src/vs/base/common/objects.ts b/src/vs/base/common/objects.ts
@@ -47,10 +47,10 @@ export function deepFreeze<T>(obj: T): T {
 const _hasOwnProperty = Object.prototype.hasOwnProperty;
 
 export function cloneAndChange(obj: any, changer: (orig: any) => any): any {
-	return _cloneAndChange(obj, changer, []);
+	return _cloneAndChange(obj, changer, new Set());
 }
 
-function _cloneAndChange(obj: any, changer: (orig: any) => any, encounteredObjects: any[]): any {
+function _cloneAndChange(obj: any, changer: (orig: any) => any, seen: Set<any>): any {
 	if (isUndefinedOrNull(obj)) {
 		return obj;
 	}
@@ -63,23 +63,23 @@ function _cloneAndChange(obj: any, changer: (orig: any) => any, encounteredObjec
 	if (isArray(obj)) {
 		const r1: any[] = [];
 		for (let i1 = 0; i1 < obj.length; i1++) {
-			r1.push(_cloneAndChange(obj[i1], changer, encounteredObjects));
+			r1.push(_cloneAndChange(obj[i1], changer, seen));
 		}
 		return r1;
 	}
 
 	if (isObject(obj)) {
-		if (encounteredObjects.indexOf(obj) >= 0) {
+		if (seen.has(obj)) {
 			throw new Error('Cannot clone recursive data-structure');
 		}
-		encounteredObjects.push(obj);
+		seen.add(obj);
 		const r2 = {};
 		for (let i2 in obj) {
 			if (_hasOwnProperty.call(obj, i2)) {
-				(r2 as any)[i2] = _cloneAndChange(obj[i2], changer, encounteredObjects);
+				(r2 as any)[i2] = _cloneAndChange(obj[i2], changer, seen);
 			}
 		}
-		encounteredObjects.pop();
+		seen.delete(obj);
 		return r2;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -47,10 +47,10 @@ export function deepFreeze<T>(obj: T): T {`
`47`	`47`	`const _hasOwnProperty = Object.prototype.hasOwnProperty;`
`48`	`48`
`49`	`49`	`export function cloneAndChange(obj: any, changer: (orig: any) => any): any {`
`50`		`- return _cloneAndChange(obj, changer, []);`
	`50`	`+ return _cloneAndChange(obj, changer, new Set());`
`51`	`51`	`}`
`52`	`52`
`53`		`-function _cloneAndChange(obj: any, changer: (orig: any) => any, encounteredObjects: any[]): any {`
	`53`	`+function _cloneAndChange(obj: any, changer: (orig: any) => any, seen: Set<any>): any {`
`54`	`54`	`if (isUndefinedOrNull(obj)) {`
`55`	`55`	`return obj;`
`56`	`56`	`}`
`@@ -63,23 +63,23 @@ function _cloneAndChange(obj: any, changer: (orig: any) => any, encounteredObjec`
`63`	`63`	`if (isArray(obj)) {`
`64`	`64`	`const r1: any[] = [];`
`65`	`65`	`for (let i1 = 0; i1 < obj.length; i1++) {`
`66`		`- r1.push(_cloneAndChange(obj[i1], changer, encounteredObjects));`
	`66`	`+ r1.push(_cloneAndChange(obj[i1], changer, seen));`
`67`	`67`	`}`
`68`	`68`	`return r1;`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`if (isObject(obj)) {`
`72`		`- if (encounteredObjects.indexOf(obj) >= 0) {`
	`72`	`+ if (seen.has(obj)) {`
`73`	`73`	`throw new Error('Cannot clone recursive data-structure');`
`74`	`74`	`}`
`75`		`- encounteredObjects.push(obj);`
	`75`	`+ seen.add(obj);`
`76`	`76`	`const r2 = {};`
`77`	`77`	`for (let i2 in obj) {`
`78`	`78`	`if (_hasOwnProperty.call(obj, i2)) {`
`79`		`- (r2 as any)[i2] = _cloneAndChange(obj[i2], changer, encounteredObjects);`
	`79`	`+ (r2 as any)[i2] = _cloneAndChange(obj[i2], changer, seen);`
`80`	`80`	`}`
`81`	`81`	`}`
`82`		`- encounteredObjects.pop();`
	`82`	`+ seen.delete(obj);`
`83`	`83`	`return r2;`
`84`	`84`	`}`
`85`	`85`