fixes #67720

src/vs/base/browser/ui/tree/abstractTree.ts

@@ -870,12 +870,36 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
 		this.model = this.createModel(this.view, _options);
 		onDidChangeCollapseStateRelay.input = this.model.onDidChangeCollapseState;
 
-		this.model.onDidSplice(e => {
-			this.eventBufferer.bufferEvents(() => {
-				this.focus.remove(e.deletedNodes);
-				this.selection.remove(e.deletedNodes);
-			});
-		}, null, this.disposables);
+		if (this.options.identityProvider) {
+			const identityProvider = this.options.identityProvider;
+
+			this.model.onDidSplice(e => {
+				if (e.deletedNodes.length === 0) {
+					return;
+				}
+
+				this.eventBufferer.bufferEvents(() => {
+					const map = new Map<string, ITreeNode<T, TFilterData>>();
+
+					for (const node of e.deletedNodes) {
+						map.set(identityProvider.getId(node.element).toString(), node);
+					}
+
+					for (const node of e.insertedNodes) {
+						map.delete(identityProvider.getId(node.element).toString());
+					}
+
+					if (map.size === 0) {
+						return;
+					}
+
+					const deletedNodes = values(map);
+
+					this.focus.remove(deletedNodes);
+					this.selection.remove(deletedNodes);
+				});
+			}, null, this.disposables);
+		}
 
 		this.view.onTap(this.reactOnMouseClick, this, this.disposables);
 		this.view.onMouseClick(this.reactOnMouseClick, this, this.disposables);

src/vs/base/browser/ui/tree/indexTreeModel.ts

@@ -173,7 +173,7 @@ export class IndexTreeModel<T extends Exclude<any, undefined>, TFilterData = voi
 		}
 
 		const result = Iterator.map(Iterator.fromArray(deletedNodes), treeNodeToElement);
-		this._onDidSplice.fire({ deletedNodes });
+		this._onDidSplice.fire({ insertedNodes: nodesToInsert, deletedNodes });
 		return result;
 	}
 

src/vs/base/browser/ui/tree/tree.ts

@@ -98,6 +98,7 @@ export interface ICollapseStateChangeEvent<T, TFilterData> {
 }
 
 export interface ITreeModelSpliceEvent<T, TFilterData> {
+	insertedNodes: ITreeNode<T, TFilterData>[];
 	deletedNodes: ITreeNode<T, TFilterData>[];
 }