Use tree-sitter highlights for block begin/end

Author: kristijanhusak

lua/orgmode/colors/highlights.lua

@@ -29,6 +29,7 @@ function M.link_ts_highlights()
     OrgTSPlan = 'Constant',
     OrgTSComment = 'Comment',
     OrgTSDirective = 'Comment',
+    OrgTSBlock = 'Comment',
   }
 
   for src, def in pairs(links) do
@@ -105,7 +106,7 @@ function M.define_org_headline_colors(faces)
     if not ts_highlights_enabled then
       vim.cmd([[syn match OrgHideLeadingStars /^\*\{2,\}/me=e-1 contained]])
     end
-    vim.cmd([[hi def link OrgHideLeadingStars org_hide_leading_stars]])
+    vim.cmd([[hi default OrgHideLeadingStars ctermfg=0 guifg=bg]])
     table.insert(contains, 'OrgHideLeadingStars')
   end
   contains = table.concat(contains, ',')

queries/org/highlights.scm

@@ -12,6 +12,9 @@
 (listitem . (bullet) . (paragraph . (expr "[" "str" @OrgCheckDone "]") @OrgTSCheckboxChecked (#match? @OrgTSCheckboxChecked "\[[xX]\]")))
 (listitem . (bullet) . (paragraph . (expr "[" "-" @OrgCheckInProgress "]") @OrgTSCheckboxHalfChecked (#eq? @OrgTSCheckboxHalfChecked "[-]")))
 (listitem . (bullet) . (paragraph . ((expr "[") @OrgTSCheckbox.left (#eq? @OrgTSCheckbox.left "[") . (expr "]") @OrgTSCheckbox.right (#eq? @OrgTSCheckbox.right "]"))))
+(block "#+begin_" @OrgTSBlock "#+end_" @OrgTSBlock "str" @OrgTSBlock)
+(block name: (expr) @OrgTSBlock)
+(block parameter: (expr) @OrgTSBlock)
  (property_drawer) @OrgTSPropertyDrawer
  (drawer) @OrgTSDrawer
  (tag) @OrgTSTag

syntax/org.vim

@@ -9,18 +9,8 @@ lua require('orgmode.org.syntax').add_todo_keywords_to_spellgood()
 let s:ts_highlight = luaeval('require("orgmode.config"):ts_highlights_enabled()')
 if !s:ts_highlight
   runtime syntax/org_legacy.vim
-else
-  syntax match org_block_delimiter /^\s*#+\(BEGIN_\|begin_\).*/
-  syntax match org_block_delimiter /^\s*#+\(END_\|end_\).*/
-  hi default link org_block_delimiter Comment
 endif
 
-hi org_hide_leading_stars ctermfg=0 guifg=bg
-
-" Tables
-syntax match org_table_hrule /^\s*|[-+]*|\s*$/
-hi org_table_hrule gui=NONE cterm=NONE
-
 syntax spell toplevel
 
 lua require("orgmode.org.syntax").load_code_blocks()