get it to work

Author: meganrogge

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

@@ -1491,7 +1491,7 @@ class TreeNodeList<T, TFilterData, TRef> extends List<ITreeNode<T, TFilterData>>
 
 	override setFocus(indexes: number[], browserEvent?: UIEvent, fromAPI = false): void {
 		super.setFocus(indexes, browserEvent);
-
+		console.log('fromApi', fromAPI, browserEvent);
 		if (!fromAPI) {
 			this.focusTrait.set(indexes.map(i => this.element(i)), browserEvent);
 		}

src/vs/workbench/contrib/chat/browser/chat.contribution.ts

@@ -42,7 +42,6 @@ import { IAccessibleViewService } from 'vs/workbench/contrib/accessibility/brows
 import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { IChatResponseViewModel, isResponseVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
-import { ICommandService } from 'vs/platform/commands/common/commands';
 
 // Register configuration
 const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
@@ -134,7 +133,6 @@ class ChatAccessibileViewContribution extends Disposable {
 			const codeEditorService = accessor.get(ICodeEditorService);
 			const editor = codeEditorService.getActiveCodeEditor() || codeEditorService.getFocusedCodeEditor();
 			const widgetService = accessor.get(IChatWidgetService);
-			const commandService = accessor.get(ICommandService);
 			const editorUri = editor?.getModel()?.uri;
 			const widget: IChatWidget | undefined = widgetService.lastFocusedWidget;
 			const focused = widget?.getFocus();
@@ -160,8 +158,7 @@ class ChatAccessibileViewContribution extends Disposable {
 				id: 'chat',
 				provideContent,
 				onClose() {
-					widget.reveal(focused);
-					commandService.executeCommand('chat.action.focus');
+					widget.reveal(focused, true);
 				},
 				onKeyDown(e: IKeyboardEvent) {
 

src/vs/workbench/contrib/chat/browser/chatWidget.ts

@@ -376,8 +376,18 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		return withNullAsUndefined(this.tree.getFocus()[0]);
 	}
 
-	reveal(item: ChatTreeItem): void {
+	reveal(item: ChatTreeItem, focus?: boolean): void {
 		this.tree.reveal(item);
+		if (focus) {
+			const items = this.tree.getNode(null).children;
+			const node = items.find(i => i.element?.id === item.id);
+			if (!node) {
+				return;
+			}
+
+			this.tree.setFocus([node.element]);
+			this.tree.domFocus();
+		}
 	}
 
 	async acceptInput(query?: string | IChatReplyFollowup): Promise<void> {