merge: branch 'feature/treesit'

Fix: #7742
Fix: #7623
Fix: #7593

modules/lang/markdown/README.org

@@ -33,11 +33,16 @@ for Markdown's syntax is the format of plain text email. -- John Gruber
 - +grip ::
   Enable [[https://github.com/seagle0128/grip-mode][grip support]] (on [[kbd:][<localleader> p]]), to provide live github-style
   previews of your markdown (or org) files.
+- +tree-sitter ::
+  Leverages tree-sitter for better syntax highlighting and structural text
+  editing. Requires [[doom-module::tools tree-sitter]]. Note that tree-sitter
+  support on Emacs 31 is superior to 30 and under.
 
 ** Packages
 - [[doom-package:edit-indirect]]
 - [[doom-package:evil-markdown]] if [[doom-module::editor evil +everywhere]]
 - [[doom-package:grip-mode]] if [[doom-module:+grip]]
+- [[doom-package:markdown-ts-mode]] if [[doom-module:+tree-sitter]]
 - [[doom-package:markdown-mode]]
 - [[doom-package:markdown-toc]]
 

modules/lang/markdown/config.el

@@ -130,6 +130,13 @@ capture, the end position, and the output buffer.")
          :desc "GFM checkbox"      "x" #'markdown-toggle-gfm-checkbox)))
 
 
+(use-package! markdown-ts-mode  ; 31+ only
+  :when (modulep! +tree-sitter)
+  :defer t
+  :init
+  (set-tree-sitter! 'markdown-mode 'markdown-ts-mode '(markdown markdown-inline)))
+
+
 (use-package! evil-markdown
   :when (modulep! :editor evil +everywhere)
   :hook (markdown-mode . evil-markdown-mode)

modules/lang/markdown/doctor.el

@@ -1,6 +1,10 @@
 ;; -*- lexical-binding: t; no-byte-compile: t; -*-
 ;;; lang/markdown/doctor.el
 
+(assert! (or (not (modulep! +tree-sitter))
+             (modulep! :tools tree-sitter))
+         "This module requires (:tools tree-sitter)")
+
 (when (require 'markdown-mode nil t)
   (cond ((eq markdown-command #'+markdown-compile)
          (unless (cl-loop for (exe . cmd) in (list (cons "marked" '+markdown-compile-marked)

modules/lang/markdown/packages.el

@@ -8,6 +8,11 @@
 ;; present when you call `markdown-edit-code-block'.
 (package! edit-indirect :pin "82a28d8a85277cfe453af464603ea330eae41c05")
 
+(when (modulep! +tree-sitter)
+  (package! markdown-ts-mode
+    :built-in 'prefer  ; Emacs 31+ has a superior markdown-ts-mode
+    :pin "2f1ee8b94cdf53cebc31ae08ecfbba846193d5e1"))
+
 (when (modulep! +grip)
   (package! grip-mode :pin "11fecd5b38c78597ff53a39fb3a090e7c80350fa"))