Merge pull request #1106 from rust-lang/monaco-font-measure

Ensure Monaco measures fonts after the font is loaded
rust-lang · Oct 9, 2024 · 08c5f86 · 08c5f86
2 parents efd614b + a66d813
commit 08c5f86
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/ui/frontend/editor/MonacoEditorCore.tsx b/ui/frontend/editor/MonacoEditorCore.tsx
@@ -8,6 +8,14 @@ import { themeVsDarkPlus } from './rust_monaco_def';
 
 import * as styles from './Editor.module.css';
 
+async function remeasureFontWhenReady(fonts: FontFaceSet, font: string) {
+  while (!fonts.check(font)) {
+    await fonts.ready;
+  }
+
+  monaco.editor.remeasureFonts();
+}
+
 function useEditorProp<T>(
   editor: monaco.editor.IStandaloneCodeEditor | null,
   prop: T,
@@ -68,6 +76,8 @@ const MonacoEditorCore: React.FC<CommonEditorProps> = (props) => {
     });
     setEditor(editor);
 
+    remeasureFontWhenReady(document.fonts, nodeStyle.font);
+
     editor.focus();
   }, []);