refactor: additional warnings

Author: AntoineGS

lua/copilot/api.lua

@@ -3,7 +3,7 @@ local mod = {}
 
 ---@param callback? fun(err: any|nil, data: table, ctx: table): nil
 ---@return any|nil err
----@return table data
+---@return any data
 ---@return table ctx
 function mod.request(client, method, params, callback)
   logger.trace("api request:", method, params)
@@ -139,14 +139,13 @@ function mod.get_completions_cycling(client, params, callback)
   return mod.request(client, "getCompletionsCycling", params, callback)
 end
 
----@alias copilot_get_panel_completions_data { solutionCountTarget: integer }
 ---@alias copilot_panel_solution_data { panelId: string, completionText: string, displayText: string, range: { ['end']: { character: integer, line: integer }, start: { character: integer, line: integer } }, score: number, solutionId: string }
 ---@alias copilot_panel_on_solution_handler fun(result: copilot_panel_solution_data): nil
 ---@alias copilot_panel_solutions_done_data { panelId: string, status: 'OK'|'Error', message?: string }
 ---@alias copilot_panel_on_solutions_done_handler fun(result: copilot_panel_solutions_done_data): nil
 
 ---@return any|nil err
----@return copilot_get_panel_completions_data data
+---@return integer data
 ---@return table ctx
 function mod.get_panel_completions(client, params, callback)
   return mod.request(client, "getPanelCompletions", params, callback)

lua/copilot/init.lua

@@ -4,7 +4,6 @@ local highlight = require("copilot.highlight")
 local logger = require("copilot.logger")
 local client = require("copilot.client")
 local auth = require("copilot.auth")
-local lsp_binary = require("copilot.lsp_binary")
 
 local create_cmds = function()
   vim.api.nvim_create_user_command("CopilotDetach", function()

lua/copilot/panel.lua

@@ -12,6 +12,7 @@ local marker_prefix = "[copilot] "
 local panel_uri_prefix = "copilot://"
 
 local panel = {
+  ---@type vim.lsp.Client
   client = nil,
   setup_done = false,
 
@@ -27,6 +28,7 @@ local panel = {
   filetype = nil,
 
   state = {
+    ---@type integer|nil
     req_id = nil,
     line = nil,
     status = nil,
@@ -414,7 +416,7 @@ function panel:refresh()
   end
 
   if self.state.req_id then
-    self.client.cancel_request(self.state.req_id)
+    self.client:cancel_request(self.state.req_id)
     self.state.req_id = nil
   end
 
@@ -430,7 +432,6 @@ function panel:refresh()
       end
 
       self.state.received_count = type(self.state.received_count) == "number" and self.state.received_count + 1 or 1
-
       self:unlock():refresh_header():add_entry(result):lock()
     end,
     ---@param result copilot_panel_solutions_done_data
@@ -466,31 +467,32 @@ function panel:refresh()
   if not auto_refreshing and self.state.was_insert then
     vim.cmd("stopinsert")
   else
+    local utf16_index
     -- assume cursor at end of line
-    local _, utf16_index = vim.str_utfindex(self.state.line, "utf-16")
+    if vim.has("nvim-0.11") then
+      utf16_index = vim.str_utfindex(self.state.line, "utf-16")
+    else
+      ---@diagnostic disable-next-line: missing-parameter
+      _, utf16_index = vim.str_utfindex(self.state.line)
+    end
     params.doc.position.character = utf16_index
     params.position.character = params.doc.position.character
   end
 
   -- on_solutions_done can be invoked before the api.get_panel_completions callback
   self.state.status = "loading"
 
-  local _, id = api.get_panel_completions(
-    self.client,
-    params,
-    ---@param result copilot_get_panel_completions_data
-    function(err, result)
-      if err then
-        self.state.status = "error"
-        self.state.error = err
-        logger.error(self.state.error)
-        return
-      end
-
-      self.state.expected_count = result.solutionCountTarget
-      panel:unlock():refresh_header():lock()
+  local _, id = api.get_panel_completions(self.client, params, function(err, result)
+    if err then
+      self.state.status = "error"
+      self.state.error = err
+      logger.error(self.state.error)
+      return
     end
-  )
+
+    self.state.expected_count = result.solutionCountTarget
+    panel:unlock():refresh_header():lock()
+  end)
 
   self.state.req_id = id
 end