refactor: use treesitter for promote and demote

Author: kristijanhusak

lua/orgmode/config/init.lua

@@ -366,6 +366,11 @@ end
 ---@param amount number
 function Config:apply_indent(content, amount)
   local indent = self:get_indent(amount)
+
+  if indent == '' then
+    return content
+  end
+
   if type(content) ~= 'table' then
     return indent .. content
   end
@@ -376,5 +381,6 @@ function Config:apply_indent(content, amount)
   return content
 end
 
+---@type Config
 instance = Config:new()
 return instance

lua/orgmode/org/mappings.lua

@@ -465,21 +465,21 @@ function OrgMappings:_todo_change_state(direction)
 end
 
 function OrgMappings:do_promote(whole_subtree)
-  local item = Files.get_closest_headline()
-  local old_level = item.level
+  local headline = ts_org.closest_headline()
+  local old_level = headline:level()
   local foldclosed = vim.fn.foldclosed('.')
-  item:promote(1, whole_subtree)
+  headline:promote(1, whole_subtree)
   if foldclosed > -1 and vim.fn.foldclosed('.') == -1 then
     vim.cmd([[norm!zc]])
   end
   EventManager.dispatch(events.HeadlinePromoted:new(Files.get_closest_headline(), ts_org.closest_headline(), old_level))
 end
 
 function OrgMappings:do_demote(whole_subtree)
-  local item = Files.get_closest_headline()
-  local old_level = item.level
+  local headline = ts_org.closest_headline()
+  local old_level = headline:level()
   local foldclosed = vim.fn.foldclosed('.')
-  item:demote(1, whole_subtree)
+  headline:demote(1, whole_subtree)
   if foldclosed > -1 and vim.fn.foldclosed('.') == -1 then
     vim.cmd([[norm!zc]])
   end

lua/orgmode/parser/section.lua

@@ -404,35 +404,6 @@ function Section:demote(amount, demote_child_sections, dryRun)
   return lines
 end
 
----@param amount number
----@param promote_child_sections boolean
-function Section:promote(amount, promote_child_sections)
-  amount = amount or 1
-  promote_child_sections = promote_child_sections or false
-  if self.level == 1 then
-    return utils.echo_warning('Cannot demote top level heading.')
-  end
-  vim.api.nvim_call_function('setline', { self.range.start_line, self.line:sub(1 + amount) })
-  if config.org_indent_mode == 'indent' then
-    local contents = self.root:get_node_text_list(self.node)
-    for i, content in ipairs(contents) do
-      if i > 1 then
-        if content:match('^%*+') then
-          break
-        end
-        if vim.trim(content:sub(1, amount)) == '' then
-          vim.api.nvim_call_function('setline', { self.range.start_line + i - 1, content:sub(1 + amount) })
-        end
-      end
-    end
-  end
-  if promote_child_sections then
-    for _, section in ipairs(self.sections) do
-      section:promote(amount, true)
-    end
-  end
-end
-
 ---@return boolean
 function Section:has_planning()
   for _, date in ipairs(self.dates) do

lua/orgmode/treesitter/headline.lua

@@ -1,3 +1,4 @@
+local utils = require('orgmode.utils')
 local ts_utils = require('nvim-treesitter.ts_utils')
 local tree_utils = require('orgmode.utils.treesitter')
 local Date = require('orgmode.objects.date')
@@ -52,6 +53,78 @@ function Headline:priority()
   return self:parse('%[#(%w+)%]')
 end
 
+---@param amount number
+---@param recursive? boolean
+function Headline:promote(amount, recursive)
+  amount = amount or 1
+  recursive = recursive or false
+  if self:level() == 1 then
+    return utils.echo_warning('Cannot demote top level heading.')
+  end
+
+  return self:_handle_promote_demote(recursive, function(lines)
+    for i, line in ipairs(lines) do
+      if line:sub(1, 1) == '*' then
+        lines[i] = line:sub(1 + amount)
+      elseif vim.trim(line:sub(1, amount)) == '' then
+        lines[i] = line:sub(1 + amount)
+      end
+    end
+    return lines
+  end)
+end
+
+
+---@param amount number
+---@param recursive? boolean
+function Headline:demote(amount, recursive)
+  amount = amount or 1
+  recursive = recursive or false
+
+  return self:_handle_promote_demote(recursive, function(lines)
+    for i, line in ipairs(lines) do
+      if line:sub(1, 1) == '*' then
+        lines[i] = '*' .. line
+      else
+        lines[i] = config:apply_indent(line, amount)
+      end
+    end
+    return lines
+  end)
+end
+
+function Headline:_handle_promote_demote(recursive, modifier)
+  local whole_subtree = function()
+    local text = query.get_node_text(self.headline:parent(), 0)
+    local lines = modifier(vim.split(text, '\n', true))
+    local start_line, _, end_line, _ = self.headline:parent():range()
+    vim.api.nvim_buf_set_lines(0, start_line, end_line, false, lines)
+    return self:refresh()
+  end
+
+  if recursive then
+    return whole_subtree()
+  end
+
+  local first_child_section = nil
+  for _, node in ipairs(ts_utils.get_named_children(self.headline:parent())) do
+    if node:type() == 'section' then
+      first_child_section = node
+      break
+    end
+  end
+
+  if not first_child_section then
+    return whole_subtree()
+  end
+
+  local start = self.headline:start()
+  local end_line = first_child_section:start()
+  local lines = modifier(vim.api.nvim_buf_get_lines(0, start, end_line, false))
+  vim.api.nvim_buf_set_lines(0, start, end_line, false, lines)
+  return self:refresh()
+end
+
 ---@return userdata, string
 function Headline:tags()
   local node = self.headline:field('tags')[1]