replace items with new uris instead of diffing

Author: connor4312

src/vs/workbench/api/test/browser/extHostTesting.test.ts

@@ -251,6 +251,33 @@ suite('ExtHost Testing', () => {
 			]);
 		});
 
+		test('replaces on uri change', () => {
+			single.expand(single.root.id, Infinity);
+			single.collectDiff();
+
+			const oldA = single.root.children.get('id-a') as TestItemImpl;
+			const uri = single.root.children.get('id-a')!.uri?.with({ path: '/different' });
+			const newA = new TestItemImpl('ctrlId', 'id-a', 'Hello world', uri);
+			newA.children.replace([...oldA.children].map(([_, item]) => item));
+			single.root.children.replace([...single.root.children].map(([id, i]) => id === 'id-a' ? newA : i));
+
+			assert.deepStrictEqual(single.collectDiff(), [
+				{ op: TestDiffOpType.Remove, itemId: new TestId(['ctrlId', 'id-a']).toString() },
+				{
+					op: TestDiffOpType.Add,
+					item: { controllerId: 'ctrlId', expand: TestItemExpandState.NotExpandable, item: { ...convert.TestItem.from(newA) } }
+				},
+				{
+					op: TestDiffOpType.Add,
+					item: { controllerId: 'ctrlId', expand: TestItemExpandState.NotExpandable, item: convert.TestItem.from(newA.children.get('id-aa') as TestItemImpl) }
+				},
+				{
+					op: TestDiffOpType.Add,
+					item: { controllerId: 'ctrlId', expand: TestItemExpandState.NotExpandable, item: convert.TestItem.from(newA.children.get('id-ab') as TestItemImpl) }
+				},
+			]);
+		});
+
 		test('treats in-place replacement as mutation', () => {
 			single.expand(single.root.id, Infinity);
 			single.collectDiff();

src/vs/workbench/contrib/testing/common/testItemCollection.ts

@@ -116,11 +116,6 @@ const diffableProps: { [K in keyof ITestItem]?: (a: ITestItem[K], b: ITestItem[K
 	description: strictEqualComparator,
 	error: strictEqualComparator,
 	sortText: strictEqualComparator,
-	uri: (a, b) => {
-		if (a === b) { return true; }
-		if (!a || !b) { return false; }
-		return a.toString() === b.toString();
-	},
 	tags: (a, b) => {
 		if (a.length !== b.length) {
 			return false;
@@ -134,9 +129,11 @@ const diffableProps: { [K in keyof ITestItem]?: (a: ITestItem[K], b: ITestItem[K
 	},
 };
 
+const diffableEntries = Object.entries(diffableProps) as readonly [keyof ITestItem, (a: any, b: any) => boolean][];
+
 const diffTestItems = (a: ITestItem, b: ITestItem) => {
 	let output: Record<string, unknown> | undefined;
-	for (const [key, cmp] of Object.entries(diffableProps) as [keyof ITestItem, (a: any, b: any) => boolean][]) {
+	for (const [key, cmp] of diffableEntries) {
 		if (!cmp(a[key], b[key])) {
 			if (output) {
 				output[key] = b[key];
@@ -340,7 +337,7 @@ export class TestItemCollection<T extends ITestItemLike> extends Disposable {
 		}
 	}
 
-	private upsertItem(actual: T, parent: CollectionItem<T> | undefined) {
+	private upsertItem(actual: T, parent: CollectionItem<T> | undefined): void {
 		const fullId = TestId.fromExtHostTestItem(actual, this.root.id, parent?.actual);
 
 		// If this test item exists elsewhere in the tree already (exists at an
@@ -383,6 +380,12 @@ export class TestItemCollection<T extends ITestItemLike> extends Disposable {
 		}
 
 		// Case 3: upsert of an existing item by ID, with a new instance
+		if (internal.actual.uri?.toString() !== actual.uri?.toString()) {
+			// If the item has a new URI, re-insert it; we don't support updating
+			// URIs on existing test items.
+			this.removeItem(fullId.toString());
+			return this.upsertItem(actual, parent);
+		}
 		const oldChildren = this.options.getChildren(internal.actual);
 		const oldActual = internal.actual;
 		const update = diffTestItems(this.options.toITestItem(oldActual), this.options.toITestItem(actual));