feat(ts): use timestamp nodes for all dates

Author: kristijanhusak

lua/orgmode/files/file.lua

@@ -172,6 +172,9 @@ end
 function OrgFile:get_ts_matches(query, node)
   self:parse()
   node = node or self.root
+  if not node then
+    return {}
+  end
   local ts_query = ts_utils.get_query(query)
   local matches = {}
 

lua/orgmode/files/headline.lua

@@ -759,39 +759,46 @@ memoize('get_non_plan_dates')
 function Headline:get_non_plan_dates()
   local headline_node = self:node()
   local section = headline_node:parent()
-  local body = section and section:field('body')[1]
-  local headline_text = self.file:get_node_text(headline_node) or ''
-  local dates = Date.parse_all_from_line(headline_text, self:node():start() + 1)
-  local properties_node = section and section:field('property_drawer')[1]
+  if not section then
+    return {}
+  end
 
-  if properties_node then
-    local properties_text = self.file:get_node_text_list(properties_node) or {}
-    local start = properties_node:start()
-    for i, line in ipairs(properties_text) do
-      vim.list_extend(dates, Date.parse_all_from_line(line, start + i))
-    end
+  local body_node = section:field('body')[1]
+  local property_node = section:field('property_drawer')[1]
+  local matches = {}
+
+  local headline_matches = self.file:get_ts_matches('(item (timestamp) @timestamp)', headline_node)
+  vim.list_extend(matches, headline_matches)
+
+  if property_node then
+    local property_matches = self.file:get_ts_matches('(property (value (timestamp) @timestamp))', property_node)
+    vim.list_extend(matches, property_matches)
   end
 
-  if not body then
-    return dates
-  end
-
-  local start_line = body:range()
-  local lines = self.file:get_node_text_list(body, ts_utils.range_with_zero_start_col(body))
-  for i, line in ipairs(lines) do
-    local line_dates = Date.parse_all_from_line(line, start_line + i)
-    local is_clock_line = line:match('^%s*:?CLOCK:') ~= nil
-    for _, date in ipairs(line_dates) do
-      -- Assume that the date is part of logbook if line starts with clock
-      -- TODO: Make this more reliable
-      if not date.active and is_clock_line then
-        date.type = 'LOGBOOK'
-      end
-    end
-    vim.list_extend(dates, line_dates)
+  if body_node then
+    local body_matches = self.file:get_ts_matches(
+      [[
+        (paragraph (timestamp) @timestamp)
+        (table (row (cell (contents (timestamp) @timestamp))))
+        (drawer (contents (timestamp) @timestamp))
+        (fndef (description (timestamp) @timestamp))
+      ]],
+      body_node
+    )
+    vim.list_extend(matches, body_matches)
   end
 
-  return dates
+  local all_dates = {}
+  local source = self.file:get_source()
+  for _, match in ipairs(matches) do
+    local dates = Date.from_org_date(match.timestamp.text, {
+      range = Range.from_node(match.timestamp.node),
+      type = ts_utils.is_date_in_drawer(match.timestamp.node, 'logbook', source) and 'LOGBOOK' or 'NONE',
+    })
+    vim.list_extend(all_dates, dates)
+  end
+
+  return all_dates
 end
 
 ---@param sorted? boolean

lua/orgmode/objects/date.lua

@@ -127,34 +127,6 @@ local function parse_date(date, adjustments, data)
   return OrgDate:new(opts)
 end
 
----@param line string
----@param lnum number
----@param open string
----@param datetime string
----@param close string
----@param last_match? OrgDate
----@param type? string
----@return OrgDate | nil
-local function from_match(line, lnum, open, datetime, close, last_match, type)
-  local search_from = last_match ~= nil and last_match.range.end_col or 0
-  local from, to = line:find(vim.pesc(open .. datetime .. close), search_from)
-  local is_date_range_end = last_match and last_match.is_date_range_start and line:sub(from - 2, from - 1) == '--'
-  local opts = {
-    type = type,
-    active = open == '<',
-    range = Range:new({ start_line = lnum, end_line = lnum, start_col = from, end_col = to }),
-    is_date_range_start = line:sub(to + 1, to + 2) == '--',
-  }
-  local parsed_date = OrgDate.from_string(vim.trim(datetime), opts)
-  if is_date_range_end then
-    parsed_date.is_date_range_end = true
-    parsed_date.related_date = last_match
-    last_match.related_date = parsed_date
-  end
-
-  return parsed_date
-end
-
 ---@param opts OrgDateOpts
 ---@return OrgDate
 function OrgDate:new(opts)
@@ -340,24 +312,6 @@ function OrgDate.is_date_instance(value)
   return getmetatable(value) == OrgDate
 end
 
----@param line string
----@param lnum number
----@return OrgDate[]
-function OrgDate.parse_all_from_line(line, lnum)
-  local is_comment = line:match('^%s*#[^%+]')
-  if is_comment then
-    return {}
-  end
-  local dates = {}
-  for open, datetime, close in line:gmatch(pattern) do
-    local parsed_date = from_match(line, lnum, open, datetime, close, dates[#dates])
-    if parsed_date then
-      table.insert(dates, parsed_date)
-    end
-  end
-  return dates
-end
-
 ---@param datestr string
 ---@param opts? OrgDateOpts
 ---@return OrgDate | nil

lua/orgmode/org/mappings.lua

@@ -16,6 +16,7 @@ local Babel = require('orgmode.babel')
 local Promise = require('orgmode.utils.promise')
 local Input = require('orgmode.ui.input')
 local Footnote = require('orgmode.objects.footnote')
+local Range = require('orgmode.files.elements.range')
 
 ---@class OrgMappings
 ---@field capture OrgCapture
@@ -1123,19 +1124,22 @@ function OrgMappings:_get_date_under_cursor(col_offset)
   local item = self.files:get_closest_headline_or_nil()
   local dates = {}
   if item then
-    dates = vim.tbl_filter(function(date)
-      return date.range:is_in_range(line, col)
-    end, item:get_all_dates())
+    dates = item:get_all_dates()
   else
-    dates = Date.parse_all_from_line(vim.fn.getline('.'), line)
-  end
-
-  if #dates == 0 then
-    return nil
+    local date_node = ts_utils.closest_node(ts_utils.get_node(), 'timestamp')
+    if not date_node then
+      return nil
+    end
+    dates = Date.from_org_date(vim.treesitter.get_node_text(date_node, 0), {
+      range = Range.from_node(date_node),
+      type = ts_utils.is_date_in_drawer(date_node, 'logbook') and 'LOGBOOK' or 'NONE',
+    })
   end
 
-  -- TODO: this will result in a bug, when more than one date is in the line
-  return dates[1]
+  local valid_dates = vim.tbl_filter(function(date)
+    return date.range:is_in_range(line, col)
+  end, dates)
+  return valid_dates[1]
 end
 
 ---@param amount number

lua/orgmode/utils/treesitter/init.lua

@@ -118,6 +118,23 @@ function M.parents_until(node, type)
   end
 end
 
+---@param node TSNode
+---@param drawer string
+---@param source? number|string
+---@return boolean
+function M.is_date_in_drawer(node, drawer, source)
+  if
+    (node:parent() and node:parent():type() == 'contents')
+    and (node:parent():parent() and node:parent():parent():type() == 'drawer')
+  then
+    local drawer_node = node:parent():parent() --[[@as TSNode]]
+    local drawer_name = vim.treesitter.get_node_text(drawer_node:field('name')[1], source or 0)
+    return drawer_name:lower() == drawer
+  end
+
+  return false
+end
+
 function M.node_to_lsp_range(node)
   local start_line, start_col, end_line, end_col = vim.treesitter.get_node_range(node)
   local rtn = {}

queries/org/injections.scm

@@ -1,2 +1,3 @@
  (block parameter: (expr) @_lang (contents) @injection.content (#set! injection.include-children) (#org-set-block-language! @_lang))
+ ; (inline_code_block language: (language) @_lang contents: (contents) @injection.content (#set! injection.include-children) (#org-set-block-language! @_lang))
  (latex_env (contents) @injection.content (#set! injection.include-children) (#set! injection.language "tex"))