[BREAKING CHANGE] Update tree-sitter grammar to latest version. Run :TSUpdate org

Author: kristijanhusak

lua/orgmode/init.lua

@@ -1,5 +1,5 @@
 _G.orgmode = _G.orgmode or {}
-local ts_revision = 'f78edf1ab65c854ef25356c2a96222e87d15c5c5'
+local ts_revision = 'a2c1946d78fa8529bb4cfedd598fd6dbce5c79a7'
 local setup_ts_grammar_used = false
 local instance = nil
 

lua/orgmode/treesitter/listitem.lua

@@ -30,24 +30,12 @@ function Listitem:get_new_checkbox_value(action, current_value, total_child_chec
 end
 
 function Listitem:checkbox()
-  local contents = self.listitem:field('contents')
-  for _, content in ipairs(contents) do
-    if content:type() == 'paragraph' then
-      for child in content:iter_children() do
-        local text = query.get_node_text(child, 0)
-        if text:match('%[[Xx-]%]') then
-          return { text = text, range = { child:range() } }
-        end
-
-        -- empty checkboxes are split into two nodes, so we need to hack this together
-        local next_sibling = child:next_sibling()
-        if next_sibling and text == '[' and query.get_node_text(next_sibling, 0) == ']' then
-          local sr, sc, er, ec = child:range()
-          return { text = '[ ]', range = { sr, sc, er, ec + 2 } }
-        end
-      end
-    end
+  local checkbox = self.listitem:field('checkbox')[1]
+  if not checkbox then
+    return nil
   end
+  local text = query.get_node_text(checkbox, 0)
+  return { text = text, range = { checkbox:range() } }
 end
 
 function Listitem:update_checkbox(action)

queries/org/highlights.scm

@@ -8,13 +8,17 @@
 (headline (stars) @stars (#eq? @stars "******")) @OrgTSHeadlineLevel6
 (headline (stars) @stars (#eq? @stars "*******")) @OrgTSHeadlineLevel7
 (headline (stars) @stars (#eq? @stars "********")) @OrgTSHeadlineLevel8
- (bullet) @OrgTSBullet
-(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)
+(bullet) @OrgTSBullet
+(checkbox) @OrgTSCheckbox
+(checkbox status: (expr "-") @OrgTSCheckboxHalfChecked)
+(checkbox status: (expr "str") @OrgTSCheckboxChecked (#any-of? @OrgTSCheckboxChecked "x" "X"))
+(block "#+begin_" @OrgTSBlock "#+end_" @OrgTSBlock)
 (block name: (expr) @OrgTSBlock)
+(block end_name: (expr) @OrgTSBlock)
 (block parameter: (expr) @OrgTSBlock)
+(dynamic_block name: (expr) @OrgTSBlock)
+(dynamic_block end_name: (expr) @OrgTSBlock)
+(dynamic_block parameter: (expr) @OrgTSBlock)
 (property_drawer) @OrgTSPropertyDrawer
 (latex_env) @OrgTSLatex
 (drawer) @OrgTSDrawer