arrays.distinct do not filter out default string keys

fixes microsoft#3655
bright-spark · Mar 30, 2016 · 6ab2686 · 6ab2686
1 parent 787bd07
commit 6ab2686
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/vs/base/common/arrays.ts b/src/vs/base/common/arrays.ts
@@ -157,7 +157,7 @@ export function distinct<T>(array: T[], keyFn?: (t: T) => string): T[] {
 		});
 	}
 
-	const seen: { [key: string]: boolean; } = {};
+	const seen: { [key: string]: boolean; } = Object.create(null);
 	return array.filter((elem) => {
 		const key = keyFn(elem);
 		if (seen[key]) {

diff --git a/src/vs/base/test/common/arrays.test.ts b/src/vs/base/test/common/arrays.test.ts
@@ -48,5 +48,17 @@ suite('Arrays', () => {
 		assert.equal(arrays.binarySearch(array, 70, compare), ~10);
 
 	});
+
+	test('distinct', function() {
+		function compare(a: string): string {
+			return a;
+		}
+
+		assert.deepEqual(arrays.distinct(['32', '4', '5'], compare), ['32', '4', '5']);
+		assert.deepEqual(arrays.distinct(['32', '4', '5', '4'], compare), ['32', '4', '5']);
+		assert.deepEqual(arrays.distinct(['32', 'constructor', '5', '1'], compare), ['32', 'constructor', '5', '1']);
+		assert.deepEqual(arrays.distinct(['32', 'constructor', 'proto', 'proto', 'constructor'], compare), ['32', 'constructor', 'proto']);
+		assert.deepEqual(arrays.distinct(['32', '4', '5', '32', '4', '5', '32', '4', '5', '5'], compare), ['32', '4', '5']);
+	});
 });