Fix md code block bug (#1369)

* Fix #1288 * Changelog * Use `[[:space:]]` instead of `\\s`
ocamllabs · Jan 30, 2024 · 5f4be19 · 5f4be19
1 parent c6ef578
commit 5f4be19
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 # Unreleased
 
+- Fix non-ocaml markdown code block syntax highlighting being influenced (issue #1288, #1369)
+
 ## 1.16.1
 
 - No longer color comments starting three stars or more as ocamldoc comments (#1355)

diff --git a/syntaxes/ocaml-markdown-codeblock.json b/syntaxes/ocaml-markdown-codeblock.json
@@ -1,15 +1,24 @@
 {
   "fileTypes": [],
-  "injectionSelector": "L:markup.fenced_code.block.markdown",
+  "injectionSelector": "L:text.html.markdown",
   "patterns": [{ "include": "#ocaml-code-block" }],
   "repository": {
     "ocaml-code-block": {
-      "begin": "(ml|ocaml)(\\s+[^`~]*)?$",
-      "end": "(^|\\G)(?=\\s*[`~]{3,}\\s*$)",
+      "begin": "(^|\\G)([[:space:]]*)(\\`{3,}|~{3,})[[:space:]]*(?i:(ml|ocaml)([[:space:]]+[^`~]*)?$)",
+      "name": "markup.fenced_code.block.markdown",
+      "end": "(^|\\G)(\\2|[[:space:]]{0,3})(\\3)[[:space:]]*$",
+      "beginCaptures": {
+        "3": { "name": "punctuation.definition.markdown" },
+        "4": { "name": "fenced_code.block.language.markdown" },
+        "5": { "name": "fenced_code.block.language.attributes.markdown" }
+      },
+      "endCaptures": {
+        "3": { "name": "punctuation.definition.markdown" }
+      },
       "patterns": [
         {
-          "begin": "(^|\\G)(\\s*)(.*)",
-          "while": "(^|\\G)(?!\\s*([`~]{3,})\\s*$)",
+          "begin": "(^|\\G)([[:space:]]*)(.*)",
+          "while": "(^|\\G)(?![[:space:]]*([`~]{3,})[[:space:]]*$)",
           "contentName": "meta.embedded.block.ocaml",
           "patterns": [
             {

diff --git a/syntaxes/reason-markdown-codeblock.json b/syntaxes/reason-markdown-codeblock.json
@@ -1,15 +1,24 @@
 {
   "fileTypes": [],
-  "injectionSelector": "L:markup.fenced_code.block.markdown",
+  "injectionSelector": "L:text.html.markdown",
   "patterns": [{ "include": "#reason-code-block" }],
   "repository": {
     "reason-code-block": {
-      "begin": "(re|reason|reasonml)(\\s+[^`~]*)?$",
-      "end": "(^|\\G)(?=\\s*[`~]{3,}\\s*$)",
+      "begin": "(^|\\G)([[:space:]]*)(\\`{3,}|~{3,})[[:space:]]*(?i:(re|reason|reasonml)([[:space:]]+[^`~]*)?$)",
+      "name": "markup.fenced_code.block.markdown",
+      "end": "(^|\\G)(\\2|[[:space:]]{0,3})(\\3)[[:space:]]*$",
+      "beginCaptures": {
+        "3": { "name": "punctuation.definition.markdown" },
+        "4": { "name": "fenced_code.block.language.markdown" },
+        "5": { "name": "fenced_code.block.language.attributes.markdown" }
+      },
+      "endCaptures": {
+        "3": { "name": "punctuation.definition.markdown" }
+      },
       "patterns": [
         {
-          "begin": "(^|\\G)(\\s*)(.*)",
-          "while": "(^|\\G)(?!\\s*([`~]{3,})\\s*$)",
+          "begin": "(^|\\G)([[:space:]]*)(.*)",
+          "while": "(^|\\G)(?![[:space:]]*([`~]{3,})[[:space:]]*$)",
           "contentName": "meta.embedded.block.reason",
           "patterns": [
             {