Skip to content

Commit 81d289a

Browse files
committed
refactor: warnings cleanup
1 parent 5af4c47 commit 81d289a

File tree

11 files changed

+30
-25
lines changed

11 files changed

+30
-25
lines changed

.github/workflows/typecheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: lua_ls-typecheck
1+
name: Typecheck
22

33
on: [push, pull_request]
44

.luacheckrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
---@diagnostic disable-next-line: lowercase-global
22
globals = { "vim", "describe", "it", "before_each", "after_each", "assert", "async", "MiniTest" }
3+
---@diagnostic disable-next-line: lowercase-global
4+
max_comment_line_length = 420

lua/copilot/client/init.lua

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ function M.buf_attach(force, bufnr)
6060
return
6161
end
6262

63-
if (not force) and util.get_buffer_attach_status(bufnr) == ATTACH_STATUS_MANUALLY_DETACHED then
63+
if (not force) and util.get_buffer_attach_status(bufnr) == util.ATTACH_STATUS_MANUALLY_DETACHED then
6464
logger.trace("buffer not attaching as it was manually detached")
6565
return
6666
end
@@ -80,7 +80,7 @@ function M.buf_attach(force, bufnr)
8080

8181
if not (force or should_attach) then
8282
logger.debug("not attaching to buffer based should_attach criteria: " .. reason)
83-
util.set_buffer_attach_status(bufnr, ATTACH_STATUS_NOT_ATTACHED_PREFIX .. reason)
83+
util.set_buffer_attach_status(bufnr, util.ATTACH_STATUS_NOT_ATTACHED_PREFIX .. reason)
8484
return
8585
end
8686

@@ -104,10 +104,10 @@ function M.buf_attach(force, bufnr)
104104
util.set_buffer_previous_ft(bufnr, vim.bo[bufnr].filetype)
105105
if force then
106106
logger.debug("force attached to buffer")
107-
util.set_buffer_attach_status(bufnr, ATTACH_STATUS_FORCE_ATTACHED)
107+
util.set_buffer_attach_status(bufnr, util.ATTACH_STATUS_FORCE_ATTACHED)
108108
else
109109
logger.trace("buffer attached")
110-
util.set_buffer_attach_status(bufnr, ATTACH_STATUS_ATTACHED)
110+
util.set_buffer_attach_status(bufnr, util.ATTACH_STATUS_ATTACHED)
111111
end
112112
end
113113

@@ -116,7 +116,7 @@ function M.buf_detach_if_attached(bufnr)
116116
bufnr = bufnr or vim.api.nvim_get_current_buf()
117117
if M.buf_is_attached(bufnr) then
118118
vim.lsp.buf_detach_client(bufnr, M.id)
119-
util.set_buffer_attach_status(bufnr, ATTACH_STATUS_NOT_ATTACHED_PREFIX .. "detached")
119+
util.set_buffer_attach_status(bufnr, util.ATTACH_STATUS_NOT_ATTACHED_PREFIX .. "detached")
120120
end
121121
end
122122

lua/copilot/command.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function M.detach()
5353
if c.buf_is_attached(bufnr) then
5454
c.buf_detach_if_attached(bufnr)
5555
logger.trace("buffer manually detached")
56-
u.set_buffer_attach_status(bufnr, ATTACH_STATUS_MANUALLY_DETACHED)
56+
u.set_buffer_attach_status(bufnr, u.ATTACH_STATUS_MANUALLY_DETACHED)
5757
end
5858
end
5959

lua/copilot/config/init.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ function M.validate(config)
6868
vim.validate("copilot_model", config.copilot_model, { "string", "nil" })
6969
vim.validate("root_dir", config.root_dir, { "string", "function" })
7070
vim.validate("should_attach", config.should_attach, "function")
71-
vim.validate("copilot_node_command", config.copilot_node_command, {"string", "table"})
71+
vim.validate("copilot_node_command", config.copilot_node_command, { "string", "table" })
7272

7373
require("copilot.config.panel").validate(config.panel)
7474
require("copilot.config.suggestion").validate(config.suggestion)

lua/copilot/init.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ local config = require("copilot.config")
77
M.setup = function(opts)
88
if vim.fn.has("nvim-0.11") == 0 then
99
vim.notify_once(
10-
"[copilot.lua] Neovim 0.11+ will soon be required. Please upgrade your Neovim version if you wish to keep using this plugin.",
10+
"[copilot.lua] Neovim 0.11+ will soon be required. "
11+
.. "Please upgrade your Neovim version if you wish to keep using this plugin.",
1112
vim.log.levels.WARN
1213
)
1314
return

lua/copilot/logger/init.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ local function write_log(log_level, log_file, msg, ...)
8484
local log_msg = format_log(log_level, msg, ...) .. "\n"
8585

8686
uv.fs_open(log_file, "a", tonumber("644", 8), function(err, fd)
87-
if err then
87+
if err or not fd then
8888
notify_log(vim.log.levels.ERROR, "Failed to open log file: " .. err)
8989
return
9090
end

lua/copilot/lsp/nodejs.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ local M = {
1010
initialization_failed = false,
1111
}
1212

13-
1413
---@return string node_version
1514
---@return nil|string node_version_error
1615
function M.get_node_version()

lua/copilot/panel/init.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,8 @@ function panel:refresh()
462462
utf16_index = vim.str_utfindex(self.state.line, "utf-16")
463463
else
464464
---@diagnostic disable-next-line: missing-parameter
465-
_, utf16_index = vim.str_utfindex(self.state.line)
465+
local _, this_utf16_index = vim.str_utfindex(self.state.line)
466+
utf16_index = this_utf16_index
466467
end
467468
params.doc.position.character = utf16_index
468469
params.position.character = params.doc.position.character

lua/copilot/util.lua

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
local config = require("copilot.config")
22
local logger = require("copilot.logger")
33

4-
local M = {}
5-
VAR_ATTACH_STATUS = "copilot_lua_attach_status"
6-
VAR_PREVIOUS_FT = "copilot_lua_previous_ft"
7-
ATTACH_STATUS_MANUALLY_DETACHED = "manually detached"
8-
ATTACH_STATUS_FORCE_ATTACHED = "force attached"
9-
ATTACH_STATUS_ATTACHED = "attached"
10-
ATTACH_STATUS_NOT_ATTACHED_PREFIX = "not attached based on "
11-
ATTACH_STATUS_NOT_YET_REQUESTED = "attach not yet requested"
4+
local M = {
5+
VAR_ATTACH_STATUS = "copilot_lua_attach_status",
6+
VAR_PREVIOUS_FT = "copilot_lua_previous_ft",
7+
ATTACH_STATUS_MANUALLY_DETACHED = "manually detached",
8+
ATTACH_STATUS_FORCE_ATTACHED = "force attached",
9+
ATTACH_STATUS_ATTACHED = "attached",
10+
ATTACH_STATUS_NOT_ATTACHED_PREFIX = "not attached based on ",
11+
ATTACH_STATUS_NOT_YET_REQUESTED = "attach not yet requested",
12+
}
1213

1314
---@return { editorInfo: copilot_editor_info, editorPluginInfo: copilot_editor_plugin_info }
1415
function M.get_editor_info()
@@ -163,26 +164,26 @@ end
163164
---@param bufnr integer
164165
---@param status string
165166
function M.set_buffer_attach_status(bufnr, status)
166-
vim.api.nvim_buf_set_var(bufnr, VAR_ATTACH_STATUS, status)
167+
vim.api.nvim_buf_set_var(bufnr, M.VAR_ATTACH_STATUS, status)
167168
end
168169

169170
---@param bufnr integer
170171
---@return string
171172
function M.get_buffer_attach_status(bufnr)
172-
local ok, result = pcall(vim.api.nvim_buf_get_var, bufnr, VAR_ATTACH_STATUS)
173-
return (ok and result) or ATTACH_STATUS_NOT_YET_REQUESTED
173+
local ok, result = pcall(vim.api.nvim_buf_get_var, bufnr, M.VAR_ATTACH_STATUS)
174+
return (ok and result) or M.ATTACH_STATUS_NOT_YET_REQUESTED
174175
end
175176

176177
---@param bufnr integer
177178
---@param filetype string
178179
function M.set_buffer_previous_ft(bufnr, filetype)
179-
vim.api.nvim_buf_set_var(bufnr, VAR_PREVIOUS_FT, filetype)
180+
vim.api.nvim_buf_set_var(bufnr, M.VAR_PREVIOUS_FT, filetype)
180181
end
181182

182183
---@param bufnr integer
183184
---@return string
184185
function M.get_buffer_previous_ft(bufnr)
185-
local ok, result = pcall(vim.api.nvim_buf_get_var, bufnr, VAR_PREVIOUS_FT)
186+
local ok, result = pcall(vim.api.nvim_buf_get_var, bufnr, M.VAR_PREVIOUS_FT)
186187
return (ok and result) or ""
187188
end
188189

0 commit comments

Comments
 (0)