Skip to content

Commit 3146dbd

Browse files
authored
Merge pull request microsoft#188419 from microsoft/merogge/lang
use markdown as language for accessible view
2 parents c8dfe36 + 5c06ca6 commit 3146dbd

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ class HoverAccessibleViewContribution extends Disposable {
117117
if (!editorHoverContent) {
118118
return false;
119119
}
120+
this._options.language = editor?.getModel()?.getLanguageId() ?? undefined;
120121
accessibleViewService.show({
121122
verbositySettingKey: AccessibilityVerbositySettingId.Hover,
122123
provideContent() { return editorHoverContent; },

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ export const enum AccessibleViewType {
6464
export interface IAccessibleViewOptions {
6565
ariaLabel: string;
6666
readMoreUrl?: string;
67+
/**
68+
* Defaults to markdown
69+
*/
6770
language?: string;
6871
type: AccessibleViewType;
6972
}
@@ -196,9 +199,7 @@ class AccessibleView extends Disposable {
196199
if (!domNode) {
197200
return;
198201
}
199-
if (provider.options.language) {
200-
model.setLanguage(provider.options.language);
201-
}
202+
model.setLanguage(provider.options.language ?? 'markdown');
202203
container.appendChild(this._editorContainer);
203204
this._editorWidget.updateOptions({ ariaLabel: provider.next && provider.previous ? localize('accessibleViewAriaLabelWithNav', "{0} {1}", provider.options.ariaLabel, this._getNavigationAriaHint(provider.verbositySettingKey)) : localize('accessibleViewAriaLabel', "{0}", provider.options.ariaLabel) });
204205
this._editorWidget.focus();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ class ChatAccessibleViewContribution extends Disposable {
186186
verifiedWidget.moveFocus(focusedItem, 'previous');
187187
renderAccessibleView(accessibleViewService, widgetService, codeEditorService);
188188
},
189-
options: { ariaLabel: nls.localize('chatAccessibleView', "Chat Accessible View"), language: 'typescript', type: AccessibleViewType.View }
189+
options: { ariaLabel: nls.localize('chatAccessibleView', "Chat Accessible View"), type: AccessibleViewType.View }
190190
});
191191
return true;
192192
}

src/vs/workbench/contrib/notebook/browser/notebookAccessibility.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ export function showAccessibleOutput(accessibleViewService: IAccessibleViewServi
116116
},
117117
options: {
118118
ariaLabel: localize('NotebookCellOutputAccessibleView', "Notebook Cell Output Accessible View"),
119-
language: 'plaintext',
120119
type: AccessibleViewType.View
121120
}
122121
});

0 commit comments

Comments
 (0)