chore: luals fixes

Author: phanen

.luarc.jsonc

@@ -1,29 +1,46 @@
 {
   "$schema": "https://raw.githubusercontent.com/LuaLS/vscode-lua/master/setting/schema.json",
   "runtime.version": "LuaJIT",
+  "format": {
+    "enable": true,
+    "defaultConfig": {
+      "indent_style": "space",
+      "indent_size": "2"
+    }
+  },
   "diagnostics": {
     "enable": true,
-    "globals": ["vim", "describe", "it" ],
+    "globals": ["vim", "describe", "it"],
     "neededFileStatus": {
       "codestyle-check": "Any"
     },
-    "disable": ["need-check-nil", "missing-parameter", "cast-local-type"]
+    "groupFileStatus": {
+      // "strict": "Opened",
+      // "strong": "Opened",
+      // "ambiguity": "Opened",
+      // "duplicate": "Opened",
+      // "global": "Opened",
+      // "luadoc": "Opened",
+      // "redefined": "Opened",
+      // "type-check": "Opened",
+      // "unbalanced": "Opened",
+      // "unused": "Opened"
+    },
+    "disable": ["need-check-nil", "missing-parameter", "cast-local-type"],
+    "unusedLocalExclude": ["_*"]
   },
   "workspace": {
     "library": [
-      "lua",
-      "$VIMRUNTIME/lua",
+      "$VIMRUNTIME",
       "${3rd}/luv/library",
-      "$XDG_DATA_HOME/nvim/lazy/plenary.nvim/lua",
-      "$LOCALAPPDATA/nvim-data/lazy/plenary.nvim/lua",
       // For "cmp_src.lua" type resolving
-      "$XDG_DATA_HOME/nvim/lazy/nvim-cmp/lua",
-      "$LOCALAPPDATA/nvim-data/lazy/nvim-cmp/lua"
+      "deps/mini.nvim",
+      "deps/nvim-web-devicons",
+      "deps/nvim-cmp"
     ],
     "checkThirdParty": false,
     "maxPreload": 2000,
-    "preloadFileSize": 1000,
-    "ignoreDir": ["tests/"]
+    "preloadFileSize": 1000
   },
   "type": {
     "weakNilCheck": true,
@@ -32,7 +49,7 @@
   },
   "hint": {
     "enable": true,
-    "setType": true,
+    "setType": true
   },
   "telemetry.enable": false
 }

Makefile

@@ -26,7 +26,7 @@ screenshots:
 
 .PHONY: clean-screenshots
 clean-screenshots:
-	rm -rf tests/screenshots/* 
+	rm -rf tests/screenshots/*
 	make test
 
 #
@@ -39,8 +39,13 @@ deps:
 	make clean
 	@mkdir -p deps
 	git clone --depth=1 --single-branch https://github.com/echasnovski/mini.nvim deps/mini.nvim
-	git clone --depth=1 --single-branch https://github.com/nvim-tree/nvim-web-devicons \
-		deps/nvim-web-devicons
+	git clone --depth=1 --single-branch https://github.com/nvim-tree/nvim-web-devicons deps/nvim-web-devicons
+	git clone --depth=1 --single-branch https://github.com/hrsh7th/nvim-cmp deps/nvim-cmp
+
+.PHONY: lint
+lint:
+	VIMRUNTIME="$$(nvim --clean --headless +'echo $$VIMRUNTIME' +q 2>&1)" lua-language-server --configpath=../.luarc.jsonc --check=.
+
 
 # clean up
 .PHONY: clean

lua/fzf-lua/actions.lua

@@ -140,6 +140,11 @@ M.resume = function(_, _)
   loadstring([[require("fzf-lua").resume()]])()
 end
 
+---@param _vimcmd string
+---@param selected string[]
+---@param opts fzf-lua.Config
+---@param pcall_vimcmd boolean?
+---@return string?
 M.vimcmd_entry = function(_vimcmd, selected, opts, pcall_vimcmd)
   for i, sel in ipairs(selected) do
     (function()
@@ -244,7 +249,7 @@ M.vimcmd_entry = function(_vimcmd, selected, opts, pcall_vimcmd)
           -- nvim_exec2(): Vim(normal):Can't re-enter normal mode from terminal mode
           pcall(utils.jump_to_location, entry, "utf-16", opts.reuse_win)
         else
-          utils.jump_to_location(entry, "utf-16", opts.reuse_win)
+          utils.jump_to_location(entry --[[@as lsp.Location]], "utf-16", opts.reuse_win)
         end
       elseif entry.ctag and entry.line == 0 then
         vim.api.nvim_win_set_cursor(0, { 1, 0 })
@@ -333,7 +338,7 @@ local sel_to_qf = function(selected, opts, is_loclist)
   else
     -- Set the quickfix title to last query and
     -- append a new list to end of the stack (#635)
-    vim.fn.setqflist({}, " ", {
+    vim.fn.setqflist({}, " ", { ---@diagnostic disable-next-line: assign-type-mismatch
       nr = "$",
       items = qf_list,
       title = title,

lua/fzf-lua/core.lua

@@ -160,7 +160,7 @@ M.fzf_exec = function(contents, opts)
   return M.fzf_wrap(contents, opts, true)
 end
 
----@param contents string|fun(query: string): string|string[]|function
+---@param contents string|fun(query: string[]): string|string[]|function
 ---@param opts? table
 M.fzf_live = function(contents, opts)
   assert(contents)

lua/fzf-lua/libuv.lua

@@ -11,7 +11,7 @@ local base64 = require("fzf-lua.lib.base64")
 local serpent = require("fzf-lua.lib.serpent")
 
 ---@param pid integer
----@param signal integer?
+---@param signal integer|string?
 ---@returns boolean
 local function process_kill(pid, signal)
   if not pid or not tonumber(pid) then return false end

lua/fzf-lua/path.lua

@@ -387,6 +387,7 @@ function M.entry_to_ctag(entry, noesc)
   return ctag
 end
 
+---@return fzf-lua.path.Entry
 function M.entry_to_location(entry, opts)
   local uri, line, col = entry:match("^(.*://.*):(%d+):(%d+):")
   line = line and tonumber(line) > 0 and tonumber(line) or 1
@@ -410,7 +411,7 @@ end
 
 ---@param entry string
 ---@param opts fzf-lua.Config
----@param force_uri boolean
+---@param force_uri boolean?
 ---@return fzf-lua.path.Entry
 function M.entry_to_file(entry, opts, force_uri)
   opts = opts or {}

lua/fzf-lua/previewer/builtin.lua

@@ -1766,6 +1766,7 @@ function Previewer.nvim_options:new(o, opts, fzf_win)
   Previewer.nvim_options.super.new(self, o, opts, fzf_win)
   local paths = vim.fn.globpath(vim.o.rtp, "doc/options.txt", false, true)
   self.lines = vim.fn.readfile(paths[1])
+  return self
 end
 
 function Previewer.nvim_options:gen_winopts()

lua/fzf-lua/previewer/codeaction.lua

@@ -33,7 +33,8 @@ local function diff_text_edits(text_edits, bufnr, offset_encoding, diff_opts)
   vim.lsp.util.apply_text_edits(text_edits, tmpbuf, offset_encoding)
   local new_lines = get_lines(tmpbuf)
   vim.api.nvim_buf_delete(tmpbuf, { force = true })
-  local diff = vim.diff(
+  ---@diagnostic disable-next-line: deprecated
+  local diff = (vim.diff or vim.text.diff)(
     table.concat(orig_lines, eol) .. eol,
     table.concat(new_lines, eol) .. eol,
     diff_opts)

lua/fzf-lua/previewer/fzf.lua

@@ -214,7 +214,7 @@ function Previewer.cmd_async:cmdline(o)
     local cmd = errcmd or ("%s %s %s"):format(
       self.cmd, self.args, libuv.shellescape(filepath))
     return cmd
-  end, self.opts, "{} {q}", false)
+  end, self.opts, "{} {q}")
   return act
 end
 
@@ -278,7 +278,7 @@ function Previewer.bat_async:cmdline(o)
       line_range,
       libuv.shellescape(filepath))
     return cmd
-  end, self.opts, "{} {q}", false)
+  end, self.opts, "{} {q}")
   return act
 end
 
@@ -379,7 +379,7 @@ function Previewer.git_diff:cmdline(o)
     -- cmd = string.format("%s %s %s", table.concat(setenv, " "), cmd, pager)
     cmd = string.format("%s %s", cmd, pager)
     return { cmd = cmd, env = env }
-  end, self.opts, "{}", false)
+  end, self.opts, "{}")
   return act
 end
 
@@ -398,7 +398,7 @@ function Previewer.man_pages:cmdline(o)
     local manpage = require("fzf-lua.providers.manpages").manpage_sh_arg(items[1])
     local cmd = self.cmd:format(manpage)
     return cmd
-  end, self.opts, "{}", false)
+  end, self.opts, "{}")
   return act
 end
 
@@ -435,7 +435,7 @@ function Previewer.help_tags:cmdline(o)
       end
     end
     return cmd
-  end, self.opts, "{}", false)
+  end, self.opts, "{}")
   return act
 end
 

lua/fzf-lua/providers/dap.lua

@@ -1,7 +1,7 @@
+---@diagnostic disable: undefined-field, param-type-mismatch
 local uv = vim.uv or vim.loop
 local core = require "fzf-lua.core"
 local utils = require "fzf-lua.utils"
-local shell = require "fzf-lua.shell"
 local config = require "fzf-lua.config"
 local make_entry = require "fzf-lua.make_entry"
 
@@ -205,7 +205,7 @@ M.frames = function(opts)
           end)
           return {
             path = f.source.path,
-            content = vim.split(result.content or "", "\n"),
+            content = result and vim.split(result.content or "", "\n") or nil,
             line = f.line,
           }
         end