development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-19 18:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

start on accessible chat view

Browse source
This commit is contained in:
meganrogge 2023-06-16 15:27:55 -05:00
parent 23b487b0a9
commit 9c534efc13
No known key found for this signature in database
GPG key ID: AA74638D4878183D
5 changed files with 84 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/workbench/contrib/accessibility/browser/accessibility.contribution.ts
View file

@ -132,3 +132,5 @@ class EditorAccessibilityHelpContribution extends Disposable {
const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
workbenchRegistry.registerWorkbenchContribution(EditorAccessibilityHelpContribution, LifecyclePhase.Eventually);

14
src/vs/workbench/contrib/accessibility/browser/accessibilityContribution.ts
View file

@ -79,3 +79,17 @@ export const AccessibilityHelpAction = registerCommand(new MultiCommand({
}
}
}));
export const AccessibilityViewAction = registerCommand(new MultiCommand({
id: 'editor.action.accessibilityView',
precondition: undefined,
kbOpts: {
primary: KeyMod.Alt | KeyCode.F2,
weight: KeybindingWeight.WorkbenchContrib,
linux: {
primary: KeyMod.Alt | KeyMod.Shift | KeyCode.F1,
secondary: [KeyMod.Alt | KeyCode.F1]
}
}
}));

58
src/vs/workbench/contrib/chat/browser/chat.contribution.ts
View file

@ -22,7 +22,7 @@ import { registerChatExecuteActions } from 'vs/workbench/contrib/chat/browser/ac
import { registerChatQuickQuestionActions } from 'vs/workbench/contrib/chat/browser/actions/chatQuickInputActions';
import { registerChatTitleActions } from 'vs/workbench/contrib/chat/browser/actions/chatTitleActions';
import { registerChatExportActions } from 'vs/workbench/contrib/chat/browser/actions/chatImportExport';
import { IChatAccessibilityService, IChatWidgetService } from 'vs/workbench/contrib/chat/browser/chat';
import { IChatAccessibilityService, IChatWidget, IChatWidgetService } from 'vs/workbench/contrib/chat/browser/chat';
import { ChatContributionService } from 'vs/workbench/contrib/chat/browser/chatContributionServiceImpl';
import { ChatEditor, IChatEditorOptions } from 'vs/workbench/contrib/chat/browser/chatEditor';
import { ChatEditorInput, ChatEditorInputSerializer } from 'vs/workbench/contrib/chat/browser/chatEditorInput';
@ -37,6 +37,12 @@ import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle
import '../common/chatColors';
import { registerMoveActions } from 'vs/workbench/contrib/chat/browser/actions/chatMoveActions';
import { registerClearActions } from 'vs/workbench/contrib/chat/browser/actions/chatClearActions';
import { AccessibilityViewAction } from 'vs/workbench/contrib/accessibility/browser/accessibilityContribution';
import { IAccessibleViewService } from 'vs/workbench/contrib/accessibility/browser/accessibleView';
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';
// Register configuration
const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
@ -119,8 +125,58 @@ class ChatResolverContribution extends Disposable {
}
}
class ChatAccessibileViewContribution extends Disposable {
static ID: 'chatAccessibleViewContribution';
constructor() {
super();
this._register(AccessibilityViewAction.addImplementation(100, 'chat', accessor => {
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 widget: IChatWidget | undefined = widgetService.lastFocusedWidget;
const focused = widget?.getFocus();
if (!widget || !focused) {
return false;
}
function provideContent(): string {
if (!widget) {
return 'No response data';
}
const curCodeBlockInfo = editorUri ? widget.getCodeBlockInfoForEditor(editorUri) : undefined;
const currentResponse = curCodeBlockInfo ?
curCodeBlockInfo.element :
(focused ?? widget.viewModel?.getItems().reverse().find((item): item is IChatResponseViewModel => isResponseVM(item)));
if (!currentResponse) {
return 'No response data';
}
// TODO: allow this for requests
return isResponseVM(currentResponse) ? currentResponse.response.value : 'No response data';
}
accessibleViewService.registerProvider({
id: 'chat',
provideContent,
onClose() {
widget.reveal(focused, true);
},
onKeyDown(e: IKeyboardEvent) {
if (e.keyCode === KeyCode.Escape) {
widget.reveal(focused, true);
}
},
options: { ariaLabel: nls.localize('chatAccessibleView', "Chat Accessible View") }
});
accessibleViewService.show('chat');
return true;
}));
}
}
const workbenchContributionsRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
workbenchContributionsRegistry.registerWorkbenchContribution(ChatResolverContribution, LifecyclePhase.Starting);
workbenchContributionsRegistry.registerWorkbenchContribution(ChatAccessibileViewContribution, LifecyclePhase.Eventually);
Registry.as<IEditorFactoryRegistry>(EditorExtensions.EditorFactory).registerEditorSerializer(ChatEditorInput.TypeID, ChatEditorInputSerializer);
registerChatActions();

2
src/vs/workbench/contrib/chat/browser/chat.ts
View file

@ -54,7 +54,7 @@ export interface IChatWidget {
readonly inputEditor: ICodeEditor;
readonly providerId: string;
reveal(item: ChatTreeItem): void;
reveal(item: ChatTreeItem, focus?: boolean): void;
getFocus(): ChatTreeItem | undefined;
acceptInput(query?: string): void;
focusLastMessage(): void;

12
src/vs/workbench/contrib/chat/browser/chatWidget.ts
View file

@ -376,8 +376,16 @@ export class ChatWidget extends Disposable implements IChatWidget {
return withNullAsUndefined(this.tree.getFocus()[0]);
}
reveal(item: ChatTreeItem): void {
this.tree.reveal(item);
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);
}
}
async acceptInput(query?: string | IChatReplyFollowup): Promise<void> {