From 900a8bbda3a3582ba852ced8aacdd49da60ca093 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Mon, 9 Jan 2023 07:52:06 -0800
Subject: [PATCH] Fix app crash when sometimes using MonacoEditor (#6893)

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 .../components/monaco-editor/monaco-editor.tsx      | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/renderer/components/monaco-editor/monaco-editor.tsx b/src/renderer/components/monaco-editor/monaco-editor.tsx
index b5cf17d0a4..debb076ab8 100644
--- a/src/renderer/components/monaco-editor/monaco-editor.tsx
+++ b/src/renderer/components/monaco-editor/monaco-editor.tsx
@@ -19,6 +19,8 @@ import { withInjectables } from "@ogre-tools/injectable-react";
 import userStoreInjectable from "../../../common/user-store/user-store.injectable";
 import activeThemeInjectable from "../../themes/active.injectable";
 import getEditorHeightFromLinesCountInjectable from "./get-editor-height-from-lines-number.injectable";
+import type { Logger } from "../../../common/logger";
+import loggerInjectable from "../../../common/logger.injectable";
 
 export type MonacoEditorId = string;
 
@@ -45,6 +47,7 @@ interface Dependencies {
   userStore: UserStore;
   activeTheme: IComputedValue<LensTheme>;
   getEditorHeightFromLinesCount: (linesCount: number) => number;
+  logger: Logger;
 }
 
 export function createMonacoUri(id: MonacoEditorId): Uri {
@@ -98,7 +101,14 @@ class NonInjectedMonacoEditor extends React.Component<MonacoEditorProps & Depend
       return model; // already exists
     }
 
-    const { language, value } = this.props;
+    const { language, value: rawValue } = this.props;
+    const value = typeof rawValue === "string"
+      ? rawValue
+      : "";
+
+    if (typeof rawValue !== "string") {
+      this.props.logger.error(`[MONACO-EDITOR]: Passed a non-string default value`, { rawValue });
+    }
 
     return editor.createModel(value, language, uri);
   }
@@ -322,6 +332,7 @@ export const MonacoEditor = withInjectables<Dependencies, MonacoEditorProps, Mon
       userStore: di.inject(userStoreInjectable),
       activeTheme: di.inject(activeThemeInjectable),
       getEditorHeightFromLinesCount: di.inject(getEditorHeightFromLinesCountInjectable),
+      logger: di.inject(loggerInjectable),
     }),
   },
 );