feat!: Update minimum Neovim version to 0.9+

Author: kristijanhusak

README.md

@@ -8,7 +8,7 @@
   <a href="/LICENSE">![License](https://img.shields.io/badge/license-MIT-brightgreen?style=flat-square)</a><a href="https://ko-fi.com/kristijanhusak"> ![Kofi](https://img.shields.io/badge/support-kofi-00b9fe?style=flat-square&logo=kofi)</a><a href="https://matrix.to/#/#neovim-orgmode:matrix.org"> ![Chat](https://img.shields.io/matrix/neovim-orgmode:matrix.org?logo=matrix&server_fqdn=matrix.org&style=flat-square)</a>
 
 
-  Orgmode clone written in Lua for Neovim 0.8+
+  Orgmode clone written in Lua for Neovim 0.9+
 
   [Setup](#setup) • [Docs](/DOCS.md) • [Showcase](#showcase) • [Treesitter](#treesitter-info) • [Troubleshoot](#troubleshoot) • [Plugins](#plugins) • [Contributing](CONTRIBUTING.md) • [Kudos](#thanks-to)
 
@@ -19,7 +19,7 @@
 
 ### Requirements
 
-* Neovim 0.8.0 or later
+* Neovim 0.9.0 or later
 * [nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter)
 
 ### Installation
@@ -219,8 +219,6 @@ Highlights are experimental and partially supported.
 * Allows for easier hacking (custom motions that can work with TS nodes, etc.)
 
 ### Known highlighting issues and limitations
-* Performance issues. This is generally an issue in Neovim that should be resolved before 0.6 release (https://github.com/neovim/neovim/issues/14762, https://github.com/neovim/neovim/issues/14762)
-* Anything that requires concealing ([org_hide_emphasis_markers](/DOCS.md#org_hide_emphasis_markers), links concealing) is not (yet) supported in TS highlighter
 * LaTex is still highlighted through syntax file
 
 ### Improvements over Vim's syntax highlighting

lua/orgmode/colors/highlights.lua

@@ -32,9 +32,7 @@ function M.link_ts_highlights()
   }
 
   for src, def in pairs(links) do
-    if vim.fn.has('nvim-0.8') > 0 then
-      vim.cmd(string.format([[hi link @%s %s]], src, src))
-    end
+    vim.cmd(string.format([[hi link @%s %s]], src, src))
     vim.cmd(string.format([[hi def link %s %s]], src, def))
   end
 end
@@ -81,9 +79,7 @@ function M.define_org_todo_keyword_colors(do_syn_match)
     )
   )
   vim.cmd('hi default link OrgTODO OrgTODO_builtin')
-  if vim.fn.has('nvim-0.8') > 0 then
-    vim.cmd('hi link @OrgTODO OrgTODO')
-  end
+  vim.cmd('hi link @OrgTODO OrgTODO')
   vim.cmd(
     string.format(
       'hi OrgDONE_builtin guifg=%s ctermfg=%s gui=bold cterm=bold',
@@ -92,9 +88,7 @@ function M.define_org_todo_keyword_colors(do_syn_match)
     )
   )
   vim.cmd('hi default link OrgDONE OrgDONE_builtin')
-  if vim.fn.has('nvim-0.8') > 0 then
-    vim.cmd('hi link @OrgDONE OrgDONE')
-  end
+  vim.cmd('hi link @OrgDONE OrgDONE')
   return M.parse_todo_keyword_faces(do_syn_match)
 end
 
@@ -202,9 +196,7 @@ function M.parse_todo_keyword_faces(do_syn_match)
         vim.cmd(string.format([[syn match %s "\<%s\>" contained]], hl_name, name))
       end
       vim.cmd(string.format('hi %s %s', hl_name, hl))
-      if vim.fn.has('nvim-0.8') > 0 then
-        vim.cmd(string.format([[hi link @%s %s]], hl_name, hl_name))
-      end
+      vim.cmd(string.format([[hi link @%s %s]], hl_name, hl_name))
       result[name] = hl_name
     end
   end

lua/orgmode/colors/markup_highlighter.lua

@@ -1,4 +1,3 @@
-local ts = require('orgmode.treesitter.compat')
 local config = require('orgmode.config')
 local ts_utils = require('nvim-treesitter.ts_utils')
 local query = nil
@@ -216,7 +215,7 @@ local function load_deps()
   if query then
     return
   end
-  query = ts.get_query('org', 'markup')
+  query = vim.treesitter.query.get('org', 'markup')
   vim.treesitter.query.add_predicate('org-is-valid-markup-range?', is_valid_markup_range)
   vim.treesitter.query.add_predicate('org-is-valid-hyperlink-range?', is_valid_hyperlink_range)
   vim.treesitter.query.add_predicate('org-is-valid-latex-range?', is_valid_latex_range)

lua/orgmode/colors/todo_highlighter.lua

@@ -1,11 +1,10 @@
-local ts = require('orgmode.treesitter.compat')
 local config = require('orgmode.config')
 local highlights = require('orgmode.colors.highlights')
 local tree_utils = require('orgmode.utils.treesitter')
 local utils = require('orgmode.utils')
 
 local function add_todo_keyword_highlights()
-  local query_files = ts.get_query_files('org', 'highlights')
+  local query_files = vim.treesitter.query.get_files('org', 'highlights')
   if not query_files or #query_files == 0 then
     return
   end
@@ -55,7 +54,7 @@ local function add_todo_keyword_highlights()
           for _, v in ipairs(lines) do
             table.insert(all_lines, v)
           end
-          ts.set_query('org', 'highlights', table.concat(all_lines, '\n'))
+          vim.treesitter.query.set('org', 'highlights', table.concat(all_lines, '\n'))
           if vim.bo.filetype == 'org' then
             tree_utils.restart_highlights()
           end

lua/orgmode/org/indent.lua

@@ -1,4 +1,3 @@
-local ts = require('orgmode.treesitter.compat')
 local config = require('orgmode.config')
 local ts_utils = require('nvim-treesitter.ts_utils')
 local query = nil
@@ -26,7 +25,7 @@ local get_matches = ts_utils.memoize_by_buf_tick(function(bufnr)
       }
 
       if type == 'headline' then
-        opts.stars = ts.get_node_text(node:field('stars')[1], bufnr):len()
+        opts.stars = vim.treesitter.get_node_text(node:field('stars')[1], bufnr):len()
         opts.indent = opts.indent + opts.stars + 1
         matches[range.start.line + 1] = opts
       end
@@ -53,7 +52,7 @@ local get_matches = ts_utils.memoize_by_buf_tick(function(bufnr)
         end
         if parent then
           local headline = parent:named_child('headline')
-          local stars = ts.get_node_text(headline:field('stars')[1], bufnr):len()
+          local stars = vim.treesitter.get_node_text(headline:field('stars')[1], bufnr):len()
           opts.indent = stars + 1
           for i = range.start.line, range['end'].line - 1 do
             matches[i + 1] = opts
@@ -68,7 +67,7 @@ end)
 
 local prev_section = nil
 local function foldexpr()
-  query = query or ts.get_query('org', 'org_indent')
+  query = query or vim.treesitter.query.get('org', 'org_indent')
   local matches = get_matches(0)
   local match = matches[vim.v.lnum]
   local next_match = matches[vim.v.lnum + 1]
@@ -115,7 +114,7 @@ end
 
 local function indentexpr()
   local noindent_mode = config.org_indent_mode == 'noindent'
-  query = query or ts.get_query('org', 'org_indent')
+  query = query or vim.treesitter.query.get('org', 'org_indent')
 
   local prev_linenr = vim.fn.prevnonblank(vim.v.lnum - 1)
 

lua/orgmode/org/mappings.lua

@@ -11,7 +11,6 @@ local constants = require('orgmode.utils.constants')
 local ts_utils = require('nvim-treesitter.ts_utils')
 local utils = require('orgmode.utils')
 local ts_org = require('orgmode.treesitter')
-local ts = require('orgmode.treesitter.compat')
 local ts_table = require('orgmode.treesitter.table')
 local EventManager = require('orgmode.events')
 local Promise = require('orgmode.utils.promise')
@@ -613,7 +612,7 @@ function OrgMappings:handle_return(suffix)
       local counter = 1
       while next_sibling do
         local bullet = next_sibling:child(0)
-        local text = ts.get_node_text(bullet, 0)
+        local text = vim.treesitter.get_node_text(bullet, 0)
         local new_text = tostring(tonumber(text:match('%d+')) + 1) .. closer
 
         if counter == 1 then

lua/orgmode/treesitter/compat.lua

@@ -4,7 +4,7 @@ local tree_utils = require('orgmode.utils.treesitter')
 local Date = require('orgmode.objects.date')
 local Range = require('orgmode.parser.range')
 local config = require('orgmode.config')
-local ts = require('orgmode.treesitter.compat')
+local ts = vim.treesitter
 
 ---@class Headline
 ---@field headline userdata

lua/orgmode/treesitter/headline.lua

@@ -1,6 +1,6 @@
 local ts_utils = require('nvim-treesitter.ts_utils')
 local tree_utils = require('orgmode.utils.treesitter')
-local ts = require('orgmode.treesitter.compat')
+local ts = vim.treesitter
 local Headline = require('orgmode.treesitter.headline')
 
 ---@class Listitem

lua/orgmode/treesitter/listitem.lua

@@ -2,7 +2,6 @@ local ts_utils = require('orgmode.utils.treesitter')
 local Table = require('orgmode.parser.table')
 local utils = require('orgmode.utils')
 local config = require('orgmode.config')
-local ts = require('orgmode.treesitter.compat')
 
 ---@class TsTable
 ---@field node userdata
@@ -54,7 +53,7 @@ function TsTable:_parse_data()
           local cell_val = ''
           local cell_content = cell:field('contents')
           if cell_content and #cell_content > 0 then
-            cell_val = ts.get_node_text(cell_content[1], 0)
+            cell_val = vim.treesitter.get_node_text(cell_content[1], 0)
           end
           table.insert(row_data, cell_val)
         end