3 files changed, 8 insertions, 4 deletions
diff --git a/lua/nvim-treesitter/async.lua b/lua/nvim-treesitter/async.lua
index e78c0f964..aaf4627ef 100644
--- a/lua/nvim-treesitter/async.lua
+++ b/lua/nvim-treesitter/async.lua
@@ -1,3 +1,4 @@
+---@meta async vendored file, don't diagnose
 local pcall = copcall or pcall
 
 --- @param ... any
diff --git a/lua/nvim-treesitter/indent.lua b/lua/nvim-treesitter/indent.lua
index 6f8e4d8ff..35dd78c35 100644
--- a/lua/nvim-treesitter/indent.lua
+++ b/lua/nvim-treesitter/indent.lua
@@ -97,7 +97,7 @@ local get_indents = memoize(function(bufnr, root, lang)
     return map
   end
   for id, node, metadata in query:iter_captures(root, bufnr) do
-    if query.captures[id]:sub(1, 1) ~= '_' then
+    if query.captures[id] and query.captures[id]:sub(1, 1) ~= '_' then
       map[query.captures[id]][node:id()] = metadata or {}
     end
   end
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 81fad11d2..5d713240c 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -85,7 +85,9 @@ local function join(max_jobs, tasks)
     end
 
     for i = 1, max_jobs do
-      tasks[i]():await(cb)
+      if tasks[i] then
+        tasks[i]():await(cb)
+      end
     end
   end)
 end
@@ -131,7 +133,8 @@ end
 ---@param ... string
 ---@return string
 function M.get_package_path(...)
-  return fs.joinpath(fn.fnamemodify(debug.getinfo(1, 'S').source:sub(2), ':p:h:h:h'), ...)
+  local info = assert(debug.getinfo(1, 'S'))
+  return fs.joinpath(fn.fnamemodify(info.source:sub(2), ':p:h:h:h'), ...)
 end
 
 ---@param lang string
@@ -463,8 +466,8 @@ end
 
 --- Reload the parser table and user modifications in case of update
 local function reload_parsers()
-  ---@diagnostic disable-next-line:no-unknown
   package.loaded['nvim-treesitter.parsers'] = nil
+  ---@diagnostic disable-next-line:duplicate-require
   parsers = require('nvim-treesitter.parsers')
   vim.api.nvim_exec_autocmds('User', { pattern = 'TSUpdate' })
 end