feat(version)!: Drop support for Neovim < 0.11.0

Author: kristijanhusak

README.org

@@ -18,7 +18,7 @@ Orgmode clone written in Lua for Neovim
 
 *** Requirements
 
-- Neovim 0.10.3 or later
+- Neovim 0.11.0 or later
 
 *** Installation
 :PROPERTIES:

docs/index.org

@@ -1,7 +1,7 @@
 #+OPTIONS: H:9 ^:nil
 * Nvim Orgmode
 
-Nvim orgmode is a clone of Emacs Orgmode for Neovim 0.10.3+.
+Nvim orgmode is a clone of Emacs Orgmode for Neovim 0.11.0+.
 It aims to be a feature-complete implementation of Orgmode features in Neovim.
 
 Online version of this documentation is available at [[https://nvim-orgmode.github.io]].

lua/orgmode/api/init.lua

@@ -2,7 +2,6 @@
 local OrgFile = require('orgmode.api.file')
 local OrgHeadline = require('orgmode.api.headline')
 local orgmode = require('orgmode')
-local validator = require('orgmode.utils.validator')
 local Promise = require('orgmode.utils.promise')
 local utils = require('orgmode.utils')
 
@@ -16,7 +15,7 @@ local OrgApi = {}
 ---@param name? string|string[] specific file names to return (absolute path). If ommitted, returns all loaded files
 ---@return OrgApiFile|OrgApiFile[]
 function OrgApi.load(name)
-  validator.validate('name', name, { 'string', 'table' }, true)
+  vim.validate('name', name, { 'string', 'table' }, true)
   if not name then
     return vim.tbl_map(function(file)
       return OrgFile._build_from_internal_file(file)
@@ -56,8 +55,8 @@ end
 ---@param opts OrgApiRefileOpts
 ---@return OrgPromise<boolean>
 function OrgApi.refile(opts)
-  validator.validate('source', opts.source, 'table')
-  validator.validate('destination', opts.destination, 'table')
+  vim.validate('source', opts.source, 'table')
+  vim.validate('destination', opts.destination, 'table')
 
   if getmetatable(opts.source) ~= OrgHeadline then
     error('Source must be an OrgApiHeadline', 0)

lua/orgmode/capture/template/init.lua

@@ -1,7 +1,6 @@
 local TemplateProperties = require('orgmode.capture.template.template_properties')
 local Date = require('orgmode.objects.date')
 local utils = require('orgmode.utils')
-local validator = require('orgmode.utils.validator')
 local Calendar = require('orgmode.objects.calendar')
 local Promise = require('orgmode.utils.promise')
 local Input = require('orgmode.ui.input')
@@ -99,15 +98,15 @@ local Template = {}
 function Template:new(opts)
   opts = opts or {}
 
-  validator.validate('description', opts.description, 'string', true)
-  validator.validate('template', opts.template, { 'string', 'table' }, true)
-  validator.validate('target', opts.target, 'string', true)
-  validator.validate('regexp', opts.regexp, 'string', true)
-  validator.validate('headline', opts.headline, 'string', true)
-  validator.validate('properties', opts.properties, 'table', true)
-  validator.validate('subtemplates', opts.subtemplates, 'table', true)
-  validator.validate('datetree', opts.datetree, { 'boolean', 'table' }, true)
-  validator.validate('whole_file', opts.whole_file, 'boolean', true)
+  vim.validate('description', opts.description, 'string', true)
+  vim.validate('template', opts.template, { 'string', 'table' }, true)
+  vim.validate('target', opts.target, 'string', true)
+  vim.validate('regexp', opts.regexp, 'string', true)
+  vim.validate('headline', opts.headline, 'string', true)
+  vim.validate('properties', opts.properties, 'table', true)
+  vim.validate('subtemplates', opts.subtemplates, 'table', true)
+  vim.validate('datetree', opts.datetree, { 'boolean', 'table' }, true)
+  vim.validate('whole_file', opts.whole_file, 'boolean', true)
 
   local this = {}
   this.description = opts.description or ''

lua/orgmode/capture/template/template_properties.lua

@@ -1,12 +1,11 @@
-local validator = require('orgmode.utils.validator')
 ---@class OrgCaptureTemplateProperties
 ---@field empty_lines { before: integer, after: integer } | number
 local TemplateProperties = {}
 
 function TemplateProperties:new(opts)
   opts = opts or {}
 
-  validator.validate('empty_lines', opts.empty_lines, { 'table', 'number' }, true)
+  vim.validate('empty_lines', opts.empty_lines, { 'table', 'number' }, true)
 
   local empty_lines = opts.empty_lines or {}
   if type(empty_lines) == 'number' then

lua/orgmode/capture/templates.lua

@@ -1,6 +1,5 @@
 local config = require('orgmode.config')
 local Template = require('orgmode.capture.template')
-local validator = require('orgmode.utils.validator')
 
 ---@see https://orgmode.org/manual/Capture-templates.html
 
@@ -13,7 +12,7 @@ local Templates = {}
 function Templates:new(templates)
   local opts = {}
 
-  validator.validate('templates', templates, 'table', true)
+  vim.validate('templates', templates, 'table', true)
 
   opts.templates = {}
   for key, template in pairs(templates or config.org_capture_templates) do

lua/orgmode/colors/highlighter/markup/link.lua

@@ -1,6 +1,5 @@
 ---@class OrgLinkHighlighter : OrgMarkupHighlighter
 ---@field private markup OrgMarkupHighlighter
----@field private has_extmark_url_support boolean
 ---@field private last_start_node_id? string
 local OrgLink = {
   valid_capture_names = {
@@ -14,7 +13,6 @@ OrgLink.__index = OrgLink
 function OrgLink:new(opts)
   local this = setmetatable({
     markup = opts.markup,
-    has_extmark_url_support = vim.fn.has('nvim-0.10.2') == 1,
   }, OrgLink)
   this:_set_directive()
   return this
@@ -34,7 +32,7 @@ function OrgLink:_set_directive()
     node = node and node[#node]
     metadata['image.ignore'] = true
 
-    if not node or not self.has_extmark_url_support then
+    if not node then
       return
     end
 
@@ -199,10 +197,6 @@ function OrgLink:is_valid_end_node(entry)
 end
 
 function OrgLink:_get_url(bufnr, line, start_col, end_col)
-  if not self.has_extmark_url_support then
-    return nil
-  end
-
   return vim.api.nvim_buf_get_text(bufnr, line, start_col, line, end_col, {})[1]
 end
 

lua/orgmode/config/mappings/map_entry.lua

@@ -1,5 +1,3 @@
-local validator = require('orgmode.utils.validator')
-
 ---@class OrgMapEntry
 ---@field provided_opts table
 ---@field handler string
@@ -52,11 +50,11 @@ end
 ---@param opts? table<string, any>
 function MapEntry:new(handler, opts)
   opts = opts or {}
-  validator.validate('handler', handler, { 'string', 'function' })
-  validator.validate('modes', opts.modes, 'table', true)
-  validator.validate('desc', opts.desc, 'string', true)
-  validator.validate('help_desc', opts.help_desc, 'string', true)
-  validator.validate('type', opts.type, 'string', true)
+  vim.validate('handler', handler, { 'string', 'function' })
+  vim.validate('modes', opts.modes, 'table', true)
+  vim.validate('desc', opts.desc, 'string', true)
+  vim.validate('help_desc', opts.help_desc, 'string', true)
+  vim.validate('type', opts.type, 'string', true)
 
   local data = {}
   data.provided_opts = opts

lua/orgmode/ui/menu.lua

@@ -1,4 +1,3 @@
-local validator = require('orgmode.utils.validator')
 local config = require('orgmode.config')
 
 ---@class OrgMenuOption
@@ -40,14 +39,14 @@ end
 
 ---@param option OrgMenuOption
 function Menu:_validate_option(option)
-  validator.validate('label', option.label, 'string')
-  validator.validate('key', option.key, 'string')
-  validator.validate('action', option.action, 'function', true)
+  vim.validate('label', option.label, 'string')
+  vim.validate('key', option.key, 'string')
+  vim.validate('action', option.action, 'function', true)
 end
 
 ---@param items OrgMenuItem[]?
 function Menu:_validate_items(items)
-  validator.validate('items', items, 'table', true)
+  vim.validate('items', items, 'table', true)
   if not items then
     return
   end
@@ -65,17 +64,17 @@ end
 
 ---@param separator OrgMenuSeparator?
 function Menu:_validate_separator(separator)
-  validator.validate('separator', separator, 'table', true)
+  vim.validate('separator', separator, 'table', true)
   if separator then
-    validator.validate('icon', separator.icon, 'string', true)
-    validator.validate('length', separator.length, 'number', true)
+    vim.validate('icon', separator.icon, 'string', true)
+    vim.validate('length', separator.length, 'number', true)
   end
 end
 
 ---@param data OrgMenuOpts
 function Menu:_validate_data(data)
-  validator.validate('title', data.title, 'string')
-  validator.validate('prompt', data.prompt, 'string')
+  vim.validate('title', data.title, 'string')
+  vim.validate('prompt', data.prompt, 'string')
   self:_validate_items(data.items)
   self:_validate_separator(data.separator)
 end

lua/orgmode/utils/promise.lua

@@ -1,4 +1,3 @@
-local validator = require('orgmode.utils.validator')
 ---@diagnostic disable: undefined-field
 -- Taken from https://github.com/notomo/promise.nvim
 
@@ -46,8 +45,8 @@ local new_empty_userdata = function()
 end
 
 local new_pending = function(on_fullfilled, on_rejected)
-  validator.validate('on_fullfilled', on_fullfilled, 'function', true)
-  validator.validate('on_rejected', on_rejected, 'function', true)
+  vim.validate('on_fullfilled', on_fullfilled, 'function', true)
+  vim.validate('on_rejected', on_rejected, 'function', true)
   local tbl = {
     _status = PromiseStatus.Pending,
     _queued = {},
@@ -84,7 +83,7 @@ end
 --- @param executor fun(resolve:fun(...:any),reject:fun(...:any))
 --- @return OrgPromise
 function Promise.new(executor)
-  validator.validate('executor', executor, 'function')
+  vim.validate('executor', executor, 'function')
 
   local self = new_pending()
 
@@ -224,8 +223,8 @@ end
 --- @param on_rejected (fun(...:any):any)?: A callback on rejected.
 --- @return OrgPromise
 function Promise.next(self, on_fullfilled, on_rejected)
-  validator.validate('on_fullfilled', on_fullfilled, 'function', true)
-  validator.validate('on_rejected', on_rejected, 'function', true)
+  vim.validate('on_fullfilled', on_fullfilled, 'function', true)
+  vim.validate('on_rejected', on_rejected, 'function', true)
   local promise = new_pending(on_fullfilled, on_rejected)
   table.insert(self._queued, promise)
   vim.schedule(function()
@@ -250,7 +249,7 @@ end
 --- @param on_finally fun()
 --- @return OrgPromise
 function Promise.finally(self, on_finally)
-  validator.validate('on_finally', on_finally, 'function', true)
+  vim.validate('on_finally', on_finally, 'function', true)
   return self
     :next(function(...)
       on_finally()
@@ -310,7 +309,7 @@ end
 --- @param list any[]: promise or non-promise values
 --- @return OrgPromise
 function Promise.all(list)
-  validator.validate('list', list, 'table')
+  vim.validate('list', list, 'table')
   return Promise.new(function(resolve, reject)
     local remain = #list
     if remain == 0 then
@@ -341,9 +340,9 @@ end
 --- @param concurrency? number: limit number of concurrent items processing
 --- @return OrgPromise
 function Promise.map(callback, list, concurrency)
-  validator.validate('list', list, 'table')
-  validator.validate('callback', callback, 'function')
-  validator.validate('concurrency', concurrency, 'number', true)
+  vim.validate('list', list, 'table')
+  vim.validate('callback', callback, 'function')
+  vim.validate('concurrency', concurrency, 'number', true)
 
   local results = {}
   local processing = 0
@@ -392,7 +391,7 @@ end
 --- @param list any[]: promise or non-promise values
 --- @return OrgPromise
 function Promise.race(list)
-  validator.validate('list', list, 'table')
+  vim.validate('list', list, 'table')
   return Promise.new(function(resolve, reject)
     for _, e in ipairs(list) do
       Promise.resolve(e)
@@ -411,7 +410,7 @@ end
 --- @param list any[]: promise or non-promise values
 --- @return OrgPromise
 function Promise.any(list)
-  validator.validate('list', list, 'table')
+  vim.validate('list', list, 'table')
   return Promise.new(function(resolve, reject)
     local remain = #list
     if remain == 0 then
@@ -441,7 +440,7 @@ end
 --- @param list any[]: promise or non-promise values
 --- @return OrgPromise
 function Promise.all_settled(list)
-  validator.validate('list', list, 'table')
+  vim.validate('list', list, 'table')
   return Promise.new(function(resolve)
     local remain = #list
     if remain == 0 then