fix: type annotations and errors

Author: stevearc

lua/resession/config.lua

@@ -1,5 +1,7 @@
 local M = {}
 
+local uv = vim.uv or vim.loop
+
 local default_config = {
   -- Options for automatically saving sessions on a timer
   autosave = {
@@ -62,7 +64,7 @@ M.setup = function(config)
         resession.save_all({ notify = false })
       end,
     })
-    autosave_timer = vim.loop.new_timer()
+    autosave_timer = assert(uv.new_timer())
     autosave_timer:start(
       M.autosave.interval * 1000,
       M.autosave.interval * 1000,

lua/resession/files.lua

@@ -1,10 +1,12 @@
 local M = {}
 
+local uv = vim.uv or vim.loop
+
 ---@type boolean
-M.is_windows = vim.loop.os_uname().version:match("Windows")
+M.is_windows = uv.os_uname().version:match("Windows")
 
 ---@type boolean
-M.is_mac = vim.loop.os_uname().sysname == "Darwin"
+M.is_mac = uv.os_uname().sysname == "Darwin"
 
 ---@type string
 M.sep = M.is_windows and "\\" or "/"
@@ -23,7 +25,7 @@ end
 ---@param filepath string
 ---@return boolean
 M.exists = function(filepath)
-  local stat = vim.loop.fs_stat(filepath)
+  local stat = uv.fs_stat(filepath)
   return stat ~= nil and stat.type ~= nil
 end
 
@@ -59,10 +61,10 @@ M.read_file = function(filepath)
   if not M.exists(filepath) then
     return nil
   end
-  local fd = vim.loop.fs_open(filepath, "r", 420) -- 0644
-  local stat = vim.loop.fs_fstat(fd)
-  local content = vim.loop.fs_read(fd, stat.size)
-  vim.loop.fs_close(fd)
+  local fd = assert(uv.fs_open(filepath, "r", 420)) -- 0644
+  local stat = assert(uv.fs_fstat(fd))
+  local content = uv.fs_read(fd, stat.size)
+  uv.fs_close(fd)
   return content
 end
 
@@ -86,30 +88,31 @@ M.mkdir = function(dirname, perms)
     if not M.exists(parent) then
       M.mkdir(parent)
     end
-    vim.loop.fs_mkdir(dirname, perms)
+    uv.fs_mkdir(dirname, perms)
   end
 end
 
 ---@param filename string
 ---@param contents string
 M.write_file = function(filename, contents)
   M.mkdir(vim.fn.fnamemodify(filename, ":h"))
-  local fd = vim.loop.fs_open(filename, "w", 420) -- 0644
-  vim.loop.fs_write(fd, contents)
-  vim.loop.fs_close(fd)
+  local fd = assert(uv.fs_open(filename, "w", 420)) -- 0644
+  uv.fs_write(fd, contents)
+  uv.fs_close(fd)
 end
 
 ---@param filename string
 M.delete_file = function(filename)
   if M.exists(filename) then
-    vim.loop.fs_unlink(filename)
+    uv.fs_unlink(filename)
     return true
   end
 end
 
 ---@param filename string
 ---@param obj any
 M.write_json_file = function(filename, obj)
+  ---@diagnostic disable-next-line param-type-mismatch
   M.write_file(filename, vim.json.encode(obj))
 end
 

lua/resession/init.lua

@@ -1,5 +1,7 @@
 local M = {}
 
+local uv = vim.uv or vim.loop
+
 local has_setup = false
 local pending_config
 local current_session
@@ -83,8 +85,11 @@ M.list = function(opts)
   if not files.exists(session_dir) then
     return {}
   end
-  local fd = vim.loop.fs_opendir(session_dir, nil, 32)
-  local entries = vim.loop.fs_readdir(fd)
+  ---@diagnostic disable-next-line param-type-mismatch
+  local fd = assert(uv.fs_opendir(session_dir, nil, 32))
+  ---@diagnostic disable-next-line cast-type-mismatch
+  ---@cast fd luv_dir_t
+  local entries = uv.fs_readdir(fd)
   local ret = {}
   while entries do
     for _, entry in ipairs(entries) do
@@ -95,9 +100,9 @@ M.list = function(opts)
         end
       end
     end
-    entries = vim.loop.fs_readdir(fd)
+    entries = uv.fs_readdir(fd)
   end
-  vim.loop.fs_closedir(fd)
+  uv.fs_closedir(fd)
   return ret
 end
 

lua/resession/util.lua

@@ -8,6 +8,7 @@ local function get_option_scope(opt)
   if vim.api.nvim_get_option_info2 then
     return vim.api.nvim_get_option_info2(opt, {}).scope
   else
+    ---@diagnostic disable-next-line redundant-parameter
     return vim.api.nvim_get_option_info(opt).scope
   end
 end