Fix adding closed date when marking non-scheduled headline as done. Fixes #286.

Author: kristijanhusak

lua/orgmode/config/init.lua

@@ -303,5 +303,12 @@ function Config:respect_blank_before_new_entry(content, option, prepend_content)
   return content
 end
 
+function Config:get_indent(amount)
+  if self.opts.org_indent_mode == 'indent' then
+    return string.rep(' ', amount)
+  end
+  return ''
+end
+
 instance = Config:new()
 return instance

lua/orgmode/parser/logbook.lua

@@ -154,10 +154,7 @@ function Logbook.new_from_section(section)
   else
     line = section:has_planning() and section.range.start_line + 1 or section.range.start_line
   end
-  local indent = ''
-  if config.org_indent_mode == 'indent' then
-    indent = string.rep(' ', section.level + 1)
-  end
+  local indent = config:get_indent(section.level + 1)
 
   local date = Date.now({ active = false })
   local content = {

lua/orgmode/parser/section.lua

@@ -389,10 +389,7 @@ function Section:add_properties(properties)
   end
 
   local properties_line = self:has_planning() and self.range.start_line + 1 or self.range.start_line
-  local indent = ''
-  if config.org_indent_mode == 'indent' then
-    indent = string.rep(' ', self.level + 1)
-  end
+  local indent = config:get_indent(self.level + 1)
   local content = { string.format('%s:PROPERTIES:', indent) }
 
   for name, val in pairs(properties) do
@@ -673,10 +670,7 @@ function Section:_add_planning_date(date, type, active)
     })
   end
 
-  local indent = ''
-  if config.org_indent_mode == 'indent' then
-    indent = string.rep(' ', self.level + 1)
-  end
+  local indent = config:get_indent(self.level + 1)
   return vim.api.nvim_call_function('append', {
     self.range.start_line,
     string.format('%s%s: %s', indent, type, date_string),

lua/orgmode/treesitter/headline.lua

@@ -1,11 +1,12 @@
 local ts_utils = require('nvim-treesitter.ts_utils')
 local tree_utils = require('orgmode.utils.treesitter')
+local Date = require('orgmode.objects.date')
 local config = require('orgmode.config')
 local query = vim.treesitter.query
 
 local Headline = {}
 
----@param headline userdata tree sitter headline node
+---@param headline_node userdata tree sitter headline node
 function Headline:new(headline_node)
   local data = { headline = headline_node }
   setmetatable(data, self)
@@ -17,6 +18,12 @@ function Headline:stars()
   return self.headline:field('stars')[1]
 end
 
+---@return number
+function Headline:level()
+  local stars = self:stars()
+  return query.get_node_text(stars, 0):len()
+end
+
 function Headline:priority()
   return self:parse('%[#(%w+)%]')
 end
@@ -83,6 +90,11 @@ end
 function Headline:dates()
   local plan = self:plan()
   local dates = {}
+
+  if not plan then
+    return dates
+  end
+
   for _, node in ipairs(ts_utils.get_named_children(plan)) do
     local name = vim.treesitter.query.get_node_text(node:named_child(0), 0)
     dates[name] = node
@@ -103,12 +115,21 @@ end
 
 function Headline:add_closed_date()
   local dates = self:dates()
-  if vim.tbl_count(dates) == 0 or dates['CLOSED'] then
+  if dates['CLOSED'] then
     return
   end
+  local closed_text = 'CLOSED: ' .. Date.now():to_wrapped_string(false)
+  if vim.tbl_isempty(dates) then
+    local indent = config:get_indent(self:level() + 1)
+    local start_line = self.headline:start()
+    return vim.api.nvim_call_function('append', {
+      start_line + 1,
+      string.format('%s%s', indent, closed_text),
+    })
+  end
   local last_child = dates['DEADLINE'] or dates['SCHEDULED']
   local ptext = query.get_node_text(last_child, 0)
-  local text = ptext .. ' CLOSED: [' .. vim.fn.strftime('%Y-%m-%d %a %H:%M') .. ']'
+  local text = ptext .. ' ' .. closed_text
   tree_utils.set_node_text(last_child, text)
 end
 
@@ -117,7 +138,11 @@ function Headline:remove_closed_date()
   if vim.tbl_count(dates) == 0 or not dates['CLOSED'] then
     return
   end
+  local line_nr = dates['CLOSED']:start() + 1
   tree_utils.set_node_text(dates['CLOSED'], '', true)
+  if vim.trim(vim.fn.getline(line_nr)) == '' then
+    return vim.api.nvim_call_function('deletebufline', { vim.api.nvim_get_current_buf(), line_nr })
+  end
 end
 
 -- @return tsnode, string