Merge pull request #121 from melange-re/playground/fix-onload-error-m…

…arkers playground: fix onload error markers
melange-re · Oct 5, 2023 · b66011f · b66011f
2 parents 4be989a + 3e092e2
commit b66011f
Showing 1 changed file with 18 additions and 14 deletions.
diff --git a/playground/src/app.jsx b/playground/src/app.jsx
@@ -464,6 +464,21 @@ const compile = (language, code) => {
   }
 };
 
+function updateMarkers(monaco, editorRef, compilation) {
+  if (monaco && editorRef.current) {
+    const owner = "playground";
+    if (compilation?.problems) {
+      monaco.editor.setModelMarkers(
+        editorRef.current.getModel(),
+        owner,
+        compilation.problems.map(toMonaco)
+      );
+    } else {
+      monaco.editor.removeAllMarkers(owner);
+    }
+  }
+}
+
 function App() {
   const defaultState = {
     language: languageMap.OCaml,
@@ -488,8 +503,9 @@ function App() {
 
   const editorRef = React.useRef(null);
 
-  function handleEditorDidMount(editor, _monaco) {
+  function handleEditorDidMount(editor, monaco) {
     editorRef.current = editor;
+    updateMarkers(monaco, editorRef, compilation);
   }
 
   function clearLogs() {
@@ -578,19 +594,7 @@ function App() {
   }, [monaco, compilation?.typeHints]);
 
   React.useEffect(() => {
-    // or make sure that it exists by other ways
-    if (monaco && editorRef.current) {
-      const owner = "playground";
-      if (compilation?.problems) {
-        monaco.editor.setModelMarkers(
-          editorRef.current.getModel(),
-          owner,
-          compilation.problems.map(toMonaco)
-        );
-      } else {
-        monaco.editor.removeAllMarkers(owner);
-      }
-    }
+    updateMarkers(monaco, editorRef, compilation)
   }, [monaco, compilation?.problems]);
 
   React.useEffect(() => {