refactor: use vim.uv

.github/workflows/test-queries.yml

@@ -56,7 +56,6 @@ jobs:
     env:
       CC: ${{ matrix.cc }}
       NVIM: ${{ matrix.os == 'windows-2022' && 'nvim-win64\\bin\\nvim.exe' || 'nvim' }}
-      ALLOWED_INSTALLATION_FAILURES: ${{ matrix.os == 'windows-2022' && 'rnoweb' }}
     steps:
       - uses: actions/checkout@v3
       - uses: ilammy/msvc-dev-cmd@v1

lua/nvim-treesitter/config.lua

@@ -62,7 +62,7 @@ end
 function M.get_install_dir(dir_name)
   local dir = vim.fs.joinpath(config.install_dir, dir_name)
 
-  if not vim.loop.fs_stat(dir) then
+  if not vim.uv.fs_stat(dir) then
     local ok, err = pcall(vim.fn.mkdir, dir, 'p', '0755')
     if not ok then
       local log = require('nvim-treesitter.log')

lua/nvim-treesitter/health.lua

@@ -104,7 +104,7 @@ local function install_health()
     end
   end
 
-  vim.health.start('OS Info:\n' .. vim.inspect(vim.loop.os_uname()))
+  vim.health.start('OS Info:\n' .. vim.inspect(vim.uv.os_uname()))
 end
 
 local function query_status(lang, query_group)

lua/nvim-treesitter/install.lua

@@ -1,6 +1,6 @@
 local api = vim.api
 local fs = vim.fs
-local uv = vim.loop
+local uv = vim.uv
 
 local a = require('nvim-treesitter.async')
 local config = require('nvim-treesitter.config')

lua/nvim-treesitter/job.lua

@@ -1,5 +1,5 @@
 -- Interface with Neovim job control and provide a simple job sequencing structure
-local uv = vim.loop
+local uv = vim.uv
 local a = require('nvim-treesitter.async')
 local log = require('nvim-treesitter.log')
 
@@ -18,8 +18,8 @@ local M = { JobResult = {}, Opts = {} }
 --- @field on_stderr  fun(_: string)
 --- @field on_stdout  fun(_: string)
 
---- Wrapper for vim.loop.spawn. Takes a command, options, and callback just like
---- vim.loop.spawn, but ensures that all output from the command has been
+--- Wrapper for vim.uv.spawn. Takes a command, options, and callback just like
+--- vim.uv.spawn, but ensures that all output from the command has been
 --- flushed before calling the callback.
 --- @param cmd string
 --- @param options uv.aliases.spawn_options
@@ -66,7 +66,7 @@ end
 
 --- Main exposed function for the jobs module. Takes a task and options and
 --- returns an async function that will run the task with the given opts via
---- vim.loop.spawn
+--- vim.uv.spawn
 --- @param task string[]
 --- @param opts JobOpts
 --- @param callback fun(_: JobResult)

lua/nvim-treesitter/util.lua

@@ -1,4 +1,4 @@
-local uv = vim.loop
+local uv = vim.uv
 
 local M = {}
 

runtime/queries/bass/injections.scm

@@ -1,5 +1,2 @@
 ((comment) @injection.content
  (#set! injection.language "comment"))
-
-((block_comment) @injection.content
- (#set! injection.language "comment"))

scripts/check-queries.lua

@@ -48,6 +48,7 @@ local function do_check()
   local timings = {}
   local parsers = require('nvim-treesitter.config').installed_parsers()
   local query_types = require('nvim-treesitter.health').bundled_queries
+  local configs = require('nvim-treesitter.parsers').configs
 
   local captures = extract_captures()
   local last_error
@@ -55,34 +56,36 @@ local function do_check()
   io_print('::group::Check parsers')
 
   for _, lang in pairs(parsers) do
-    timings[lang] = {}
-    for _, query_type in pairs(query_types) do
-      local before = vim.loop.hrtime()
-      local ok, query = pcall(vim.treesitter.query.get, lang, query_type)
-      local after = vim.loop.hrtime()
-      local duration = after - before
-      table.insert(timings, { duration = duration, lang = lang, query_type = query_type })
-      io_print(
-        'Checking ' .. lang .. ' ' .. query_type .. string.format(' (%.02fms)', duration * 1e-6)
-      )
-      if not ok then
-        local err_msg = lang .. ' (' .. query_type .. '): ' .. query
-        io_print(err_msg)
-        last_error = err_msg
-      else
-        if query then
-          for _, capture in ipairs(query.captures) do
-            local is_valid = (
-              vim.startswith(capture, '_') -- Helpers.
-              or list_any(captures[query_type], function(documented_capture)
-                return vim.startswith(capture, documented_capture)
-              end)
-            )
-            if not is_valid then
-              local error =
-                string.format('(x) Invalid capture @%s in %s for %s.', capture, query_type, lang)
-              io_print(error)
-              last_error = error
+    if configs[lang].install_info then
+      timings[lang] = {}
+      for _, query_type in pairs(query_types) do
+        local before = vim.uv.hrtime()
+        local ok, query = pcall(vim.treesitter.query.get, lang, query_type)
+        local after = vim.uv.hrtime()
+        local duration = after - before
+        table.insert(timings, { duration = duration, lang = lang, query_type = query_type })
+        io_print(
+          'Checking ' .. lang .. ' ' .. query_type .. string.format(' (%.02fms)', duration * 1e-6)
+        )
+        if not ok then
+          local err_msg = lang .. ' (' .. query_type .. '): ' .. query
+          io_print(err_msg)
+          last_error = err_msg
+        else
+          if query then
+            for _, capture in ipairs(query.captures) do
+              local is_valid = (
+                vim.startswith(capture, '_') -- Helpers.
+                or list_any(captures[query_type], function(documented_capture)
+                  return vim.startswith(capture, documented_capture)
+                end)
+              )
+              if not is_valid then
+                local error =
+                  string.format('(x) Invalid capture @%s in %s for %s.', capture, query_type, lang)
+                io_print(error)
+                last_error = error
+              end
             end
           end
         end
@@ -101,27 +104,6 @@ local function do_check()
 end
 
 local ok, result = pcall(do_check)
-local allowed_to_fail = vim.split(vim.env.ALLOWED_INSTALLATION_FAILURES or '', ',', true)
-
-for k, v in pairs(require('nvim-treesitter.parsers').configs) do
-  if v.install_info then
-    -- skip "query only" languages
-    if #vim.api.nvim_get_runtime_file('parser/' .. k .. '.*', false) == 0 then
-      -- On CI all parsers that can be installed from C files should be installed
-      if
-        vim.env.CI
-        and not v.install_info.requires_generate_from_grammar
-        and not vim.list_contains(allowed_to_fail, k)
-      then
-        io_print('Error: parser for ' .. k .. ' is not installed')
-        vim.cmd('cq')
-      else
-        io_print('Warning: parser for ' .. k .. ' is not installed')
-      end
-    end
-  end
-end
-
 if ok then
   io_print('::group::Timings')
   table.sort(result, function(a, b)

scripts/update-readme.lua

@@ -50,11 +50,11 @@ for _, v in ipairs(sorted_parsers) do
   -- queries
   generated_text = generated_text
     .. '`'
-    .. (vim.loop.fs_stat('runtime/queries/' .. v.name .. '/highlights.scm') and 'H' or ' ')
-    .. (vim.loop.fs_stat('runtime/queries/' .. v.name .. '/folds.scm') and 'F' or ' ')
-    .. (vim.loop.fs_stat('runtime/queries/' .. v.name .. '/indents.scm') and 'I' or ' ')
-    .. (vim.loop.fs_stat('runtime/queries/' .. v.name .. '/injections.scm') and 'J' or ' ')
-    .. (vim.loop.fs_stat('runtime/queries/' .. v.name .. '/locals.scm') and 'L' or ' ')
+    .. (vim.uv.fs_stat('runtime/queries/' .. v.name .. '/highlights.scm') and 'H' or ' ')
+    .. (vim.uv.fs_stat('runtime/queries/' .. v.name .. '/folds.scm') and 'F' or ' ')
+    .. (vim.uv.fs_stat('runtime/queries/' .. v.name .. '/indents.scm') and 'I' or ' ')
+    .. (vim.uv.fs_stat('runtime/queries/' .. v.name .. '/injections.scm') and 'J' or ' ')
+    .. (vim.uv.fs_stat('runtime/queries/' .. v.name .. '/locals.scm') and 'L' or ' ')
     .. '` | '
 
   -- CLI