Merge pull request #469 from hsfzxjy/main

Fix injectionSelector of Kotlin markdown code block

Author: fwcd

grammars/codeblock.json

@@ -1,19 +1,42 @@
 {
     "fileTypes": [],
-    "injectionSelector": "L:markup.fenced_code.block.markdown",
+    "injectionSelector": "L:text.html.markdown",
     "patterns": [
         {
             "include": "#kotlin-code-block"
         }
     ],
     "repository": {
         "kotlin-code-block": {
-            "begin": "kotlin",
-            "end": "(^|\\G)(?=\\s*[`~]{3,}\\s*$)",
-            "contentName": "meta.embedded.block.kotlin",
+            "begin": "(^|\\G)(\\s*)(\\`{3,}|~{3,})\\s*(?i:(kotlin)(\\s+[^`~]*)?$)",
+            "name": "markup.fenced_code.block.markdown",
+            "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$",
+            "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": [
                 {
-                    "include": "source.kotlin"
+                    "begin": "(^|\\G)(\\s*)(.*)",
+                    "while": "(^|\\G)(?!\\s*([`~]{3,})\\s*$)",
+                    "contentName": "meta.embedded.block.kotlin",
+                    "patterns": [
+                        {
+                            "include": "source.kotlin"
+                        }
+                    ]
                 }
             ]
         }

grammars/vscode-grammar-dev/package.json

@@ -10,16 +10,36 @@
         "Programming Languages"
     ],
     "contributes": {
-        "languages": [{
-            "id": "kotlin",
-            "aliases": ["Kotlin", "kotlin"],
-            "extensions": [".kt",".kts"],
-            "configuration": "../kotlin.configuration.json"
-        }],
-        "grammars": [{
-            "language": "kotlin",
-            "scopeName": "source.kotlin",
-            "path": "../Kotlin.tmLanguage.json"
-        }]
+        "languages": [
+            {
+                "id": "kotlin",
+                "aliases": [
+                    "Kotlin",
+                    "kotlin"
+                ],
+                "extensions": [
+                    ".kt",
+                    ".kts"
+                ],
+                "configuration": "../kotlin.configuration.json"
+            }
+        ],
+        "grammars": [
+            {
+                "language": "kotlin",
+                "scopeName": "source.kotlin",
+                "path": "../Kotlin.tmLanguage.json"
+            },
+            {
+                "scopeName": "markdown.kotlin.codeblock",
+                "path": "../codeblock.json",
+                "injectTo": [
+                    "text.html.markdown"
+                ],
+                "embeddedLanguages": {
+                    "meta.embedded.block.kotlin": "kotlin"
+                }
+            }
+        ]
     }
 }