apply cm5 lively4 patches

SQUASHED: AUTO-COMMIT-src-external-code-mirror-lib-codemirror.js,AUTO-COMMIT-src-external-code-mirror-mode-htmlmixed-htmlmixed.js,AUTO-COMMIT-src-external-code-mirror-mode-markdown-markdown.js,
LivelyKernel · Jun 13, 2024 · 6a7c019 · 6a7c019
1 parent b376f94
commit 6a7c019
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/src/external/code-mirror/lib/codemirror.js b/src/external/code-mirror/lib/codemirror.js
@@ -9877,6 +9877,9 @@
 
   addLegacyProps(CodeMirror);
 
+  // Lively Hacks
+  CodeMirror.posToDOM = posToDOM
+
   CodeMirror.version = "5.65.16";
 
   return CodeMirror;

diff --git a/src/external/code-mirror/mode/htmlmixed/htmlmixed.js b/src/external/code-mirror/mode/htmlmixed/htmlmixed.js
@@ -3,7 +3,7 @@
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../xml/xml"), require("../javascript/javascript"), require("../css/css"));
+    mod(require("../../lib/codemirror"), require("../xml/xml"), require("../javascript/javascript"), require("../jsx/jsx"), require("../css/css"));
   else if (typeof define == "function" && define.amd) // AMD
     define(["../../lib/codemirror", "../xml/xml", "../javascript/javascript", "../css/css"], mod);
   else // Plain browser env
@@ -13,8 +13,8 @@
 
   var defaultTags = {
     script: [
-      ["lang", /(javascript|babel)/i, "javascript"],
-      ["type", /^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^module$|^$/i, "javascript"],
+      ["lang", /(javascript|babel)/i, "jsx"],
+      ["type", /^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^module$|^$/i, "jsx"],
       ["type", /./, "text/plain"],
       [null, null, "javascript"]
     ],

diff --git a/src/external/code-mirror/mode/markdown/markdown.js b/src/external/code-mirror/mode/markdown/markdown.js
@@ -285,13 +285,14 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     var style = htmlMode.token(stream, state.htmlState);
     if (!htmlModeMissing) {
       var inner = CodeMirror.innerMode(htmlMode, state.htmlState)
-      if ((inner.mode.name == "xml" && inner.state.tagStart === null &&
-           (!inner.state.context && inner.state.tokenize.isInText)) ||
-          (state.md_inside && stream.current().indexOf(">") > -1)) {
-        state.f = inlineNormal;
-        state.block = blockNormal;
-        state.htmlState = null;
-      }
+      // #JSX in Script tag requires to disable this
+      // if ((inner.mode.name == "xml" && inner.state.tagStart === null &&
+      //      (!inner.state.context && inner.state.tokenize.isInText)) ||
+      //     (state.md_inside && stream.current().indexOf(">") > -1)) {
+      //   state.f = inlineNormal;
+      //   state.block = blockNormal;
+      //   state.htmlState = null;
+      // }
     }
     return style;
   }