From 15d3a82a8c9c523269002477f36b18721bcb457e Mon Sep 17 00:00:00 2001 From: Alexander Courtis Date: Sat, 28 May 2022 14:34:45 +1000 Subject: [PATCH] add .luarc.json for lua-language-server and fix a couple of nits --- .luarc.json | 13 +++++++++++++ lua/nvim-tree/diagnostics.lua | 2 +- lua/nvim-tree/explorer/explore.lua | 6 +++--- lua/nvim-tree/explorer/reload.lua | 6 +++--- 4 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 .luarc.json diff --git a/.luarc.json b/.luarc.json new file mode 100644 index 00000000000..5c23d1be37b --- /dev/null +++ b/.luarc.json @@ -0,0 +1,13 @@ +{ + "$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json", + "diagnostics": { + "globals": { + "vim": true + }, + "disable": { + "lowercase-global": true, + "missing-parameter": true + } + } +} + diff --git a/lua/nvim-tree/diagnostics.lua b/lua/nvim-tree/diagnostics.lua index 685a1c85196..6fb4009b4fe 100644 --- a/lua/nvim-tree/diagnostics.lua +++ b/lua/nvim-tree/diagnostics.lua @@ -92,7 +92,7 @@ local function from_coc() for bufname, severity_list in pairs(diagnostics) do if not buffer_severity[bufname] then - local severity = math.min(unpack(severity_list)) + local severity = math.min(table.unpack(severity_list)) buffer_severity[bufname] = severity end end diff --git a/lua/nvim-tree/explorer/explore.lua b/lua/nvim-tree/explorer/explore.lua index 190e7d23cdc..b886485c6a1 100644 --- a/lua/nvim-tree/explorer/explore.lua +++ b/lua/nvim-tree/explorer/explore.lua @@ -32,11 +32,11 @@ local function populate_children(handle, cwd, node, status) then local child = nil if t == "directory" and uv.fs_access(abs, "R") then - child = builders.folder(node, abs, name, status, node_ignored) + child = builders.folder(node, abs, name) elseif t == "file" then - child = builders.file(node, abs, name, status, node_ignored) + child = builders.file(node, abs, name) elseif t == "link" then - local link = builders.link(node, abs, name, status, node_ignored) + local link = builders.link(node, abs, name) if link.link_to ~= nil then child = link end diff --git a/lua/nvim-tree/explorer/reload.lua b/lua/nvim-tree/explorer/reload.lua index 8a7cff1132f..773e6fa5a5c 100644 --- a/lua/nvim-tree/explorer/reload.lua +++ b/lua/nvim-tree/explorer/reload.lua @@ -48,11 +48,11 @@ function M.reload(node, status) child_names[abs] = true if not nodes_by_path[abs] then if t == "directory" and uv.fs_access(abs, "R") then - table.insert(node.nodes, builders.folder(node, abs, name, status, node_ignored)) + table.insert(node.nodes, builders.folder(node, abs, name)) elseif t == "file" then - table.insert(node.nodes, builders.file(node, abs, name, status, node_ignored)) + table.insert(node.nodes, builders.file(node, abs, name)) elseif t == "link" then - local link = builders.link(node, abs, name, status, node_ignored) + local link = builders.link(node, abs, name) if link.link_to ~= nil then table.insert(node.nodes, link) end