refactor(capture): Split logic around refiling from org or capture buffer

Author: kristijanhusak

lua/orgmode/agenda/agenda_item.lua

@@ -55,7 +55,7 @@ function AgendaItem:new(headline_date, headline, date, index)
   return opts
 end
 
----@param headline Section
+---@param headline OrgHeadline
 function AgendaItem:set_headline(headline)
   self.headline = headline
   if self.is_valid then

lua/orgmode/agenda/filter.lua

@@ -43,8 +43,8 @@ function AgendaFilter:matches(headline)
   local tag_cat_match_empty = #self.tags == 0 and #self.categories == 0
 
   if not term_match then
-    local rgx = vim.regex(self.term)
-    term_match = rgx:match_str(headline:get_title())
+    local rgx = vim.regex(self.term) --[[@as vim.regex]]
+    term_match = rgx:match_str(headline:get_title()) and true or false
   end
 
   if tag_cat_match_empty then

lua/orgmode/api/init.lua

@@ -84,15 +84,16 @@ function OrgApi.refile(opts)
   end
 
   local source_bufnr = vim.fn.bufnr(opts.source.file.filename) or -1
+  local is_capture = source_bufnr > -1 and vim.b[source_bufnr].org_capture
 
-  if orgmode.capture._window then
+  if is_capture and orgmode.capture._window then
     refile_opts.template = orgmode.capture._window.template
   end
 
-  orgmode.capture:process_refile(refile_opts)
-
-  if source_bufnr > -1 and vim.b[source_bufnr].org_capture then
-    orgmode.capture:kill()
+  if is_capture then
+    orgmode.capture:_refile_from_capture_buffer(refile_opts)
+  else
+    orgmode.capture:_refile_from_org_file(refile_opts)
   end
 
   return true