From 4e539b0a96da04d1c18c210e30f483e2cdf6b776 Mon Sep 17 00:00:00 2001
From: meganrogge <megan.rogge@microsoft.com>
Date: Thu, 20 Jul 2023 11:09:32 -0700
Subject: [PATCH] or undefined

---
 .../contrib/accessibility/browser/accessibleView.ts   | 11 +++++++++--
 .../contrib/chat/browser/chatListRenderer.ts          |  8 ++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts b/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts
index ea024b618df..72a4bde4b23 100644
--- a/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts
@@ -50,7 +50,11 @@ export interface IAccessibleViewService {
 	show(provider: IAccessibleContentProvider): void;
 	next(): void;
 	previous(): void;
-	getOpenAriaHint(verbositySettingKey: AccessibilityVerbositySettingId): string;
+	/**
+	 * If the setting is enabled, provides the open accessible view hint as a localized string.
+	 * @param verbositySettingKey The setting key for the verbosity of the feature
+	 */
+	getOpenAriaHint(verbositySettingKey: AccessibilityVerbositySettingId): string | undefined;
 }
 
 export const enum AccessibleViewType {
@@ -275,7 +279,10 @@ export class AccessibleViewService extends Disposable implements IAccessibleView
 	previous(): void {
 		this._accessibleView?.previous();
 	}
-	getOpenAriaHint(verbositySettingKey: AccessibilityVerbositySettingId): string {
+	getOpenAriaHint(verbositySettingKey: AccessibilityVerbositySettingId): string | undefined {
+		if (!this._configurationService.getValue(verbositySettingKey)) {
+			return;
+		}
 		let hint = '';
 		const keybinding = this._keybindingService.lookupKeybinding(AccessibleViewAction.id)?.getAriaLabel();
 		if (this._configurationService.getValue(verbositySettingKey)) {
diff --git a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
index 341ac9ea4c4..439afe5cbe5 100644
--- a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
@@ -553,18 +553,18 @@ export class ChatAccessibilityProvider implements IListAccessibilityProvider<Cha
 	}
 
 	private _getLabelWithCodeBlockCount(element: IChatResponseViewModel): string {
-		const accessibleViewHint = this._accessibleViewService.getOpenAriaHint(AccessibilityVerbositySettingId.Chat).trim();
+		const accessibleViewHint = this._accessibleViewService.getOpenAriaHint(AccessibilityVerbositySettingId.Chat);
 		let label: string = '';
 		const codeBlockCount = marked.lexer(element.response.value).filter(token => token.type === 'code')?.length ?? 0;
 		switch (codeBlockCount) {
 			case 0:
-				label = localize('noCodeBlocks', "{0} {1}", element.response.value, accessibleViewHint);
+				label = accessibleViewHint ? localize('noCodeBlocksHint', "{0} {1}", element.response.value, accessibleViewHint) : localize('noCodeBlocks', "{0}", element.response.value);
 				break;
 			case 1:
-				label = localize('singleCodeBlock', "1 code block: {0} {1}", element.response.value, accessibleViewHint);
+				label = accessibleViewHint ? localize('singleCodeBlockHint', "1 code block: {0} {1}", element.response.value, accessibleViewHint) : localize('singleCodeBlock', "1 code block: {0}", element.response.value);
 				break;
 			default:
-				label = localize('multiCodeBlock', "{0} code blocks: {1}", codeBlockCount, element.response.value, accessibleViewHint);
+				label = accessibleViewHint ? localize('multiCodeBlockHint', "{0} code blocks: {1}", codeBlockCount, element.response.value, accessibleViewHint) : localize('multiCodeBlock', "{0} code blocks", codeBlockCount, element.response.value);
 				break;
 		}
 		return label;