Merge remote-tracking branch 'Frojdholm/markdown-codeblock-highlighting'

This commit is contained in:
Maxime Coste 2021-07-07 19:09:05 +10:00
commit 5b7d544299

View File

@ -55,12 +55,13 @@ evaluate-commands %sh{
done done
} }
add-highlighter shared/markdown/codeblock region -match-capture \ add-highlighter shared/markdown/inline/codeblock region -match-capture \
^(\h*)```\h* \ ^(\h*)```\h* \
^(\h*)```\h*$ \ ^(\h*)```\h*$ \
fill meta fill meta
add-highlighter shared/markdown/codeblock region "^( {4}|\t)" "$" fill meta
add-highlighter shared/markdown/listblock region ^\h*[-*]\s ^\h*((?=[-*])|$) regions add-highlighter shared/markdown/listblock region ^\h*[-*]\s ^(?=\S) regions
add-highlighter shared/markdown/listblock/g default-region group add-highlighter shared/markdown/listblock/g default-region group
add-highlighter shared/markdown/listblock/g/ ref markdown/inline add-highlighter shared/markdown/listblock/g/ ref markdown/inline
add-highlighter shared/markdown/listblock/g/marker regex ^\h*([-*])\s 1:bullet add-highlighter shared/markdown/listblock/g/marker regex ^\h*([-*])\s 1:bullet
@ -91,9 +92,6 @@ add-highlighter shared/markdown/inline/text/ regex (?<!_)(__([^\s_]|([^\s_](\n?[
add-highlighter shared/markdown/inline/text/ regex ^\h*(>\h*)+ 0:comment add-highlighter shared/markdown/inline/text/ regex ^\h*(>\h*)+ 0:comment
add-highlighter shared/markdown/inline/text/ regex "\H( {2,})$" 1:+r@meta add-highlighter shared/markdown/inline/text/ regex "\H( {2,})$" 1:+r@meta
# Inline code
add-highlighter shared/markdown/inline/text/ regex "^( {4}|\t)+([^\n]+)" 2:meta
# Commands # Commands
# ‾‾‾‾‾‾‾‾ # ‾‾‾‾‾‾‾‾