Skip to content

Commit aa5b9d7

Browse files
committed
Fixes microsoft#135102: Apply editor font info for code blocks in hover
1 parent 50404fe commit aa5b9d7

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/vs/editor/browser/core/markdownRenderer.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { IDisposable, DisposableStore } from 'vs/base/common/lifecycle';
1515
import { ILanguageIdCodec, ITokenizationSupport, TokenizationRegistry } from 'vs/editor/common/modes';
1616
import { EditorOption } from 'vs/editor/common/config/editorOptions';
1717
import { URI } from 'vs/base/common/uri';
18+
import { Configuration } from 'vs/editor/browser/config/configuration';
1819

1920
export interface IMarkdownRenderResult extends IDisposable {
2021
element: HTMLElement;
@@ -89,12 +90,11 @@ export class MarkdownRenderer {
8990
element.innerHTML = (MarkdownRenderer._ttpTokenizer?.createHTML(value, this._modeService.languageIdCodec, tokenization) ?? tokenizeToString(value, this._modeService.languageIdCodec, tokenization)) as string;
9091

9192
// use "good" font
92-
let fontFamily = this._options.codeBlockFontFamily;
9393
if (this._options.editor) {
94-
fontFamily = this._options.editor.getOption(EditorOption.fontInfo).fontFamily;
95-
}
96-
if (fontFamily) {
97-
element.style.fontFamily = fontFamily;
94+
const fontInfo = this._options.editor.getOption(EditorOption.fontInfo);
95+
Configuration.applyFontInfoSlow(element, fontInfo);
96+
} else if (this._options.codeBlockFontFamily) {
97+
element.style.fontFamily = this._options.codeBlockFontFamily;
9898
}
9999

100100
return element;

0 commit comments

Comments
 (0)