CM6: Aligned styling with existing, improved theme handling

[bookstack] / resources / js / code / languages.js

diff --git a/resources/js/code/languages.js b/resources/js/code/languages.js
index 21ce69e6d3de14e9e0838b6f2e89ca4d9a399717..e7bac2a18b78cbe291f05118b0249e287a462861 100644 (file)
--- a/resources/js/code/languages.js
+++ b/resources/js/code/languages.js
@@ -3,9 +3,11 @@ import {StreamLanguage} from "@codemirror/language"
 import {css} from '@codemirror/lang-css';
 import {json} from '@codemirror/lang-json';
 import {javascript} from '@codemirror/lang-javascript';
+import {html} from "@codemirror/lang-html";
 import {markdown} from '@codemirror/lang-markdown';
 import {php} from '@codemirror/lang-php';
-export {twig} from "@ssddanbrown/codemirror-lang-twig";
+import {twig} from "@ssddanbrown/codemirror-lang-twig";
+import {xml} from "@codemirror/lang-xml";
 
 const legacyLoad = async (mode) => {
     const modes = await window.importVersioned('legacy-modes');
@@ -32,7 +34,7 @@ const modeMap = {
     go: () => legacyLoad('go'),
     haskell: () => legacyLoad('haskell'),
     hs: () => legacyLoad('haskell'),
-    html: () => legacyLoad('html'),
+    html: async () => html(),
     ini: () => legacyLoad('properties'),
     java: () => legacyLoad('java'),
     javascript: async () => javascript(),
@@ -89,7 +91,7 @@ const modeMap = {
     vbscript: () => legacyLoad('vbScript'),
     'vb.net': () => legacyLoad('vb'),
     vbnet: () => legacyLoad('vb'),
-    xml: () => legacyLoad('xml'),
+    xml: async () => xml(),
     yaml: () => legacyLoad('yaml'),
     yml: () => legacyLoad('yaml'),
 };