try something else

This commit is contained in:
meganrogge 2023-06-16 15:44:22 -05:00
parent 9c534efc13
commit 9aacad6645
No known key found for this signature in database
GPG key ID: AA74638D4878183D
2 changed files with 8 additions and 16 deletions

View file

@ -42,7 +42,7 @@ 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 { KeyCode } from 'vs/base/common/keyCodes';
import { ICommandService } from 'vs/platform/commands/common/commands';
// Register configuration
const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
@ -133,8 +133,9 @@ class ChatAccessibileViewContribution extends Disposable {
const accessibleViewService = accessor.get(IAccessibleViewService);
const codeEditorService = accessor.get(ICodeEditorService);
const editor = codeEditorService.getActiveCodeEditor() || codeEditorService.getFocusedCodeEditor();
const editorUri = editor?.getModel()?.uri;
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();
if (!widget || !focused) {
@ -159,12 +160,11 @@ class ChatAccessibileViewContribution extends Disposable {
id: 'chat',
provideContent,
onClose() {
widget.reveal(focused, true);
widget.reveal(focused);
commandService.executeCommand('chat.action.focus');
},
onKeyDown(e: IKeyboardEvent) {
if (e.keyCode === KeyCode.Escape) {
widget.reveal(focused, true);
}
},
options: { ariaLabel: nls.localize('chatAccessibleView', "Chat Accessible View") }
});

View file

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