Skip to content

Commit 4e539b0

Browse files
committed
or undefined
1 parent 2bd814e commit 4e539b0

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

src/vs/workbench/contrib/accessibility/browser/accessibleView.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@ export interface IAccessibleViewService {
5050
show(provider: IAccessibleContentProvider): void;
5151
next(): void;
5252
previous(): void;
53-
getOpenAriaHint(verbositySettingKey: AccessibilityVerbositySettingId): string;
53+
/**
54+
* If the setting is enabled, provides the open accessible view hint as a localized string.
55+
* @param verbositySettingKey The setting key for the verbosity of the feature
56+
*/
57+
getOpenAriaHint(verbositySettingKey: AccessibilityVerbositySettingId): string | undefined;
5458
}
5559

5660
export const enum AccessibleViewType {
@@ -275,7 +279,10 @@ export class AccessibleViewService extends Disposable implements IAccessibleView
275279
previous(): void {
276280
this._accessibleView?.previous();
277281
}
278-
getOpenAriaHint(verbositySettingKey: AccessibilityVerbositySettingId): string {
282+
getOpenAriaHint(verbositySettingKey: AccessibilityVerbositySettingId): string | undefined {
283+
if (!this._configurationService.getValue(verbositySettingKey)) {
284+
return;
285+
}
279286
let hint = '';
280287
const keybinding = this._keybindingService.lookupKeybinding(AccessibleViewAction.id)?.getAriaLabel();
281288
if (this._configurationService.getValue(verbositySettingKey)) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -553,18 +553,18 @@ export class ChatAccessibilityProvider implements IListAccessibilityProvider<Cha
553553
}
554554

555555
private _getLabelWithCodeBlockCount(element: IChatResponseViewModel): string {
556-
const accessibleViewHint = this._accessibleViewService.getOpenAriaHint(AccessibilityVerbositySettingId.Chat).trim();
556+
const accessibleViewHint = this._accessibleViewService.getOpenAriaHint(AccessibilityVerbositySettingId.Chat);
557557
let label: string = '';
558558
const codeBlockCount = marked.lexer(element.response.value).filter(token => token.type === 'code')?.length ?? 0;
559559
switch (codeBlockCount) {
560560
case 0:
561-
label = localize('noCodeBlocks', "{0} {1}", element.response.value, accessibleViewHint);
561+
label = accessibleViewHint ? localize('noCodeBlocksHint', "{0} {1}", element.response.value, accessibleViewHint) : localize('noCodeBlocks', "{0}", element.response.value);
562562
break;
563563
case 1:
564-
label = localize('singleCodeBlock', "1 code block: {0} {1}", element.response.value, accessibleViewHint);
564+
label = accessibleViewHint ? localize('singleCodeBlockHint', "1 code block: {0} {1}", element.response.value, accessibleViewHint) : localize('singleCodeBlock', "1 code block: {0}", element.response.value);
565565
break;
566566
default:
567-
label = localize('multiCodeBlock', "{0} code blocks: {1}", codeBlockCount, element.response.value, accessibleViewHint);
567+
label = accessibleViewHint ? localize('multiCodeBlockHint', "{0} code blocks: {1}", codeBlockCount, element.response.value, accessibleViewHint) : localize('multiCodeBlock', "{0} code blocks", codeBlockCount, element.response.value);
568568
break;
569569
}
570570
return label;

0 commit comments

Comments
 (0)