feat: Rename search arguments to agenda views

Author: kristijanhusak

lua/orgmode/agenda/types/search.lua

@@ -2,10 +2,10 @@
 local OrgAgendaTodosType = require('orgmode.agenda.types.todo')
 
 ---@class OrgAgendaSearchTypeOpts:OrgAgendaTodosTypeOpts
----@field headline_search? string
+---@field headline_query? string
 
 ---@class OrgAgendaSearchType:OrgAgendaTodosType
----@field headline_search? string
+---@field headline_query? string
 local OrgAgendaSearchType = {}
 OrgAgendaSearchType.__index = OrgAgendaSearchType
 
@@ -16,27 +16,27 @@ function OrgAgendaSearchType:new(opts)
   setmetatable(self, { __index = OrgAgendaTodosType })
   local obj = OrgAgendaTodosType:new(opts)
   setmetatable(obj, self)
-  obj.headline_search = self.headline_search
-  if not opts.headline_search or opts.headline_search == '' then
-    obj.headline_search = self:get_search_term()
+  obj.headline_query = self.headline_query
+  if not opts.headline_query or opts.headline_query == '' then
+    obj.headline_query = self:get_search_term()
   end
   return obj
 end
 
 function OrgAgendaSearchType:get_file_headlines(file)
-  return file:find_headlines_matching_search_term(self.headline_search or '', false, true)
+  return file:find_headlines_matching_search_term(self.headline_query or '', false, true)
 end
 
 function OrgAgendaSearchType:get_search_term()
-  return vim.fn.OrgmodeInput('Enter search term: ', self.headline_search or '')
+  return vim.fn.OrgmodeInput('Enter search term: ', self.headline_query or '')
 end
 
 function OrgAgendaSearchType:redo()
   -- Skip prompt for custom views
   if self.is_custom then
     return self
   end
-  self.headline_search = self:get_search_term()
+  self.headline_query = self:get_search_term()
   return self
 end
 

lua/orgmode/agenda/types/tags.lua

@@ -4,7 +4,7 @@ local Search = require('orgmode.files.elements.search')
 local OrgAgendaTodosType = require('orgmode.agenda.types.todo')
 
 ---@class OrgAgendaTagsTypeOpts:OrgAgendaTodosTypeOpts
----@field search_query? string
+---@field match_query? string
 
 ---@class OrgAgendaTagsType:OrgAgendaTodosType
 local OrgAgendaTagsType = {}
@@ -14,29 +14,29 @@ OrgAgendaTagsType.__index = OrgAgendaTagsType
 function OrgAgendaTagsType:new(opts)
   opts.todo_only = opts.todo_only or false
   opts.subheader = 'Press "r" to update search'
-  local search_query = opts.search_query
-  if not search_query or search_query == '' then
-    search_query = self:get_tags(opts.files)
-    if not search_query then
+  local match_query = opts.match_query
+  if not match_query or match_query == '' then
+    match_query = self:get_tags(opts.files)
+    if not match_query then
       return nil
     end
   end
 
   setmetatable(self, { __index = OrgAgendaTodosType })
   local obj = OrgAgendaTodosType:new(opts)
   setmetatable(obj, self)
-  obj.search_query = search_query
-  obj.header = 'Headlines with TAGS match: ' .. obj.search_query
+  obj.match_query = match_query
+  obj.header = 'Headlines with TAGS match: ' .. obj.match_query
   return obj
 end
 
 function OrgAgendaTagsType:get_file_headlines(file)
-  return file:apply_search(Search:new(self.search_query or ''), self.todo_only)
+  return file:apply_search(Search:new(self.match_query or ''), self.todo_only)
 end
 
 ---@param files? OrgFiles
 function OrgAgendaTagsType:get_tags(files)
-  local tags = vim.fn.OrgmodeInput('Match: ', self.search_query or '', function(arg_lead)
+  local tags = vim.fn.OrgmodeInput('Match: ', self.match_query or '', function(arg_lead)
     return utils.prompt_autocomplete(arg_lead, (files or self.files):get_tags())
   end)
   if vim.trim(tags) == '' then
@@ -46,11 +46,12 @@ function OrgAgendaTagsType:get_tags(files)
 end
 
 function OrgAgendaTagsType:redo()
+  -- Skip prompt for custom views
   if self.is_custom then
     return self
   end
-  self.search_query = self:get_tags() or ''
-  self.header = 'Headlines with TAGS match: ' .. self.search_query
+  self.match_query = self:get_tags() or ''
+  self.header = 'Headlines with TAGS match: ' .. self.match_query
   return self
 end