fix(lua): fix luals warnings

Author: clason

lua/nvim-treesitter-textobjects/move.lua

@@ -86,7 +86,7 @@ local function move(opts, query_strings, query_group)
   local function filter_function(start_, range)
     local row, col = unpack(api.nvim_win_get_cursor(winid)) --[[@as integer, integer]]
     row = row - 1 -- nvim_win_get_cursor is (1,0)-indexed
-    ---@type integer, integer, integer, integer
+    ---@type integer, integer, integer, integer, integer, integer
     local start_row, start_col, _, end_row, end_col, _ = unpack(range)
 
     if not start_ then
@@ -95,7 +95,7 @@ local function move(opts, query_strings, query_group)
         start_col = end_col
       else
         start_row = end_row
-        start_col = end_col - 1
+        start_col = end_col - 1 ---@type integer
       end
     end
     if forward then

lua/nvim-treesitter-textobjects/select.lua

@@ -3,18 +3,11 @@ local global_config = require('nvim-treesitter-textobjects.config')
 local shared = require('nvim-treesitter-textobjects.shared')
 
 ---@param range Range4
----@param selection_mode string
+---@param selection_mode TSTextObjects.SelectionMode
 local function update_selection(range, selection_mode)
   ---@type integer, integer, integer, integer
   local start_row, start_col, end_row, end_col = unpack(range)
-
-  local v_table = { charwise = 'v', linewise = 'V', blockwise = '<C-v>' }
-  selection_mode = selection_mode or 'charwise'
-
-  -- Normalise selection_mode
-  if vim.tbl_contains(vim.tbl_keys(v_table), selection_mode) then
-    selection_mode = v_table[selection_mode]
-  end
+  selection_mode = selection_mode or 'v'
 
   -- enter visual mode if normal or operator-pending (no) mode
   -- Why? According to https://learnvimscriptthehardway.stevelosh.com/chapters/15.html
@@ -115,7 +108,7 @@ local function include_surrounding_whitespace(bufnr, range, selection_mode)
   local next = next_position(bufnr, unpack(position))
   while next and is_whitespace(bufnr, unpack(next)) do
     extended = true
-    position = next
+    position = next ---@type {[1]: integer, [2]: integer}
     next = next_position(bufnr, unpack(position))
   end
   if extended then
@@ -214,14 +207,14 @@ function M.detect_selection_mode(query_string)
   end
 
   local ret_value = selection_mode
-  local mode = api.nvim_get_mode().mode --[[@as string]]
+  local mode = api.nvim_get_mode().mode
 
   local is_normal_or_charwise_v = mode == 'n' or mode == 'v'
   if not is_normal_or_charwise_v then
     -- According to "mode()" mapping, if we are in operator pending mode or visual mode,
     -- then last char is {v,V,<C-v>}, exept for "no", which is "o", in which case we honor
     -- last set `selection_mode`
-    mode = mode:sub(#mode)
+    mode = mode:sub(#mode) --[[@as string]]
     ret_value = mode == 'o' and selection_mode or mode
   end
 

lua/nvim-treesitter-textobjects/shared.lua

@@ -10,9 +10,9 @@ local lang_to_parser = { ecma = 'javascript', jsx = 'javascript' }
 
 local M = {}
 
----@param object any
+---@param object table
 ---@param path string[]
----@param value any
+---@param value table
 local function insert_to_path(object, path, value)
   ---@type table<string, any|table<string, any>>
   local curr_obj = object
@@ -22,9 +22,11 @@ local function insert_to_path(object, path, value)
       curr_obj[path[index]] = {}
     end
 
+    ---@type table<string, any|table<string, any>>
     curr_obj = curr_obj[path[index]]
   end
 
+  ---@type table<string, any|table<string, any>>
   curr_obj[path[#path]] = value
 end
 
@@ -39,26 +41,12 @@ local function memoize(fn, hash_fn)
   return function(...)
     local key = hash_fn(...)
     if cache[key] == nil then
-      local v = { fn(...) } ---@type any
-
-      for k, value in pairs(v) do
-        if value == nil then
-          value[k] = vim.NIL
-        end
-      end
-
-      cache[key] = v
+      local v = fn(...) ---@type any
+      cache[key] = v ~= nil and v or vim.NIL
     end
 
     local v = cache[key]
-
-    for k, value in pairs(v) do
-      if value == vim.NIL then
-        value[k] = nil
-      end
-    end
-
-    return unpack(v)
+    return v ~= vim.NIL and v or nil
   end
 end
 
@@ -69,14 +57,14 @@ end
 ---@param query_group string the query file to use
 ---@param root TSNode the root node
 ---@param root_lang string the root node lang, if known
----@return table
+---@return table[]
 local get_query_matches = memoize(function(bufnr, query_group, root, root_lang)
   local query = ts.query.get(root_lang, query_group)
   if not query then
     return {}
   end
 
-  local matches = {}
+  local matches = {} ---@type table[]
   local start_row, _, end_row, _ = root:range()
   -- The end row is exclusive so we need to add 1 to it.
   for pattern, match, metadata in query:iter_matches(root, bufnr, start_row, end_row + 1) do
@@ -127,18 +115,18 @@ end)
 
 ---@param tbl table<string, any|table<string, any>> the table to access
 ---@param path string the '.' separated path
----@return unknown|nil result the value at path or nil
+---@return any|nil result the value at path or nil
 local function get_at_path(tbl, path)
   if path == '' then
     return tbl
   end
 
   local segments = vim.split(path, '%.')
-  ---@type table<string, any|table<string, any>>
   local result = tbl
 
   for _, segment in ipairs(segments) do
     if type(result) == 'table' then
+      ---@type any
       result = result[segment]
     end
   end