felschr/nixos-config
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix(neovim): refactor tableMerge function

Browse source
This commit is contained in:
Felix Schröter 2023-06-26 18:04:10 +02:00
parent b46461a872
commit 8672f6e82f
Signed by: felschr
GPG key ID: 671E39E6744C807D
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
home/editors/neovim/lsp/lsp.lua
View file

@ -52,7 +52,8 @@ end
local config = require("lspconfig") local config = require("lspconfig")
local configs = require("lspconfig.configs") local configs = require("lspconfig.configs")
function table.merge(t1, t2) -- functional variant of table.merge
local function tableMerge(t1, t2)
local t = {} local t = {}
for k, v in ipairs(t1) do table.insert(t, v) end for k, v in ipairs(t1) do table.insert(t, v) end
for k, v in ipairs(t2) do table.insert(t, v) end for k, v in ipairs(t2) do table.insert(t, v) end
@ -62,7 +63,7 @@ end
-- first search git root for global config (monorepo) -- first search git root for global config (monorepo)
-- and fall back to normal search order otherwise -- and fall back to normal search order otherwise
local monorepo_pattern = function(main_patterns, other_patterns, f) local monorepo_pattern = function(main_patterns, other_patterns, f)
local all_patterns = table.merge(main_patterns, other_patterns) local all_patterns = tableMerge(main_patterns, other_patterns)
local git_root = config.util.root_pattern(".git")(f) local git_root = config.util.root_pattern(".git")(f)
local git_root_sln = config.util.root_pattern(unpack(main_patterns))(git_root) local git_root_sln = config.util.root_pattern(unpack(main_patterns))(git_root)
return git_root_sln or config.util.root_pattern(unpack(all_patterns))(f) return git_root_sln or config.util.root_pattern(unpack(all_patterns))(f)