Fix error when closing inline chat widgets (#234950)

Set lastItem before rendering list, chat which may try to reference lastItem Fix #234596
microsoft · Dec 2, 2024 · 5fe8e27 · 5fe8e27
1 parent 2ed1e9b
commit 5fe8e27
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -519,6 +519,8 @@ export class ChatWidget extends Disposable implements IChatWidget {
 
 			this._onWillMaybeChangeHeight.fire();
 
+			this.lastItem = treeItems.at(-1)?.element;
+			ChatContextKeys.lastItemId.bindTo(this.contextKeyService).set(this.lastItem ? [this.lastItem.id] : []);
 			this.tree.setChildren(null, treeItems, {
 				diffIdentityProvider: {
 					getId: (element) => {
@@ -543,10 +545,6 @@ export class ChatWidget extends Disposable implements IChatWidget {
 				this.layoutDynamicChatTreeItemMode();
 			}
 
-			this.lastItem = treeItems[treeItems.length - 1]?.element;
-			if (this.lastItem) {
-				ChatContextKeys.lastItemId.bindTo(this.contextKeyService).set([this.lastItem.id]);
-			}
 			if (this.lastItem && isResponseVM(this.lastItem) && this.lastItem.isComplete) {
 				this.renderFollowups(this.lastItem.replyFollowups, this.lastItem);
 			} else if (!treeItems.length && this.viewModel) {