Migration to ts-org parser 0.2.0.

Author: kristijanhusak

README.md

@@ -75,7 +75,7 @@ local parser_config = require "nvim-treesitter.parsers".get_parser_configs()
 parser_config.org = {
   install_info = {
     url = 'https://github.com/milisims/tree-sitter-org',
-    revision = 'f110024d539e676f25b72b7c80b0fd43c34264ef',
+    revision = 'main',
     files = {'src/parser.c', 'src/scanner.cc'},
   },
   filetype = 'org',
@@ -105,7 +105,7 @@ local parser_config = require "nvim-treesitter.parsers".get_parser_configs()
 parser_config.org = {
   install_info = {
     url = 'https://github.com/milisims/tree-sitter-org',
-    revision = 'f110024d539e676f25b72b7c80b0fd43c34264ef',
+    revision = 'main',
     files = {'src/parser.c', 'src/scanner.cc'},
   },
   filetype = 'org',

lua/orgmode/colors/todo_highlighter.lua

@@ -31,10 +31,10 @@ local function add_todo_keyword_highlights()
         end, todo_keywords.DONE),
         ' '
       )
-      table.insert(lines, string.format([[(item "keyword?" @OrgTODO (#any-of? @OrgTODO %s))]], todo_type))
-      table.insert(lines, string.format([[(item "keyword?" @OrgDONE (#any-of? @OrgDONE %s))]], done_type))
+      table.insert(lines, string.format([[(item . (expr) @OrgTODO (#any-of? @OrgTODO %s))]], todo_type))
+      table.insert(lines, string.format([[(item . (expr) @OrgDONE (#any-of? @OrgDONE %s))]], done_type))
       for face_name, face_hl in pairs(faces) do
-        table.insert(lines, string.format([[(item "keyword?" @%s (#eq? @%s %s))]], face_hl, face_hl, face_name))
+        table.insert(lines, string.format([[(item . (expr) @%s (#eq? @%s %s))]], face_hl, face_hl, face_name))
       end
       vim.treesitter.set_query('org', 'highlights', table.concat(lines, '\n'))
       if vim.bo.filetype == 'org' then

lua/orgmode/objects/date.lua

@@ -213,6 +213,35 @@ local function from_string(datestr, opts)
   return parse_date(date, dayname, adjustments, opts)
 end
 
+--- @param datestr string
+--- @return table[]
+local function parse_parts(datestr)
+  local result = {}
+  local counter = 1
+  local patterns = {
+    { type = 'date', rgx = '^%d%d%d%d%-%d%d%-%d%d$' },
+    { type = 'dayname', rgx = '^%a%a%a$' },
+    { type = 'time', rgx = '^%d?%d:%d%d$' },
+    { type = 'time_range', rgx = '^%d?%d:%d%d%-%d?%d:%d%d$' },
+    { type = 'adjustment', rgx = '^[%.%+%-]+%d+[hdwmy]?$' },
+  }
+  for space, item in string.gmatch(datestr, '(%s*)(%S+)') do
+    local from = counter + space:len()
+    for _, dt_pattern in ipairs(patterns) do
+      if item:match(dt_pattern.rgx) then
+        table.insert(result, {
+          type = dt_pattern.type,
+          value = item,
+          from = from,
+          to = from + item:len() - 1,
+        })
+        counter = counter + item:len() + space:len()
+      end
+    end
+  end
+  return result
+end
+
 local function from_org_date(datestr, opts)
   local from_open, from, from_close, delimiter, to_open, to, to_close = datestr:match(pattern .. '(%-%-)' .. pattern)
   if not delimiter then
@@ -858,6 +887,7 @@ local function parse_all_from_line(line, lnum)
 end
 
 return {
+  parse_parts = parse_parts,
   from_org_date = from_org_date,
   from_string = from_string,
   now = now,

lua/orgmode/objects/edit_special/init.lua

@@ -21,12 +21,7 @@ function EditSpecial:new()
 end
 
 function EditSpecial:_parse_position()
-  local nearest_block_node_info = utils.get_nearest_block_node(
-    self.file,
-    { 'name', 'contents', 'parameters' },
-    self.org_pos,
-    true
-  )
+  local nearest_block_node_info = utils.get_nearest_block_node(self.file, self.org_pos, true)
 
   if not nearest_block_node_info then
     utils.echo_warning('No block node found near cursor')

lua/orgmode/org/mappings.lua

@@ -183,38 +183,70 @@ function OrgMappings:_adjust_date_part(direction, amount, fallback)
   local do_replacement = function(date)
     local col = vim.fn.col('.')
     local char = vim.fn.getline('.'):sub(col, col)
+    local raw_date_value = vim.fn.getline('.'):sub(date.range.start_col + 1, date.range.end_col - 1)
     if col == date.range.start_col or col == date.range.end_col then
       date.active = not date.active
       return self:_replace_date(date)
     end
-    local node = Files.get_node_at_cursor()
     local col_from_start = col - date.range.start_col
-    local modify_end_time = false
+    local parts = Date.parse_parts(raw_date_value)
     local adj = nil
-    if node:type() == 'date' then
-      if col_from_start <= 5 then
+    local modify_end_time = false
+    local part = nil
+    for _, p in ipairs(parts) do
+      if col_from_start >= p.from and col_from_start <= p.to then
+        part = p
+        break
+      end
+    end
+
+    if not part then
+      return
+    end
+
+    local offset = col_from_start - part.from
+
+    if part.type == 'date' then
+      if offset <= 4 then
         adj = get_adj('y')
-      elseif col_from_start <= 8 then
+      elseif offset <= 7 then
         adj = get_adj('m')
-      elseif col_from_start <= 15 then
+      else
         adj = get_adj('d')
       end
-    elseif node:type() == 'time' then
-      local has_end_time = node:parent() and node:parent():type() == 'timerange'
-      if col_from_start <= 17 then
+    end
+
+    if part.type == 'dayname' then
+      adj = get_adj('d')
+    end
+
+    if part.type == 'time' then
+      if offset <= 2 then
+        adj = get_adj('h')
+      else
+        adj = minute_adj
+      end
+    end
+
+    if part.type == 'time_range' then
+      if offset <= 2 then
         adj = get_adj('h')
-      elseif col_from_start <= 20 then
+      elseif offset <= 5 then
         adj = minute_adj
-      elseif has_end_time and col_from_start <= 23 then
+      elseif offset <= 8 then
         adj = get_adj('h')
         modify_end_time = true
-      elseif has_end_time and col_from_start <= 26 then
+      else
         adj = minute_adj
         modify_end_time = true
       end
-    elseif (node:type() == 'repeater' or node:type() == 'delay') and char:match('[hdwmy]') ~= nil then
+    end
+
+    if part.type == 'adjustment' then
       local map = { h = 'd', d = 'w', w = 'm', m = 'y', y = 'h' }
-      vim.cmd(string.format('norm!r%s', map[char]))
+      if map[char] then
+        vim.cmd(string.format('norm!r%s', map[char]))
+      end
       return true
     end
 
@@ -397,6 +429,9 @@ function OrgMappings:handle_return(suffix)
   suffix = suffix or ''
   local current_file = Files.get_current_file()
   local item = current_file:get_current_node()
+  if item.type == 'expr' then
+    item = current_file:convert_to_file_node(item.node:parent())
+  end
 
   if item.node:parent() and item.node:parent():type() == 'headline' then
     item = current_file:convert_to_file_node(item.node:parent())

lua/orgmode/parser/file.lua

@@ -43,7 +43,8 @@ end
 
 function File:_parse()
   self:_parse_source_code_filetypes()
-  self:_parse_sections_and_root_directives()
+  self:_parse_directives()
+  self:_parse_sections()
 end
 
 function File:get_errors()
@@ -335,11 +336,8 @@ function File:get_section(index)
 end
 
 ---@private
-function File:_parse_sections_and_root_directives()
+function File:_parse_sections()
   for child in self.tree:root():iter_children() do
-    if child:type() == 'directive' then
-      self:_parse_directive(child)
-    end
     if child:type() == 'section' then
       local section = Section.from_node(child, self)
       table.insert(self.sections, section)
@@ -366,11 +364,10 @@ end
 
 ---@private
 function File:_parse_source_code_filetypes()
-  local blocks = self:get_ts_matches('(block (name) @name (parameters) @parameters (#eq? @name "SRC"))')
+  local blocks = self:get_ts_matches('(block name: (expr) @name parameter: (expr) @parameters (#eq? @name "SRC"))')
   local source_code_filetypes = {}
   for _, item in ipairs(blocks) do
-    local params = vim.split(item.parameters.text, '%s+')
-    local ft = params[1]
+    local ft = item.parameters and item.parameters.text
     if
       ft
       and ft ~= ''
@@ -383,18 +380,15 @@ function File:_parse_source_code_filetypes()
   self.source_code_filetypes = source_code_filetypes
 end
 
-function File:_parse_directive(node)
-  local name = node:named_child(0)
-  local value = node:named_child(1)
-  if not name or not value then
-    return
-  end
-
-  local name_text = self:get_node_text(name)
-  if name_text:upper() == 'FILETAGS' then
-    local value_text = self:get_node_text(value)
-    self.tags = utils.parse_tags_string(value_text)
+function File:_parse_directives()
+  local directives = self:get_ts_matches(
+    [[(directive name: (expr) @name value: (value) @value (#match? @name "\\cfiletags"))]]
+  )
+  local tags = {}
+  for _, directive in ipairs(directives) do
+    utils.concat(tags, utils.parse_tags_string(directive.value.text), true)
   end
+  self.tags = tags
 end
 
 return File

lua/orgmode/parser/section.lua

@@ -88,49 +88,41 @@ function Section.from_node(section_node, file, parent)
 
   for child in section_node:iter_children() do
     if child:type() == 'plan' then
-      local plan_children = ts_utils.get_named_children(child)
-      local len = #plan_children
-      local i = 1
-      while i <= len do
-        local plan_item = plan_children[i]
-        if not plan_item then
-          break
-        end
-        local next_item = plan_children[i + 1]
-
-        local type = 'NONE'
-        local node = plan_item
-        local item_type = plan_item:type():upper()
-
-        if item_type == 'NAME' and next_item and next_item:type():upper() == 'TIMESTAMP' then
-          local t = file:get_node_text(plan_item):upper()
-          if t == 'DEADLINE:' or t == 'SCHEDULED:' or t == 'CLOSED:' then
-            node = next_item
-            type = t:sub(1, t:len() - 1)
-            i = i + 1
+      for entry in child:iter_children() do
+        if entry:type() == 'entry' then
+          local first_node = entry:named_child(0)
+          local first_node_text = file:get_node_text(first_node)
+          if entry:named_child_count() == 1 and first_node:type() == 'timestamp' then
+            utils.concat(
+              data.dates,
+              Date.from_org_date(first_node_text, {
+                range = Range.from_node(first_node),
+              })
+            )
+          end
+          if entry:named_child_count() == 2 and first_node:type() == 'entry_name' then
+            local valid_plan_types = { 'SCHEDULED', 'DEADLINE', 'CLOSED' }
+            local type = 'NONE'
+            if vim.tbl_contains(valid_plan_types, first_node_text:upper()) then
+              type = first_node_text
+            end
+            local timestamp = file:get_node_text(entry:named_child(1))
+            utils.concat(
+              data.dates,
+              Date.from_org_date(timestamp, {
+                range = Range.from_node(entry:named_child(1)),
+                type = type,
+              })
+            )
           end
         end
-
-        local date = file:get_node_text(node)
-        utils.concat(
-          data.dates,
-          Date.from_org_date(date, {
-            type = type,
-            range = Range.from_node(node),
-          })
-        )
-        i = i + 1
       end
     end
     if child:type() == 'body' then
-      local dates = file:get_ts_matches('(timestamp) @timestamp', child)
-      for _, date in ipairs(dates) do
-        utils.concat(
-          data.dates,
-          Date.from_org_date(date.timestamp.text, {
-            range = Range.from_node(date.timestamp.node),
-          })
-        )
+      local start_line = child:range()
+      local lines = file:get_node_text_list(child)
+      for i, line in ipairs(lines) do
+        utils.concat(data.dates, Date.parse_all_from_line(line, start_line + i))
       end
       local drawers = file:get_ts_matches('(drawer) @drawer', child)
       for _, drawer_item in ipairs(drawers) do
@@ -166,13 +158,16 @@ function Section.from_node(section_node, file, parent)
           data.title = file:get_node_text(headline_node)
           data.todo_keyword_node = headline_node:child(0)
         end
-        if headline_node:type() == 'tag' then
-          local tag = file:get_node_text(headline_node)
-          if not vim.tbl_contains(data.tags, tag) then
-            table.insert(data.tags, tag)
-          end
-          if not vim.tbl_contains(data.own_tags, tag) then
-            table.insert(data.own_tags, tag)
+        if headline_node:type() == 'tag_list' then
+          local tags = ts_utils.get_named_children(headline_node)
+          for _, tag_node in ipairs(tags) do
+            local tag = file:get_node_text(tag_node)
+            if not vim.tbl_contains(data.tags, tag) then
+              table.insert(data.tags, tag)
+            end
+            if not vim.tbl_contains(data.own_tags, tag) then
+              table.insert(data.own_tags, tag)
+            end
           end
         end
       end