chore: Fix types and remove unused code

Author: kristijanhusak

lua/orgmode/capture/_meta.lua

@@ -0,0 +1,29 @@
+---@meta
+
+---@class OrgProcessRefileOpts
+---@field source_headline OrgHeadline
+---@field destination_file? OrgFile
+---@field destination_headline? OrgHeadline
+---@field lines? string[]
+---@field message? string
+
+---@class OrgProcessCaptureOpts
+---@field template OrgCaptureTemplate
+---@field source_file OrgFile
+---@field source_headline? OrgHeadline
+---@field destination_file OrgFile
+---@field destination_headline? OrgHeadline
+
+---@class OrgDatetreeTreeItem
+---@field format string - The lua date format to use for the tree item
+---@field pattern string - Pattern to match important date parts the date format
+---@field order number[] - Order of checking the date parts matched from the pattern
+
+---@class OrgCaptureTemplateDatetreeOpts
+---@field date OrgDate
+---@field time_prompt? boolean
+---@field reversed? boolean
+---@field tree? OrgDatetreeTreeItem[]
+---@field tree_type? 'day' | 'week' | 'month' | 'custom'
+
+---@alias OrgCaptureTemplateDatetree boolean | OrgCaptureTemplateDatetreeOpts

lua/orgmode/capture/init.lua

@@ -8,20 +8,6 @@ local CaptureWindow = require('orgmode.capture.window')
 local Date = require('orgmode.objects.date')
 local Datetree = require('orgmode.capture.template.datetree')
 
----@class OrgProcessRefileOpts
----@field source_headline OrgHeadline
----@field destination_file? OrgFile
----@field destination_headline? OrgHeadline
----@field lines? string[]
----@field message? string
-
----@class OrgProcessCaptureOpts
----@field template OrgCaptureTemplate
----@field source_file OrgFile
----@field source_headline? OrgHeadline
----@field destination_file OrgFile
----@field destination_headline? OrgHeadline
-
 ---@class OrgCapture
 ---@field templates OrgCaptureTemplates
 ---@field closing_note OrgCaptureWindow
@@ -30,11 +16,11 @@ local Datetree = require('orgmode.capture.template.datetree')
 local Capture = {}
 Capture.__index = Capture
 
----@param opts { files: OrgFiles }
+---@param opts { files: OrgFiles, templates?: OrgCaptureTemplates }
 function Capture:new(opts)
   local this = setmetatable({}, self)
   this.files = opts.files
-  this.templates = Templates:new()
+  this.templates = opts.templates or Templates:new()
   this.closing_note = this:_setup_closing_note()
   return this
 end

lua/orgmode/capture/template/init.lua

@@ -34,20 +34,6 @@ local expansions = {
   end,
 }
 
----@class OrgDatetreeTreeItem
----@field format string - The lua date format to use for the tree item
----@field pattern string - Pattern to match important date parts the date format
----@field order number[] - Order of checking the date parts matched from the pattern
-
----@class OrgCaptureTemplateDatetreeOpts
----@field date OrgDate
----@field time_prompt? boolean
----@field reversed? boolean
----@field tree? OrgDatetreeTreeItem[]
----@field tree_type? 'day' | 'week' | 'month' | 'custom'
-
----@alias OrgCaptureTemplateDatetree boolean | OrgCaptureTemplateDatetreeOpts
-
 ---@class OrgCaptureTemplate
 ---@field description? string
 ---@field template? string|string[]

lua/orgmode/config/init.lua

@@ -127,24 +127,6 @@ end
 
 function Config:_deprecation_notify(opts)
   local messages = {}
-  if
-    opts.mappings
-    and opts.mappings.org
-    and (opts.mappings.org.org_increase_date or opts.mappings.org.org_decrease_date)
-  then
-    table.insert(
-      messages,
-      'org_increase_date/org_decrease_date mappings are deprecated in favor of org_timestamp_up/org_timestamp_down (More granular increase/decrease).'
-    )
-    table.insert(messages, 'See https://github.com/nvim-orgmode/orgmode/blob/tree-sitter/DOCS.md#changelog')
-    if opts.mappings.org.org_increase_date then
-      opts.mappings.org.org_timestamp_up = opts.mappings.org.org_increase_date
-    end
-    if opts.mappings.org.org_decrease_date then
-      opts.mappings.org.org_timestamp_down = opts.mappings.org.org_decrease_date
-    end
-  end
-
   if opts.org_indent_mode and type(opts.org_indent_mode) == 'string' then
     table.insert(
       messages,
@@ -369,7 +351,7 @@ function Config:setup_ts_predicates()
     end
 
     return false
-  end, true)
+  end, { force = true })
 
   vim.treesitter.query.add_predicate('org-is-valid-priority?', function(match, _, source, predicate)
     local node = match[predicate[2]]
@@ -404,7 +386,7 @@ function Config:setup_ts_predicates()
     local todo_text = vim.treesitter.get_node_text(prev_sibling, source)
     local is_prev_sibling_todo_keyword = todo_keywords[todo_text] and true or false
     return is_prev_sibling_todo_keyword
-  end, true)
+  end, { force = true })
 
   vim.treesitter.query.add_directive('org-set-block-language!', function(match, _, bufnr, pred, metadata)
     local lang_node = match[pred[2]]
@@ -416,7 +398,7 @@ function Config:setup_ts_predicates()
       return
     end
     metadata['injection.language'] = utils.detect_filetype(text) or text
-  end, true)
+  end, { force = true })
 end
 
 ---@param content table

lua/orgmode/files/elements/table/cell.lua

@@ -55,7 +55,7 @@ function TableCell:to_string()
   return self.content
 end
 
----@param data table
+---@param data table | string
 ---@param col_number number
 ---@param row OrgTableRow
 ---@return OrgTableCell

lua/orgmode/files/file.lua

@@ -16,7 +16,7 @@ local Link = require('orgmode.org.hyperlinks.link')
 ---@field lines string[]
 ---@field content string
 ---@field metadata OrgFileMetadata
----@field parser LanguageTree
+---@field parser vim.treesitter.LanguageTree
 ---@field root TSNode
 local OrgFile = {}
 

lua/orgmode/objects/edit_special/init.lua

@@ -1,4 +1,3 @@
-local Help = require('orgmode.objects.help')
 local config = require('orgmode.config')
 local ts_utils = require('orgmode.utils.treesitter')
 local utils = require('orgmode.utils')