fix(links): Unfold when jumping to headline

Fixes #861

Author: kristijanhusak

lua/orgmode/agenda/init.lua

@@ -326,9 +326,7 @@ function Agenda:switch_to_item()
   if not item then
     return
   end
-  vim.cmd('edit ' .. vim.fn.fnameescape(item.file.filename))
-  vim.fn.cursor({ item:get_range().start_line, 1 })
-  vim.cmd([[normal! zv]])
+  utils.goto_headline(item)
 end
 
 function Agenda:change_todo_state()
@@ -494,9 +492,7 @@ function Agenda:goto_item()
     vim.cmd([[aboveleft split]])
   end
 
-  vim.cmd('edit ' .. vim.fn.fnameescape(item.file.filename))
-  vim.fn.cursor({ item:get_range().start_line, 1 })
-  vim.cmd([[normal! zv]])
+  utils.goto_headline(item)
 end
 
 function Agenda:filter()

lua/orgmode/clock/init.lua

@@ -92,10 +92,7 @@ function Clock:org_clock_goto()
     utils.echo_info('No running clock, this is the most recently clocked task')
   end
 
-  if utils.current_file_path() ~= self.clocked_headline.file then
-    vim.cmd('edit ' .. vim.fn.fnameescape(self.clocked_headline.file.filename))
-  end
-  vim.fn.cursor({ self.clocked_headline:get_range().start_line, 1 })
+  utils.goto_headline(self.clocked_headline)
 end
 
 function Clock:org_set_effort()

lua/orgmode/org/links/types/id.lua

@@ -45,7 +45,8 @@ function OrgLinkId:follow(link)
     return true
   end
   local headline = headlines[1]
-  return link_utils.goto_headline(headline)
+  utils.goto_headline(headline)
+  return true
 end
 
 ---@return string[]

lua/orgmode/org/links/utils.lua

@@ -8,20 +8,6 @@ function link_utils.goto_file(file)
   return true
 end
 
----@param headline OrgHeadline
----@return boolean
-function link_utils.goto_headline(headline)
-  local current_file_path = utils.current_file_path()
-  if headline.file.filename ~= current_file_path then
-    vim.cmd(string.format('edit %s', headline.file.filename))
-  else
-    vim.cmd([[normal! m']]) -- add link source to jumplist
-  end
-  vim.fn.cursor({ headline:get_range().start_line, 1 })
-  vim.cmd([[normal! zv]])
-  return true
-end
-
 ---@param headlines OrgHeadline[]
 ---@param file_path string
 ---@param error_message string
@@ -36,7 +22,8 @@ function link_utils.goto_oneof_headlines(headlines, file_path, error_message)
   end
 
   if #headlines == 1 then
-    return link_utils.goto_headline(headlines[1])
+    utils.goto_headline(headlines[1])
+    return true
   end
 
   local longest_headline = utils.reduce(headlines, function(acc, h)
@@ -55,7 +42,8 @@ function link_utils.goto_oneof_headlines(headlines, file_path, error_message)
     return true
   end
 
-  return link_utils.goto_headline(headlines[choice])
+  utils.goto_headline(headlines[choice])
+  return true
 end
 
 ---@param file_path string

lua/orgmode/utils/init.lua

@@ -625,4 +625,16 @@ function utils.input(prompt, default, completion_fn)
   return result
 end
 
+---@param headline OrgHeadline
+function utils.goto_headline(headline)
+  local current_file_path = utils.current_file_path()
+  if headline.file.filename ~= current_file_path then
+    vim.cmd(string.format('edit %s', headline.file.filename))
+  else
+    vim.cmd([[normal! m']]) -- add link source to jumplist
+  end
+  vim.fn.cursor({ headline:get_range().start_line, 1 })
+  vim.cmd([[normal! zv]])
+end
+
 return utils