Warning cleanup (zbirenbaum#381)

* refactor: resolve most Lua LSP warnings, leaving the unpack one for now as it seems to break the auth popup

Author: AntoineGS

lua/copilot/auth.lua

@@ -46,7 +46,7 @@ function M.setup(client)
       height = height,
       width = width,
     })
-    vim.api.nvim_win_set_option(winid, "winhighlight", "Normal:Normal")
+    vim.api.nvim_set_option_value("winhighlight", "Normal:Normal", { win = winid })
 
     return function()
       vim.api.nvim_win_close(winid, true)
@@ -150,26 +150,13 @@ local function find_config_path()
   end
 end
 
-local function json_body(response)
-  if response.headers["content-type"] == "application/json" then
-    return vim.json.decode(response.body)
-  end
-end
-
 local function oauth_user(token)
   return vim.fn.system('curl -s --header "Authorization: Bearer ' .. token .. '" https://api.github.com/user')
 end
 
-local function oauth_save(oauth_token)
-  local user_data = oauth_user(oauth_token)
-  local github = { oauth_token = oauth_token, user = user_data.login }
-  return github
-end
-
 M.get_cred = function()
-  local userdata = vim.json.decode(
-    vim.api.nvim_eval("readfile('" .. find_config_path() .. "/github-copilot/hosts.json')")[1]
-  )
+  local userdata =
+    vim.json.decode(vim.api.nvim_eval("readfile('" .. find_config_path() .. "/github-copilot/hosts.json')")[1])
   local token = userdata["github.com"].oauth_token
   local user = oauth_user(token)
   return { user = user, token = token }

lua/copilot/client.lua

@@ -7,6 +7,8 @@ local is_disabled = false
 local M = {
   augroup = "copilot.client",
   id = nil,
+  --- @class copilot_capabilities:lsp.ClientCapabilities
+  --- @field copilot table<'openURL', boolean>
   capabilities = nil,
   config = nil,
   node_version = nil,
@@ -15,7 +17,7 @@ local M = {
   initialized = false,
 }
 
----@param id number
+---@param id integer
 local function store_client_id(id)
   if M.id and M.id ~= id then
     if vim.lsp.get_client_by_id(M.id) then
@@ -53,7 +55,7 @@ function M.get_node_version()
     local node = config.get("copilot_node_command")
 
     local cmd = { node, "--version" }
-    local cmd_output_table = vim.fn.executable(node) == 1 and vim.fn.systemlist(cmd, nil, false) or { "" }
+    local cmd_output_table = vim.fn.executable(node) == 1 and vim.fn.systemlist(cmd, nil, 0) or { "" }
     local cmd_output = cmd_output_table[#cmd_output_table]
     local cmd_exit_code = vim.v.shell_error
 
@@ -144,18 +146,30 @@ function M.use_client(callback)
       error("copilot.setup is not called yet")
     end
 
-    local client_id = vim.lsp.start_client(M.config)
+    local client_id, err = vim.lsp.start_client(M.config)
+
+    if not client_id then
+      error(string.format("[Copilot] Error starting LSP Client: %s", err))
+      return
+    end
+
     store_client_id(client_id)
 
-    client = M.get()
+    client = M.get() --[[@as table]]
   end
 
   if client.initialized then
     callback(client)
     return
   end
 
-  local timer = vim.loop.new_timer()
+  local timer, err, _ = vim.loop.new_timer()
+
+  if not timer then
+    error(string.format("[Copilot] Error creating timer: %s", err))
+    return
+  end
+
   timer:start(
     0,
     100,
@@ -189,7 +203,7 @@ local function prepare_client_config(overrides)
 
   M.startup_error = nil
 
-  local capabilities = vim.lsp.protocol.make_client_capabilities()
+  local capabilities = vim.lsp.protocol.make_client_capabilities() --[[@as copilot_capabilities]]
   capabilities.copilot = {
     openURL = true,
   }

lua/copilot/init.lua

@@ -34,7 +34,7 @@ M.setup = function(opts)
   highlight.setup()
 
   local conf = config.setup(opts)
-  if conf.panel.enabled then
+  if conf and conf.panel.enabled then
     create_cmds()
   end
 

lua/copilot/panel.lua

@@ -79,14 +79,14 @@ local function is_panel_uri(bufname)
 end
 
 function panel:lock()
-  vim.api.nvim_buf_set_option(self.bufnr, "modifiable", false)
-  vim.api.nvim_buf_set_option(self.bufnr, "readonly", true)
+  vim.api.nvim_set_option_value("modifiable", false, { buf = self.bufnr })
+  vim.api.nvim_set_option_value("readonly", true, { buf = self.bufnr })
   return self
 end
 
 function panel:unlock()
-  vim.api.nvim_buf_set_option(self.bufnr, "modifiable", true)
-  vim.api.nvim_buf_set_option(self.bufnr, "readonly", false)
+  vim.api.nvim_set_option_value("modifiable", true, { buf = self.bufnr })
+  vim.api.nvim_set_option_value("readonly", false, { buf = self.bufnr })
   return self
 end
 
@@ -301,14 +301,14 @@ function panel:ensure_bufnr()
       swapfile = false,
       undolevels = 0,
     }) do
-      vim.api.nvim_buf_set_option(self.bufnr, name, value)
+      vim.api.nvim_set_option_value(name, value, { buf = self.bufnr })
     end
 
     set_keymap(self.bufnr)
   end
 
   vim.api.nvim_buf_set_name(self.bufnr, self.panel_uri)
-  vim.api.nvim_buf_set_option(self.bufnr, "filetype", self.filetype)
+  vim.api.nvim_set_option_value("filetype", self.filetype, { buf = self.bufnr })
 end
 
 function panel:ensure_winid()
@@ -362,7 +362,7 @@ function panel:ensure_winid()
     relativenumber = false,
     signcolumn = "no",
   }) do
-    vim.api.nvim_win_set_option(self.winid, name, value)
+    vim.api.nvim_set_option_value(name, value, { win = self.winid })
   end
 
   vim.api.nvim_create_augroup(self.augroup, { clear = true })
@@ -491,7 +491,7 @@ function panel:refresh()
     end
   )
 
-  self.state.req_id = id
+  self.state.req_id = id.solutionCountTarget
 end
 
 function panel:init()

lua/copilot/util.lua

@@ -1,5 +1,4 @@
 local config = require("copilot.config")
-
 local unpack = unpack or table.unpack
 
 local M = {}
@@ -97,7 +96,8 @@ end
 ---@return boolean should_attach
 ---@return string? no_attach_reason
 function M.should_attach()
-  local ft_disabled, ft_disabled_reason = is_ft_disabled(vim.bo.filetype, config.get("filetypes"))
+  local ft = config.get("filetypes") --[[@as table<string, boolean>]]
+  local ft_disabled, ft_disabled_reason = is_ft_disabled(vim.bo.filetype, ft)
 
   if ft_disabled then
     return not ft_disabled, ft_disabled_reason
@@ -195,15 +195,15 @@ end
 
 ---@return copilot_editor_configuration
 function M.get_editor_configuration()
-  local conf = config.get()
+  local conf = config.get() --[[@as copilot_config]]
 
-  local filetypes = vim.deepcopy(conf.filetypes)
+  local filetypes = vim.deepcopy(conf.filetypes) --[[@as table<string, boolean>]]
 
   if filetypes["*"] == nil then
     filetypes = vim.tbl_deep_extend("keep", filetypes, internal_filetypes)
   end
 
-  local copilot_model = conf.copilot_model ~= "" and conf.copilot_model or ""
+  local copilot_model = conf and conf.copilot_model ~= "" and conf.copilot_model or ""
 
   ---@type string[]
   local disabled_filetypes = vim.tbl_filter(function(ft)
@@ -303,11 +303,11 @@ end
 ---@param str string
 ---@return integer
 function M.strutf16len(str)
-  return vim.fn.strchars(vim.fn.substitute(str, [==[\\%#=2[^\u0001-\uffff]]==], "  ", "g"))
-end
-
-if vim.fn.exists("*strutf16len") == 1 then
-  M.strutf16len = vim.fn.strutf16len
+  if vim.fn.exists("*strutf16len") == 1 then
+    return vim.fn.strutf16len(str)
+  else
+    return vim.fn.strchars(vim.fn.substitute(str, [==[\\%#=2[^\u0001-\uffff]]==], "  ", "g"))
+  end
 end
 
 return M