fix: Adapt headline level to destination headline on refile (#557)

Author: kristijanhusak

lua/orgmode/capture/init.lua

@@ -239,12 +239,17 @@ function Capture:refile_to_headline(destination_filename, lines, item, headline_
     end
   end
 
-  if item and item.level <= headline.level then
+  if item then
     -- Refiling in same file just moves the lines from one position
     -- to another,so we need to apply demote instantly
     local is_same_file = destination_file.filename == item.root.filename
-    lines = item:demote(headline.level - item.level + 1, true, not is_same_file)
+    if item.level <= headline.level then
+      lines = item:demote(headline.level - item.level + 1, true, not is_same_file)
+    else
+      lines = item:promote(item.level - headline.level - 1, true, not is_same_file)
+    end
   end
+
   local refiled = self:_refile_to(destination_filename, lines, item, headline.range.end_line)
   if not refiled then
     return false

lua/orgmode/parser/section.lua

@@ -437,6 +437,53 @@ function Section:demote(amount, demote_child_sections, dryRun)
   return lines
 end
 
+---@param amount number
+---@param promote_child_sections? boolean
+---@param dryRun? boolean
+---@return string[]
+function Section:promote(amount, promote_child_sections, dryRun)
+  amount = amount or 1
+  promote_child_sections = promote_child_sections or false
+  local should_dedent = config.org_indent_mode == 'indent'
+  local lines = {}
+  if self.level == 1 then
+    utils.echo_warning('Cannot demote top level heading.')
+    return lines
+  end
+  local headline_line = self.line:sub(1 + amount)
+  table.insert(lines, headline_line)
+  if not dryRun then
+    vim.api.nvim_call_function('setline', { self.range.start_line, headline_line })
+  end
+  if should_dedent 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
+        local can_dedent = vim.trim(content:sub(1, amount)) == ''
+        local content_line = content
+        if can_dedent then
+          content_line = content:sub(1 + amount)
+        end
+        table.insert(lines, content_line)
+        if not dryRun and can_dedent then
+          vim.api.nvim_call_function('setline', { self.range.start_line + i - 1, content_line })
+        end
+      end
+    end
+  end
+
+  if promote_child_sections then
+    for _, section in ipairs(self.sections) do
+      utils.concat(lines, section:promote(amount, true, dryRun))
+    end
+  end
+
+  return lines
+end
+
 ---@return boolean
 function Section:has_planning()
   for _, date in ipairs(self.dates) do

tests/plenary/ui/mappings_spec.lua

@@ -1701,6 +1701,56 @@ describe('Mappings', function()
     }, vim.api.nvim_buf_get_lines(0, 0, 5, false))
   end)
 
+  it('should refile to headline and properly demote', function()
+    local destination_file = helpers.load_file_content({
+      '* foobar',
+      '* baz',
+      '** foo',
+    })
+
+    local source_file = helpers.load_file_content({
+      '* to be refiled',
+      '* not to be refiled',
+    })
+
+    source_file = Files.get_current_file()
+    local item = source_file:get_closest_headline()
+    org.instance().capture:refile_to_headline(destination_file, source_file:get_headline_lines(item), item, 'foobar')
+    assert.are.same('* not to be refiled', vim.fn.getline(1))
+    vim.cmd('edit' .. vim.fn.fnameescape(destination_file))
+    assert.are.same({
+      '* foobar',
+      '** to be refiled',
+      '* baz',
+      '** foo',
+    }, vim.api.nvim_buf_get_lines(0, 0, 5, false))
+  end)
+
+  it('should refile to headline and properly promote', function()
+    local destination_file = helpers.load_file_content({
+      '* foobar',
+      '* baz',
+      '** foo',
+    })
+
+    local source_file = helpers.load_file_content({
+      '**** to be refiled',
+      '* not to be refiled',
+    })
+
+    source_file = Files.get_current_file()
+    local item = source_file:get_closest_headline()
+    org.instance().capture:refile_to_headline(destination_file, source_file:get_headline_lines(item), item, 'foobar')
+    assert.are.same('* not to be refiled', vim.fn.getline(1))
+    vim.cmd('edit' .. vim.fn.fnameescape(destination_file))
+    assert.are.same({
+      '* foobar',
+      '** to be refiled',
+      '* baz',
+      '** foo',
+    }, vim.api.nvim_buf_get_lines(0, 0, 5, false))
+  end)
+
   it('should update the checklist cookies on a headline', function()
     helpers.load_file_content({
       '* Test orgmode [/]',