Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-20 02:08:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

update accessible view content as response streams in, rm redundant whitespace (#284311)

Browse Source 
Refactor ChatResponseAccessibleProvider to improve focused item management and normalize whitespace in content
This commit is contained in:
Megan Rogge
2025-12-18 15:22:35 -06:00
committed by GitHub
parent 84c5d6cd04
commit 1ecd3920e3
1 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/vs/workbench/contrib/chat/browser/chatResponseAccessibleView.ts
View File

@@ -4,9 +4,10 @@
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
import { renderAsPlaintext } from '../../../../base/browser/markdownRenderer.js'; import { renderAsPlaintext } from '../../../../base/browser/markdownRenderer.js';
import { Emitter, Event } from '../../../../base/common/event.js';
import { isMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js'; import { isMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
import { stripIcons } from '../../../../base/common/iconLabels.js'; import { stripIcons } from '../../../../base/common/iconLabels.js';
import { Disposable } from '../../../../base/common/lifecycle.js'; import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
import { localize } from '../../../../nls.js'; import { localize } from '../../../../nls.js';
import { AccessibleViewProviderId, AccessibleViewType, IAccessibleViewContentProvider } from '../../../../platform/accessibility/browser/accessibleView.js'; import { AccessibleViewProviderId, AccessibleViewType, IAccessibleViewContentProvider } from '../../../../platform/accessibility/browser/accessibleView.js';
import { IAccessibleViewImplementation } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js'; import { IAccessibleViewImplementation } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
@@ -46,14 +47,17 @@ export class ChatResponseAccessibleView implements IAccessibleViewImplementation
} }
class ChatResponseAccessibleProvider extends Disposable implements IAccessibleViewContentProvider { class ChatResponseAccessibleProvider extends Disposable implements IAccessibleViewContentProvider {
private _focusedItem: ChatTreeItem; private _focusedItem!: ChatTreeItem;
private readonly _focusedItemDisposables = this._register(new DisposableStore());
private readonly _onDidChangeContent = this._register(new Emitter<void>());
readonly onDidChangeContent: Event<void> = this._onDidChangeContent.event;
constructor( constructor(
private readonly _widget: IChatWidget, private readonly _widget: IChatWidget,
item: ChatTreeItem, item: ChatTreeItem,
private readonly _wasOpenedFromInput: boolean private readonly _wasOpenedFromInput: boolean
) { ) {
super(); super();
this._focusedItem = item; this._setFocusedItem(item);
} }
readonly id = AccessibleViewProviderId.PanelChat; readonly id = AccessibleViewProviderId.PanelChat;
@@ -64,6 +68,14 @@ class ChatResponseAccessibleProvider extends Disposable implements IAccessibleVi
return this._getContent(this._focusedItem); return this._getContent(this._focusedItem);
} }
private _setFocusedItem(item: ChatTreeItem): void {
this._focusedItem = item;
this._focusedItemDisposables.clear();
if (isResponseVM(item)) {
this._focusedItemDisposables.add(item.model.onDidChange(() => this._onDidChangeContent.fire()));
}
}
private _getContent(item: ChatTreeItem): string { private _getContent(item: ChatTreeItem): string {
let responseContent = isResponseVM(item) ? item.response.toString() : ''; let responseContent = isResponseVM(item) ? item.response.toString() : '';
if (!responseContent && 'errorDetails' in item && item.errorDetails) { if (!responseContent && 'errorDetails' in item && item.errorDetails) {
@@ -135,7 +147,20 @@ class ChatResponseAccessibleProvider extends Disposable implements IAccessibleVi
} }
} }
} }
return renderAsPlaintext(new MarkdownString(responseContent), { includeCodeBlocksFences: true }); const plainText = renderAsPlaintext(new MarkdownString(responseContent), { includeCodeBlocksFences: true });
return this._normalizeWhitespace(plainText);
}
private _normalizeWhitespace(content: string): string {
const lines = content.split(/\r?\n/);
const normalized: string[] = [];
for (const line of lines) {
if (line.trim().length === 0) {
continue;
}
normalized.push(line);
}
return normalized.join('\n');
} }
onClose(): void { onClose(): void {
@@ -150,7 +175,7 @@ class ChatResponseAccessibleProvider extends Disposable implements IAccessibleVi
provideNextContent(): string | undefined { provideNextContent(): string | undefined {
const next = this._widget.getSibling(this._focusedItem, 'next'); const next = this._widget.getSibling(this._focusedItem, 'next');
if (next) { if (next) {
this._focusedItem = next; this._setFocusedItem(next);
return this._getContent(next); return this._getContent(next);
} }
return; return;
@@ -159,7 +184,7 @@ class ChatResponseAccessibleProvider extends Disposable implements IAccessibleVi
providePreviousContent(): string | undefined { providePreviousContent(): string | undefined {
const previous = this._widget.getSibling(this._focusedItem, 'previous'); const previous = this._widget.getSibling(this._focusedItem, 'previous');
if (previous) { if (previous) {
this._focusedItem = previous; this._setFocusedItem(previous);
return this._getContent(previous); return this._getContent(previous);
} }
return; return;