4 files changed, 37 insertions, 22 deletions

diff --git a/lua/nvim-treesitter/configs.lua b/lua/nvim-treesitter/configs.lua
index cb0b8b5a..5fddd162 100644
--- a/lua/nvim-treesitter/configs.lua
+++ b/lua/nvim-treesitter/configs.lua
@@ -25,8 +25,7 @@ local builtin_modules = {
     enable = false,
     custom_captures = {},
     is_supported = function(lang)
-      -- FIXME(vigoux): markdown highlighting breaks everything for now
-      return lang ~= "markdown" and queries.has_highlights(lang)
+      return queries.has_highlights(lang)
     end,
     additional_vim_regex_highlighting = false,
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index a757fdd1..57280e82 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -433,13 +433,14 @@ list.hcl = {
   used_by = { "terraform" },
 }
 
--- FIXME(vigoux): markdown is broken for now
--- list.markdown = {
---   install_info = {
---     url = "https://github.com/ikatyang/tree-sitter-markdown",
---     files = { "src/parser.c", "src/scanner.cc" },
---   }
--- }
+list.markdown = {
+  install_info = {
+    url = "https://github.com/MDeiml/tree-sitter-markdown",
+    files = { "src/parser.c", "src/scanner.cc" },
+    branch = "main",
+  },
+  experimental = true,
+}
 
 list.tlaplus = {
   install_info = {
diff --git a/queries/markdown/highlights.scm b/queries/markdown/highlights.scm
index 268d0c1c..55dcc918 100644
--- a/queries/markdown/highlights.scm
+++ b/queries/markdown/highlights.scm
@@ -1,21 +1,35 @@
-(atx_heading) @text.title
-
+;; From MDeiml/tree-sitter-markdown
 [
-  (code_span)
-  (fenced_code_block)
-]@text.literal
+  (atx_heading)
+  (setext_heading)
+] @text.title
 
 (code_fence_content) @none
 
 [
-  (link_text)
-  (image_description)
-] @text.strong
+  (indented_code_block)
+  (fenced_code_block)
+  (code_span)
+] @text.literal
+
+
+(emphasis) @text.emphasis
+
+(strong_emphasis) @text.strong
 
-[
-  (emphasis)
-  (strong_emphasis)
-] @text.emphasis
 (link_destination) @text.uri
 
-(html_comment) @comment
+(link_label) @text.reference
+
+[
+  (list_marker_plus)
+  (list_marker_minus)
+  (list_marker_star)
+  (list_marker_dot)
+  (list_marker_parenthesis)
+] @punctuation.special
+
+[
+  (backslash_escape)
+  (hard_line_break)
+] @string.escape
diff --git a/queries/markdown/injections.scm b/queries/markdown/injections.scm
index 42328ad2..f2724833 100644
--- a/queries/markdown/injections.scm
+++ b/queries/markdown/injections.scm
@@ -3,3 +3,4 @@
   (code_fence_content) @content)
 
 ((html_block) @html)
+((html_tag) @html)