From 44e9e5a1ce766d31770329257f52f97a27bdb7ae Mon Sep 17 00:00:00 2001 From: jdhao Date: Mon, 5 Aug 2024 23:23:44 +0200 Subject: [PATCH] Fix lua_ls diagnostic warnings --- init.lua | 14 ++++++++++---- lua/config/nvim_ufo.lua | 1 - lua/config/statusline.lua | 3 ++- lua/mappings.lua | 4 +++- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/init.lua b/init.lua index ee66d27..9fda2f9 100644 --- a/init.lua +++ b/init.lua @@ -14,15 +14,21 @@ vim.loader.enable() local version = vim.version -- check if we have the latest stable version of nvim -local expected_ver = "0.10.1" -local expect_ver = version.parse(expected_ver) -local actual_ver = version() +local expected_ver_str = "0.10.1" +local expect_ver = version.parse(expected_ver_str) +local actual_ver = vim.version() + +if expect_ver == nil then + local msg = string.format("Unsupported version string: %s", expected_ver_str) + vim.api.nvim_err_writeln(msg) + return +end local result = version.cmp(expect_ver, actual_ver) if result ~= 0 then local _ver = string.format("%s.%s.%s", actual_ver.major, actual_ver.minor, actual_ver.patch) - local msg = string.format("Expect nvim %s, but got %s instead. Use at your own risk!", expected_ver, _ver) + local msg = string.format("Expect nvim %s, but got %s instead. Use at your own risk!", expected_ver_str, _ver) vim.api.nvim_err_writeln(msg) end diff --git a/lua/config/nvim_ufo.lua b/lua/config/nvim_ufo.lua index 2430932..96d7bc1 100644 --- a/lua/config/nvim_ufo.lua +++ b/lua/config/nvim_ufo.lua @@ -1,6 +1,5 @@ local handler = function(virtText, lnum, endLnum, width, truncate) local newVirtText = {} - local totalLines = vim.api.nvim_buf_line_count(0) local foldedLines = endLnum - lnum local suffix = (" 󰁂 %d"):format(foldedLines) local sufWidth = vim.fn.strdisplaywidth(suffix) diff --git a/lua/config/statusline.lua b/lua/config/statusline.lua index 466edf6..08ead79 100644 --- a/lua/config/statusline.lua +++ b/lua/config/statusline.lua @@ -127,6 +127,7 @@ local get_active_lsp = function() end for _, client in ipairs(clients) do + ---@diagnostic disable-next-line: undefined-field local filetypes = client.config.filetypes if filetypes and vim.fn.index(filetypes, buf_ft) ~= -1 then return client.name @@ -149,7 +150,7 @@ require("lualine").setup { lualine_b = { { "branch", - fmt = function(name, context) + fmt = function(name, _) -- truncate branch name in case the name is too long return string.sub(name, 1, 20) end, diff --git a/lua/mappings.lua b/lua/mappings.lua index 96a07cc..f297695 100644 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -1,5 +1,4 @@ local keymap = vim.keymap -local api = vim.api local uv = vim.uv -- Save key strokes (now we do not need to press shift to enter command mode). @@ -215,6 +214,9 @@ keymap.set("n", "cb", function() local cnt = 0 local blink_times = 7 local timer = uv.new_timer() + if timer == nil then + return + end timer:start(0, 100, vim.schedule_wrap(function() vim.cmd [[