From e269fe73da678e748aedfbed39a7b33453b4d7c0 Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Sun, 8 Aug 2021 00:39:40 +0200
Subject: [PATCH] Define CodeMirror in external codeMirror.ts

---
 ts/editor/MathjaxHandleEditor.svelte | 26 ++--------------
 ts/editor/codable.ts                 | 38 ++---------------------
 ts/editor/codeMirror.ts              | 45 ++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 59 deletions(-)
 create mode 100644 ts/editor/codeMirror.ts

diff --git a/ts/editor/MathjaxHandleEditor.svelte b/ts/editor/MathjaxHandleEditor.svelte
index 38778c518..1b8eb7b0e 100644
--- a/ts/editor/MathjaxHandleEditor.svelte
+++ b/ts/editor/MathjaxHandleEditor.svelte
@@ -5,35 +5,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 <script lang="typescript">
     import { onMount, createEventDispatcher } from "svelte";
     import { ChangeTimer } from "./change-timer";
-
-    import CodeMirror from "codemirror";
-    import "codemirror/mode/stex/stex";
-    import "codemirror/addon/fold/foldcode";
-    import "codemirror/addon/fold/foldgutter";
-    import "codemirror/addon/fold/xml-fold";
-    import "codemirror/addon/edit/matchtags.js";
-    import "codemirror/addon/edit/closetag.js";
+    import { CodeMirror, latex, baseOptions } from "./codeMirror";
 
     export let initialValue: string;
 
-    const latex = {
-        name: "stex",
-        inMathMode: true,
-    };
-
-    const noop = () => {
-        /* noop */
-    };
-
     const codeMirrorOptions = {
         mode: latex,
-        theme: "monokai",
-        lineWrapping: true,
-        matchTags: { bothTags: true },
-        extraKeys: { Tab: noop, "Shift-Tab": noop },
-        viewportMargin: Infinity,
-        lineWiseCopyCut: false,
-        autofocus: true,
+        ...baseOptions,
     };
 
     let codeMirror: CodeMirror.EditorFromTextArea;
diff --git a/ts/editor/codable.ts b/ts/editor/codable.ts
index a4336b2a5..df50d9ee3 100644
--- a/ts/editor/codable.ts
+++ b/ts/editor/codable.ts
@@ -5,45 +5,13 @@
 @typescript-eslint/no-non-null-assertion: "off",
 */
 
-import CodeMirror from "codemirror";
-import "codemirror/mode/htmlmixed/htmlmixed";
-import "codemirror/mode/stex/stex";
-import "codemirror/addon/fold/foldcode";
-import "codemirror/addon/fold/foldgutter";
-import "codemirror/addon/fold/xml-fold";
-import "codemirror/addon/edit/matchtags.js";
-import "codemirror/addon/edit/closetag.js";
-
+import { CodeMirror, htmlanki, baseOptions, gutterOptions } from "./codeMirror";
 import { inCodable } from "./toolbar";
 
-const latex = {
-    name: "stex",
-    inMathMode: true,
-};
-
-const htmlanki = {
-    name: "htmlmixed",
-    tags: {
-        "anki-mathjax": [[null, null, latex]],
-    },
-};
-
-const noop = () => {
-    /* noop */
-};
-
 const codeMirrorOptions = {
     mode: htmlanki,
-    theme: "monokai",
-    lineNumbers: true,
-    lineWrapping: true,
-    foldGutter: true,
-    gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],
-    matchTags: { bothTags: true },
-    autoCloseTags: true,
-    extraKeys: { Tab: noop, "Shift-Tab": noop },
-    viewportMargin: Infinity,
-    lineWiseCopyCut: false,
+    ...baseOptions,
+    ...gutterOptions,
 };
 
 const parser = new DOMParser();
diff --git a/ts/editor/codeMirror.ts b/ts/editor/codeMirror.ts
new file mode 100644
index 000000000..a0d04812e
--- /dev/null
+++ b/ts/editor/codeMirror.ts
@@ -0,0 +1,45 @@
+// Copyright: Ankitects Pty Ltd and contributors
+// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+
+import CodeMirror from "codemirror";
+import "codemirror/mode/htmlmixed/htmlmixed";
+import "codemirror/mode/stex/stex";
+import "codemirror/addon/fold/foldcode";
+import "codemirror/addon/fold/foldgutter";
+import "codemirror/addon/fold/xml-fold";
+import "codemirror/addon/edit/matchtags.js";
+import "codemirror/addon/edit/closetag.js";
+
+export { CodeMirror };
+
+export const latex = {
+    name: "stex",
+    inMathMode: true,
+};
+
+export const htmlanki = {
+    name: "htmlmixed",
+    tags: {
+        "anki-mathjax": [[null, null, latex]],
+    },
+};
+
+const noop = () => {
+    /* noop */
+};
+
+export const baseOptions = {
+    theme: "monokai",
+    lineWrapping: true,
+    matchTags: { bothTags: true },
+    autoCloseTags: true,
+    extraKeys: { Tab: noop, "Shift-Tab": noop },
+    viewportMargin: Infinity,
+    lineWiseCopyCut: false,
+};
+
+export const gutterOptions = {
+    gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],
+    lineNumbers: true,
+    foldGutter: true,
+};