From 813f771c0a8910875ae1d1a486d72f6170f64a33 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 25 Feb 2025 11:57:27 -0500
Subject: [PATCH] queries: Inject markdown into Rust doc comments

Co-authored-by: Nik Revenco <154856872+nik-rev@users.noreply.github.com>
---
 book/src/generated/lang-support.md              |  1 +
 languages.toml                                  |  9 +++++++++
 runtime/queries/markdown-rustdoc/highlights.scm |  1 +
 runtime/queries/markdown-rustdoc/injections.scm | 14 ++++++++++++++
 runtime/queries/rust/injections.scm             |  6 +++++-
 5 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 runtime/queries/markdown-rustdoc/highlights.scm
 create mode 100644 runtime/queries/markdown-rustdoc/injections.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index f6aee3fe3..2190d5d53 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -138,6 +138,7 @@
 | make | ✓ |  | ✓ |  |
 | markdoc | ✓ |  |  | `markdoc-ls` |
 | markdown | ✓ |  |  | `marksman`, `markdown-oxide` |
+| markdown-rustdoc | ✓ |  |  |  |
 | markdown.inline | ✓ |  |  |  |
 | matlab | ✓ | ✓ | ✓ |  |
 | mermaid | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 9870e49c4..a72cb6cd3 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1704,6 +1704,15 @@ block-comment-tokens = { start = "<!--", end = "-->" }
 name = "markdown"
 source = { git = "https://github.com/tree-sitter-grammars/tree-sitter-markdown", rev = "62516e8c78380e3b51d5b55727995d2c511436d8", subpath = "tree-sitter-markdown" }
 
+[[language]]
+name = "markdown-rustdoc"
+scope = "source.markdown-rustdoc"
+grammar = "markdown"
+injection-regex = "markdown-rustdoc"
+file-types = []
+indent = { tab-width = 2, unit = "  " }
+block-comment-tokens = { start = "<!--", end = "-->" }
+
 [[language]]
 name = "markdown.inline"
 scope = "source.markdown.inline"
diff --git a/runtime/queries/markdown-rustdoc/highlights.scm b/runtime/queries/markdown-rustdoc/highlights.scm
new file mode 100644
index 000000000..a3a30e342
--- /dev/null
+++ b/runtime/queries/markdown-rustdoc/highlights.scm
@@ -0,0 +1 @@
+; inherits: markdown
diff --git a/runtime/queries/markdown-rustdoc/injections.scm b/runtime/queries/markdown-rustdoc/injections.scm
new file mode 100644
index 000000000..1f2e29825
--- /dev/null
+++ b/runtime/queries/markdown-rustdoc/injections.scm
@@ -0,0 +1,14 @@
+; inherits: markdown
+
+; In Rust, it is common to have documentation code blocks not specify the
+; language, and it is assumed to be Rust if it is not specified.
+
+(fenced_code_block
+  (code_fence_content) @injection.content
+  (#set! injection.language "rust")
+  (#set! injection.include-unnamed-children))
+
+(fenced_code_block
+  (info_string
+    (language) @injection.language)
+  (code_fence_content) @injection.content (#set! injection.include-unnamed-children))
diff --git a/runtime/queries/rust/injections.scm b/runtime/queries/rust/injections.scm
index 964eec0f8..42ca12b5b 100644
--- a/runtime/queries/rust/injections.scm
+++ b/runtime/queries/rust/injections.scm
@@ -1,6 +1,10 @@
-([(line_comment) (block_comment)] @injection.content
+([(line_comment !doc) (block_comment !doc)] @injection.content
  (#set! injection.language "comment"))
 
+((doc_comment) @injection.content
+ (#set! injection.language "markdown-rustdoc")
+ (#set! injection.combined))
+
 ((macro_invocation
    macro:
      [