Use split_parser branch for markdown grammar (#3108)

4 files changed, 85 insertions, 39 deletions

diff --git a/runtime/queries/markdown.inline/highlights.scm b/runtime/queries/markdown.inline/highlights.scm
new file mode 100644
index 00000000..ee0926a5
--- /dev/null
+++ b/runtime/queries/markdown.inline/highlights.scm
@@ -0,0 +1,39 @@
+;; From nvim-treesitter/nvim-treesitter
+[
+  (code_span)
+  (link_title)
+] @markup.raw.inline
+
+[
+  (emphasis_delimiter)
+  (code_span_delimiter)
+] @punctuation.bracket
+
+(emphasis) @markup.italic
+
+(strong_emphasis) @markup.bold
+
+(strikethrough) @markup.strikethrough
+
+[
+  (link_destination)
+  (uri_autolink)
+] @markup.link.url
+
+[
+  (link_text)
+  (image_description)
+] @markup.link.text
+
+(link_label) @markup.link.label
+
+[
+  (backslash_escape)
+  (hard_line_break)
+] @constant.character.escape
+
+(image ["[" "]" "(" ")"] @punctuation.bracket)
+(image "!" @punctuation.special)
+(inline_link ["[" "]" "(" ")"] @punctuation.bracket)
+(shortcut_link ["[" "]"] @punctuation.bracket)
+
diff --git a/runtime/queries/markdown.inline/injections.scm b/runtime/queries/markdown.inline/injections.scm
new file mode 100644
index 00000000..c137a822
--- /dev/null
+++ b/runtime/queries/markdown.inline/injections.scm
@@ -0,0 +1,2 @@
+
+((html_tag) @injection.content (#set! injection.language "html"))
diff --git a/runtime/queries/markdown/highlights.scm b/runtime/queries/markdown/highlights.scm
index 096c2954..25f22ba7 100644
--- a/runtime/queries/markdown/highlights.scm
+++ b/runtime/queries/markdown/highlights.scm
@@ -1,54 +1,53 @@
-(setext_heading (heading_content) @markup.heading.1 (setext_h1_underline) @markup.heading.marker)
-(setext_heading (heading_content) @markup.heading.2 (setext_h2_underline) @markup.heading.marker)
 
-(atx_heading (atx_h1_marker) @markup.heading.marker (heading_content) @markup.heading.1)
-(atx_heading (atx_h2_marker) @markup.heading.marker (heading_content) @markup.heading.2)
-(atx_heading (atx_h3_marker) @markup.heading.marker (heading_content) @markup.heading.3)
-(atx_heading (atx_h4_marker) @markup.heading.marker (heading_content) @markup.heading.4)
-(atx_heading (atx_h5_marker) @markup.heading.marker (heading_content) @markup.heading.5)
-(atx_heading (atx_h6_marker) @markup.heading.marker (heading_content) @markup.heading.6)
+(setext_heading (paragraph) @markup.heading.1 (setext_h1_underline) @markup.heading.marker)
+(setext_heading (paragraph) @markup.heading.2 (setext_h2_underline) @markup.heading.marker)
+
+(atx_heading (atx_h1_marker) @markup.heading.marker (inline) @markup.heading.1)
+(atx_heading (atx_h2_marker) @markup.heading.marker (inline) @markup.heading.2)
+(atx_heading (atx_h3_marker) @markup.heading.marker (inline) @markup.heading.3)
+(atx_heading (atx_h4_marker) @markup.heading.marker (inline) @markup.heading.4)
+(atx_heading (atx_h5_marker) @markup.heading.marker (inline) @markup.heading.5)
+(atx_heading (atx_h6_marker) @markup.heading.marker (inline) @markup.heading.6)
 
 [
   (indented_code_block)
-  (code_fence_content)
+  (fenced_code_block)
 ] @markup.raw.block
 
-(block_quote) @markup.quote
-
-(code_span) @markup.raw.inline
-
-(emphasis) @markup.italic
-
-(strong_emphasis) @markup.bold
+(info_string) @label
 
-(link_destination) @markup.link.url
-(link_label) @markup.link.label
+[
+  (fenced_code_block_delimiter)
+] @punctuation.bracket
 
-(info_string) @label
+[
+  (link_destination)
+] @markup.link.url
 
 [
-  (link_text)
-  (image_description)
-] @markup.link.text
+  (link_label)
+] @markup.link.label
 
 [
   (list_marker_plus)
   (list_marker_minus)
   (list_marker_star)
-] @markup.list.numbered
+] @markup.list.unnumbered
 
 [
   (list_marker_dot)
   (list_marker_parenthesis)
-] @markup.list.unnumbered
+] @markup.list.numbered
+
+(thematic_break) @punctuation.delimiter
 
 [
-  (backslash_escape)
-  (hard_line_break)
-] @constant.character.escape
+  (block_continuation)
+  (block_quote_marker)
+] @punctuation.special
 
-(thematic_break) @punctuation.delimiter
+[
+  (backslash_escape)
+] @string.escape
 
-(inline_link ["[" "]" "(" ")"] @punctuation.bracket)
-(image ["[" "]" "(" ")"] @punctuation.bracket)
-(fenced_code_block_delimiter) @punctuation.bracket
+(block_quote) @markup.quote
diff --git a/runtime/queries/markdown/injections.scm b/runtime/queries/markdown/injections.scm
index 10dcab0b..9940e961 100644
--- a/runtime/queries/markdown/injections.scm
+++ b/runtime/queries/markdown/injections.scm
@@ -1,9 +1,15 @@
+; From nvim-treesitter/nvim-treesitter
+
 (fenced_code_block
-  (info_string) @injection.language
-  (code_fence_content) @injection.content
-  (#set! injection.include-children))
-
-((html_block) @injection.content
- (#set! injection.language "html"))
-((html_tag) @injection.content
- (#set! injection.language "html"))
+  (info_string
+    (language) @injection.language)
+  (code_fence_content) @injection.content (#set! injection.include-unnamed-children))
+
+((html_block) @injection.content (#set! injection.language "html") (#set! injection.include-unnamed-children))
+
+([
+  (minus_metadata)
+  (plus_metadata)
+] @injection.content (#set! injection.language "yaml") (#set! injection.include-unnamed-children))
+
+((inline) @injection.content (#set! injection.language "markdown.inline") (#set! injection.include-unnamed-children))